Core: Switch to Loiter on disarm if landing on RTL or LAND #1114
Conversation
| @@ -86,7 +86,9 @@ public void setArmed(boolean newState) { | |||
| if (newState) { | |||
| myDrone.getWaypointManager().getWaypoints(); | |||
| }else{ | |||
| changeFlightMode(ApmModes.ROTOR_LOITER); // When disarming set the mode back to loiter so we can do a takeoff in the future. | |||
| if (mode == ApmModes.ROTOR_RTL | mode == ApmModes.ROTOR_LAND) { | |||
There was a problem hiding this comment.
you're using a bitwise inclusive OR (|) operator where a logical OR (||) operator should be used.
There was a problem hiding this comment.
damn, looks like I'm doing bit fiddling on C. But It would work all the same :)
There was a problem hiding this comment.
not quite the same, the logical operator OR in java allows for short-circuiting, while the bitwise doesn't.
|
@arthurbenemann as mentioned in issue #1108, this is not the right way to proceed for this functionality. For a lot of users, myself included, that qualifies as a bug because the app is doing something I didn't ask to, and that is not expected. |
It was a bitwise OR before, when it should have been a logic OR
|
I'm merging this since it's at least better than what's on master now. |
Core: Switch to Loiter on disarm if landing on RTL or LAND
Fix issue #1108