Steve Evans
fd00cd8210
Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames
2015-05-13 20:29:54 +01:00
abeck70
525aabe54c
uncrustify flight gps updates
2015-05-13 17:36:52 +10:00
abeck70
858354391d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-12 22:07:21 +10:00
abeck70
794605b3d9
OP-1848 altvario fixes
...
1. CC compile fix
2. on reinit calculate a new thrustdemand after which gyro updates will retrigger subsequent calcs
2015-05-12 22:02:03 +10:00
abeck70
8d2f4722d7
OP-1848 altvario improvements
...
1. Disable velocity pid loop when altvario is not active
2. Add sanity boundf to ensure max min are inforced.
2015-05-12 17:40:28 +10:00
Cliff Geerdes
f1ec9dea33
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
2015-05-12 01:25:45 -04:00
abeck70
43ec464737
OP-1848 altvario improvements
...
1. Avoid neutral thrust calcs in altvario typically used in forward flight
2. Capture stick state for debugging into altitudeholdstatus
2015-05-10 19:05:36 +10:00
abeck70
0ef6779701
OP-1848 altvario tidyup of NE controllers in pathfollower
...
Change ILimit variable name to Beta in multiple PID loops that now use pid2 implementation.
Change velocity controller yaw from axislock to rate.
2015-05-09 23:03:53 +10:00
abeck70
d6123c018d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-09 14:31:57 +10:00
abeck70
7fd08ef990
OP-1858 takeoff in nav address code review comments
2015-05-08 22:04:44 +10:00
abeck70
4ccdc46311
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-08 21:48:34 +10:00
Steve Evans
8689b2d0ca
OP-1803 Don't report error codes as %
2015-05-08 07:38:55 +01:00
abeck70
ddefd11b7f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-07 11:28:24 +10:00
Cliff Geerdes
193911ba20
OP-1840 another merge conflict
2015-05-05 23:26:08 -04:00
abeck70
143f09d216
Merge remote-tracking branch 'origin/rel-15.02.02' into next
...
Conflicts:
flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
Cliff Geerdes
d9ab9e4f27
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
...
Conflicts:
flight/modules/GPS/GPS.c
2015-05-05 17:05:11 -04:00
abeck70
593cf18c5c
OP-1848 altvario Update dT to speed on sensor update rate
2015-05-05 22:49:39 +10:00
abeck70
0c77d8a21d
OP-1848 altvario
...
Speed up velocity control loop to original speed
2015-05-05 22:39:15 +10:00
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
dd1c6c7600
OP-1848 build fixes after merge with ratetrainer
2015-05-05 21:52:04 +10:00
abeck70
43d193cceb
OP-1848 altvario merge fixes with ratetrainer
2015-05-05 21:48:04 +10:00
abeck70
5bffc73b17
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
...
Conflicts:
flight/modules/Stabilization/outerloop.c
2015-05-05 21:47:19 +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
c3c80d4aa8
OP-1848 altvario fix build issue for CC
2015-05-04 08:58:07 +10:00
abeck70
a9ad3c5ec1
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-04 08:42:54 +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
Alessio Morale
c227686854
uncrustify
2015-05-02 20:27:28 +02:00
RS2K
2fca0b1d9b
OP-1835 - Motor Constraints for 15.02.02 - Quick fix to disable clipping. Bit of code not in the original fix I had to deal with.
2015-05-02 13:11:40 -05:00
RS2K
57d062ff67
OP-1835 - Motor Constraints for 15.02.02
...
OP-1835 - Motor Constraints for 15.02.02
2015-05-02 12:55:43 -05: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
b479bd5436
OP-1848 altvario TxPID support
2015-05-02 23:57:18 +10:00
abeck70
21c54c3a37
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-01 22:59:36 +10: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
Cliff Geerdes
dad8f40c4d
OP-1840 Remove reference to unreleased hardware
2015-05-01 02:49:15 -04:00
Cliff Geerdes
c365bd3032
OP-1840 Removed unused debug .h and update comments
2015-05-01 02:46:38 -04: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
Cliff Geerdes
f331ca0daf
OP-1840 CC3D wouldn't build and update some comments
2015-04-30 01:27:19 -04:00
Cliff Geerdes
48bea16ab9
OP-1840 GPS serial improvements initial coding
2015-04-29 23:46:47 -04: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
samguns
09a00f8990
Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS
2015-04-27 11:56:25 +08:00
Richard von Lehe
d22b96d24b
OP-1740: Force latest Pathfollower changes to use uavobj enums.
2015-04-26 17:46:49 -05:00
