abeck70
72b0d053ef
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-05 21:53:26 +10:00
abeck70
16cc9f1512
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-04 21:15:24 +10:00
abeck70
5ca9d979e6
OP-1858 if previous mode was autotakeoff, ignore wp start position and go from current position.
2015-05-04 21:14:54 +10:00
abeck70
2ec40072ab
OP-1863 ratetrainer fix coding error. ratetrainer should now work.
2015-05-04 17:36:04 +10:00
abeck70
d4561e9cd8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-04 08:41:12 +10:00
abeck70
ca03092fb4
OP-1863 ratetrainer update stab handler to support new outerloop directwithlimits mode
2015-05-04 08:40:06 +10:00
Philippe Renon
9a312ef115
uncrustified
2015-05-02 16:46:35 +02:00
Philippe Renon
b4b93bee93
Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next
2015-05-02 16:34:15 +02:00
abeck70
b4d727db98
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-01 21:53:35 +10:00
m_thread
c4c60c897b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-05-01 09:53:35 +02:00
m_thread
b8653d44da
Merge branch 'thread/OP-1837_SRXL_Cleanup' into next
2015-05-01 09:46:32 +02:00
abeck70
0eb84cd8f6
OP-1867 pathplanner autoland
...
Setup land with descent rate set from flight mode settings.
2015-04-30 22:54:38 +10:00
abeck70
d6de7803e1
OP-1858 autotakeoff pathplanner fixes
2015-04-29 20:27:30 +10:00
abeck70
09e2c6f00e
OP-1863 RateTrainer
...
Initial commit for code review
2015-04-28 21:54:58 +10:00
abeck70
b14a966088
OP-1858 autotakeoff and pathplanner
...
1. Allow arming in pathplanner
2. Typo in comment
2015-04-28 20:54:44 +10:00
abeck70
210b15db4d
OP-1858 autotakeoff in pathplanner
...
1. Allowing arming in pathplanner
2. Takeoff activation requires throttle to be above 30%
3. Takeoff occurs at the current/actual position and rises vertical to the settings altititude.
4. The details of the takeoff waypoint are effectively ignored - this is a simplicifcation to avoid having to have pathplanner inject a flyvector command from the current location to the waypoint
5. We hard code the condition check for autotakeoff as only one mode is supported.
2015-04-27 23:01:47 +10:00
Richard von Lehe
d22b96d24b
OP-1740: Force latest Pathfollower changes to use uavobj enums.
2015-04-26 17:46:49 -05:00
Richard von Lehe
f3611591e0
Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
...
Conflicts:
flight/modules/PathFollower/inc/vtollandcontroller.h
flight/modules/PathFollower/vtollandcontroller.cpp
flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
m_thread
b0b1a42aec
OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
...
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +02:00
Alessio Morale
ab36dcbdee
Merge remote-tracking branch 'origin/rel-15.02.02' into next
2015-04-20 14:54:07 +02:00
Alessio Morale
6176f7a1d7
Uncrustify
2015-04-20 14:52:13 +02:00
Alessio Morale
2571db4d96
Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next
2015-04-20 14:29:16 +02:00
Alessio Morale
19bb4d8016
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-04-20 12:10:31 +02:00
Alessio Morale
118a0ec66f
Merge remote-tracking branch 'origin/amorale/OP-1802_throttle_fake_pos_vel' into next
2015-04-20 12:10:08 +02:00
abeck70
f68e1144ca
OP-1760 fix compile issue for CC
2015-04-20 20:09:27 +10:00
Alessio Morale
9103b4de92
Merge remote-tracking branch 'origin/rodney/OP-1834_disable_piro_comp_in_self_level_modes' into next
2015-04-20 11:58:51 +02:00
Alessio Morale
107f807c92
Merge remote-tracking branch 'origin/rodney/OP-1794_dump_axis_lock_accumulators_on_low_throttle' into next
2015-04-20 11:52:35 +02:00
Alessio Morale
e12a595826
OP-1802 - (missing) change from review
2015-04-20 11:38:38 +02:00
Alessio Morale
6c22ed3b69
OP-1802 - Changes from review
2015-04-20 11:35:40 +02:00
abeck70
d943f5a0ce
OP-1760 autotakeoff
...
On landing stausvtolland state of DISARMED, armhandler now detects this and disarms by force equivalent to a pathplanner alarm trigger.
To re-arm, one must leave the land flight mode.
2015-04-20 08:43:57 +10:00
abeck70
3a0c36f7d7
OP-1760 autotakeoff
...
Add sanity checks to protect from waypoint looping inpath planner.
If takeoff initiated and thrust > vtol_min, enter position hold, reflect copletion in pathstatus, and pathplanner will move to next waypoint in a very short period of time.
2015-04-19 18:46:40 +10:00
abeck70
b96379cf78
OP-1760 landing fixes : avoid false positives on ground detection from accel vibration
...
Viper found that a badly mounted FC can trigger ground detection.
2015-04-19 18:18:14 +10:00
abeck70
1e9bd43871
Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed
2015-04-19 17:52:35 +10:00
Alessio Morale
5c76c0ee07
Merge remote-tracking branch 'origin/steve/OP-1289_two_telemetry_streams' into next
...
Conflicts:
flight/modules/Telemetry/telemetry.c
2015-04-18 19:10:13 +02:00
abeck70
c4aa17a04c
OP-1760 autotakeoff pathplanner now uses pathstatus in conditionLegRemaining
2015-04-17 23:06:02 +10:00
abeck70
eebbfcea64
OP-1760 autotakeoff - enable positional control pathplanner landing to fly to final waypoint during landing
2015-04-17 22:58:53 +10:00
abeck70
88b0c99087
OP-1760 autotakeoff in pathplaner: control to start location instead of end location in NE
2015-04-17 22:44:05 +10:00
abeck70
55cbc2cd9b
OP-1760 autotakeoff - simplify pathplanner data input requirements to trigger autotakeoff
2015-04-17 22:21:08 +10:00
abeck70
db0dc0e552
OP-1760 indicate completion of takeoff when disarmed
...
This can be detected in pathplanner.
2015-04-17 21:26:24 +10:00
abeck70
04c42bd316
OP-1760 autotakeoff
...
1. Make autotakeoff height configurable
2. Fix the pidcontroldown transfer to solve the rough transition between pid controllers for landing, takeoff, braking etc.
2015-04-16 21:22:37 +10:00
abeck70
a8c6a19784
OP-1760 code review fixes
2015-04-15 08:39:13 +10:00
Rodney Grainger
aa9ed6a62a
OP-1843 - uncrustify
2015-04-14 22:00:11 +12:00
Rodney Grainger
115b206032
OP-1834 - Disable pirouette compensation in self level modes
2015-04-14 21:55:57 +12:00
Richard von Lehe
1ac4c63fa7
OP-1740: UAVObjects use enums
2015-04-12 22:05:05 -05:00
Rich von Lehe
782944bfb1
OP-1740: uavobj use enums: clean up errors
2015-04-12 16:20:09 -05:00
abeck70
a52969a76b
OP-1760 Autotakeoff
...
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
Rich von Lehe
e6de41855b
OP-1740: GetSet use enums: Getting more files to conform to using enums instead of uint8_t...
2015-04-11 15:43:04 -05:00
Steve Evans
32a25e7044
OP-1289 Only create local telemetry queues/tasks if needed
2015-04-11 12:58:14 +01:00
Richard von Lehe
b3a7a89dca
OP-1740: GetSet functions take enum: Fix remaining compile errors in PathFollower and Airspeed modules.
2015-04-09 20:04:44 -05:00
Richard von Lehe
4c5cebf5c6
OP-1740 UAV0 GetSet Functions Take Enum: getting codebase to compile - multiple changes needed, still incomplete (i.e. this commit will not compile, but I want to save my changes on more than just my machine :-)
2015-04-08 21:40:15 -05:00
