abeck70
|
ddefd11b7f
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
|
2015-05-07 11:28:24 +10:00 |
|
James Duley
|
d39639ca68
|
Remove old pro.user file
|
2015-05-06 18:23:12 +12:00 |
|
James Duley
|
9923803e59
|
Merge branch 'parched/OP-1806_version-info_escape_strings' into next
|
2015-05-06 17:11:17 +12: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
|
48f3922a8d
|
OP-1848 altvario fix default stab page
|
2015-05-05 22:14:18 +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
|
7bad2f8163
|
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
|
2015-05-05 21:35:25 +10:00 |
|
abeck70
|
0bdec71020
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1867-pathplanner-autoland
|
2015-05-05 21:34:26 +10:00 |
|
abeck70
|
30a70ca3ec
|
Merge branch 'abeck/OP-1863-rate-maxpitch' into next
|
2015-05-05 21:28:56 +10:00 |
|
abeck70
|
5c13db221b
|
OP-1867 autoland/takeoff
Allow takeoff after land on abort when in takeoff flight mode without having to change flight mode.
|
2015-05-04 21:48:24 +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
|
00aae3c5a3
|
OP-1847 altvario update of tuning parameters for piddown control
|
2015-05-04 08:50:44 +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 |
|
Laurent Lalanne
|
8240c64ad8
|
Update WHATSNEW.txt - rel-15.02.02-RC3
|
2015-05-03 13:27:39 +02:00 |
|
Laurent Lalanne
|
842330922f
|
Merge branch 'amorale/OP-1857_ppm_on_flexi_cc' into rel-15.02.02
|
2015-05-03 13:22:47 +02:00 |
|
Laurent Lalanne
|
c1566fa7d2
|
Update WHATSNEW.txt - rel-15.02.02-RC2
|
2015-05-03 12:23:18 +02:00 |
|
RS2K
|
77eacb2294
|
OP-1835 - Motor Constraints 15.02.02 100% throttle curves default
|
2015-05-02 17:41:47 -05:00 |
|
Laurent Lalanne
|
93ff480b7a
|
15.02.02 hotfix for tricopter servo on wizard
|
2015-05-02 21:02:14 +02: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 |
|
Laurent Lalanne
|
5475b395e8
|
OP-1827 File encoding, "Ragin' Cajun"
|
2015-05-02 16:11:13 +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 |
|
abeck70
|
174c0e8363
|
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
|
2015-05-01 17:46:44 +10: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
|
87f521bde3
|
OP-1867 autoland
build fix
|
2015-04-30 23:11:32 +10: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
|
13375ff0f5
|
Merge branch 'abeck/OP-1858-autotakeoff' into next
|
2015-04-30 17:35:33 +10:00 |
|
abeck70
|
17b8ccd6bb
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
|
2015-04-30 17:34:33 +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 |
|