Skip to content

Commit

Permalink
Final Day
Browse files Browse the repository at this point in the history
  • Loading branch information
1yo1 committed Feb 11, 2023
1 parent 5132ddb commit 0428c1c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 13 additions & 13 deletions pluto_control/swarm.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def run_drone2(point_list):
queue1=q2,
queue2=q1,
pose_port=8000,
kp=[3.5, 3.5, 2.7],
kd=[4.3, 4.3, 2.15],
kp=[3, 3, 2.7],
kd=[3.75, 3.75, 2.15],
ki=[0.05, 0.05, 1.1],
eqb_thrust=1550,
IP=drone2_ip,
Expand All @@ -64,19 +64,19 @@ def run_drone2(point_list):


drone1_points = [
[-40, -40, 80],
[40, -40, 80],
[40, 40, 80],
[-40, 40, 80],
[-40, -40, 80],
[-40, -40, 60],
[40, -40, 60],
[40, 40, 60],
[-40, 40, 60],
[-40, -40, 60],
]
drone2_points = [
[-40, 40, 80],
[-40, -40, 80],
[40, -40, 80],
[40, 40, 80],
[-40, 40, 80],
[-40, -40, 80],
[-40, 40, 60],
[-40, -40, 60],
[40, -40, 60],
[40, 40, 60],
[-40, 40, 60],
[-40, -40, 60],
]

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion pose_ocam/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void *image_thread(void *args)
{
printf("Current Exposure: %d\n", exposure);
printf("Current Gain: %d\n", gain);
exposure = 100, gain = 83;
exposure = 100, gain = 133;
camera.set_control("Gain", gain);
camera.set_control("Exposure (Absolute)", exposure);
printf("New Exposure: %d\n", exposure);
Expand Down

0 comments on commit 0428c1c

Please sign in to comment.