13230 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Steve Evans	6e6b8c8bad	Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge	2015-05-08 07:43:16 +01:00
Steve Evans	023f157ba8	OP-1803 Disable untested DSM link quality code	2015-05-08 07:42:32 +01: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
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
Alessio Morale	9dcd6990d3	OP-1874 - Add notification for Critical alarms, add Attitude, modify alarm repetition rates. ... reduce rate for Magnetometer, Receiver. Include Attitude.	2015-05-03 23:13:53 +02: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