abeck70
|
3784357a18
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
|
2015-05-13 17:33:11 +10:00 |
|
abeck70
|
92e50c2ead
|
OP-1810 FOC
Squashed commit for clean commit as discussed in code review
Uncrustify
|
2015-05-13 17:19:51 +10:00 |
|
Alessio Morale
|
f6f6991432
|
Merge branch 'master' into next
Conflicts:
WHATSNEW.txt
|
2015-05-13 01:59:54 +02:00 |
|
Alessio Morale
|
29b9265531
|
Merge branch 'rel-15.02.02_fixed'
|
2015-05-13 01:55:10 +02:00 |
|
abeck70
|
3367313432
|
OP-1848 altvario gcs fix ranges
|
2015-05-12 22:48:49 +10:00 |
|
abeck70
|
65ecec8af8
|
OP-1848 altvario ui fix for Ki on altvario
|
2015-05-12 22:34:18 +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
|
e0919542e7
|
OP-1848r-altvario updated Kp, Ki, Kd
|
2015-05-12 17:45:07 +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
|
131fd81f50
|
Merge branch 'theothercliff/OP-1840_GPS_serial_port_needed_features' into next
|
2015-05-12 01:28:09 -04:00 |
|
Cliff Geerdes
|
f1ec9dea33
|
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
|
2015-05-12 01:25:45 -04:00 |
|
Alessio Morale
|
06d0df69b6
|
Update WHATSNEW.txt - rel-15.02.02-RC4
|
2015-05-10 23:19:52 +02: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 |
|
Laurent Lalanne
|
463a0a9996
|
Update WHATSNEW.txt - rel-15.02.02-RC3
|
2015-05-09 17:40:43 +02:00 |
|
Alessio Morale
|
aad33bc2f0
|
Update WHATSNEW.txt - rel-15.02.02-RC2
|
2015-05-09 17:40:25 +02:00 |
|
Alessio Morale
|
0b474ec4b5
|
Merge branch 'amorale/OP-1857_ppm_on_flexi_cc' into rel-15.02.02_fixed
|
2015-05-09 17:09:07 +02:00 |
|
Laurent Lalanne
|
8b3e42f980
|
OP-1827 File encoding, "Ragin' Cajun"
|
2015-05-09 17:08:30 +02:00 |
|
Alessio Morale
|
9ddb3097d6
|
Fix WhatsNew for release
|
2015-05-09 17:08:26 +02:00 |
|
Alessio Morale
|
5119704eaf
|
Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02_fixed
|
2015-05-09 17:08:13 +02:00 |
|
David Ankers
|
ad205b5998
|
OP-1831 - Update Ki Limits
|
2015-05-09 17:07:45 +02:00 |
|
David Ankers
|
dda67398cb
|
New versions of HK RTF models for cloudconfig
|
2015-05-09 17:07:42 +02:00 |
|
David Ankers
|
a294cc3cf1
|
Upgrade HK CCs
|
2015-05-09 17:07:39 +02:00 |
|
David Ankers
|
76a6e59c8d
|
Change uninstaller display name
|
2015-05-09 17:07:36 +02:00 |
|
Alessio Morale
|
052f125bda
|
Merge remote-tracking branch 'origin/amorale/OP-1820_fix_mag_orientation' into rel-15.02.02_fixed
|
2015-05-09 17:07:15 +02: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
|
2eef3e2dd2
|
OP-1848 altvario discovery4bare remove second instance of uavo
|
2015-05-09 14:54:40 +10:00 |
|
abeck70
|
829a9c5663
|
OP-1848 altvario code review comment
|
2015-05-09 14:42:26 +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
|
f8dbf29459
|
Merge branch 'abeck/OP-1858-autotakeoff' into next
|
2015-05-08 22:17:38 +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 |
|
abeck70
|
78acf10f6b
|
OP-1791 updated warning message
|
2015-05-08 21:36:39 +10:00 |
|
abeck70
|
3e141fda3a
|
Merge branch 'danielk/OP-1852_version_windowbar' into next
|
2015-05-08 21:34:54 +10:00 |
|
abeck70
|
ec60d92ca4
|
Merge branch 'danielk/OP-1855_limit_error_flightmodeposition' into next
|
2015-05-08 21:34:41 +10:00 |
|
Daniël Koek
|
549f0c2f60
|
OP-1852
|
2015-05-08 21:31:03 +10:00 |
|
Daniël Koek
|
20b01a548a
|
OP-1855 changed , to :
|
2015-05-08 21:28:51 +10:00 |
|
abeck70
|
2130d683d8
|
Merge branch 'abeck/OP-1863-rate-maxpitch' into next
|
2015-05-08 21:18:05 +10:00 |
|
abeck70
|
d97cf3a430
|
OP-1863 RateTrainer add additional limits to avoid RateTrainer as a thrust mode appearing
|
2015-05-08 21:16:03 +10: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 |
|
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 |
|