Skip to content

Commit 1474bf6

Browse files
committed
Modify flip function to work better in aruco_map frame with both Clever 3 & 4
(cherry picked from commit a5021d4)
1 parent 9790d2b commit 1474bf6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Drone/FlightLib/FlightLib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ def takeoff(z=Z_TAKEOFF, speed=SPEED_TAKEOFF, frame_id='body', freq=FREQUENCY,
359359
#print("Takeoff succeeded!")
360360
return 'success'
361361

362-
def flip(min_z = FLIP_MIN_Z): #TODO Flip in different directions
362+
def flip(min_z = FLIP_MIN_Z, frame_id = FRAME_ID): #TODO Flip in different directions
363363
logger.info("Flip started!")
364364

365-
start_telemetry = get_telemetry() # memorize starting position
365+
start_telemetry = get_telemetry(frame_id=frame_id) # memorize starting position
366366

367367
if start_telemetry.z < min_z - TOLERANCE:
368368
logger.warning("Can't do flip! Flip failed!")
@@ -377,9 +377,9 @@ def flip(min_z = FLIP_MIN_Z): #TODO Flip in different directions
377377
while True:
378378
telem = get_telemetry()
379379

380-
if -math.pi + 0.1 < telem.roll < -0.2:
380+
if abs(telem.roll) > math.pi/2:
381381
break
382382

383383
logger.info('Flip succeeded!')
384384
#print('Flip succeeded!')
385-
navto(x=start_telemetry.x, y=start_telemetry.y, z=start_telemetry.z, yaw=start_telemetry.yaw) # finish flip
385+
navto(x=start_telemetry.x, y=start_telemetry.y, z=start_telemetry.z, yaw=start_telemetry.yaw, frame_id=frame_id) # finish flip

Drone/copter_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def _command_emergency_led_fill(**kwargs):
108108

109109
@messaging.message_callback("flip")
110110
def _copter_flip():
111-
FlightLib.flip()
111+
FlightLib.flip(frame_id=client.active_client.FRAME_ID)
112112

113113
@messaging.message_callback("takeoff")
114114
def _command_takeoff(**kwargs):

0 commit comments

Comments
 (0)