Commit Graph

27398 Commits

Author SHA1 Message Date
Anton Babushkin aeb3637209 Merge branch 'arm_safe_fix' into seatbelt_multirotor 2013-06-29 21:01:20 +04:00
Anton Babushkin 2f1de6621b More strict conditions for arm/disarm 2013-06-29 20:49:54 +04:00
Anton Babushkin d3eb86d0ea Publish manual_sas_mode immediately, SAS modes switch order changed to more safe 2013-06-29 20:43:44 +04:00
px4dev d1562f926f More implementation for the serial side on IO; fix a couple of bugs on the FMU side.
Still needs serial init and some more testing/config on the FMU side, but closer to being ready to test.
2013-06-28 23:39:35 -07:00
Anton Babushkin 7dfaed3ee7 multirotor_pos_control: new ground level -> altitude setpoint correction fixed 2013-06-28 23:35:48 +04:00
Anton Babushkin a29e3b5a94 Merge commit '91e1680c1bb45bceb1d1dd675782111713f76a8a' into seatbelt_multirotor 2013-06-28 19:40:19 +04:00
Anton Babushkin 8e732fc527 position_estimator_inav default parameters changed, some fixes 2013-06-28 12:58:12 +04:00
Anton Babushkin 7b73df6440 Merge branch 'att_control_der_fix' into seatbelt_multirotor 2013-06-28 11:11:26 +04:00
Anton Babushkin 1759f30e3a Sonar added to position_estimator_inav 2013-06-28 11:10:46 +04:00
Anton Babushkin 665a9b8865 Merge commit '8191130bbc8f2cbd53e69a7bcd1a4d4b1b2d68bb' into seatbelt_multirotor 2013-06-28 11:09:21 +04:00
Simon Wilks dadd8703b4 Initial non-tested code for reading from the ESC. 2013-06-28 08:42:05 +02:00
Julian Oes 76346bfe19 Corrected merge mistake 2013-06-27 20:20:27 +02:00
Julian Oes f052442c2b Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/modules/sdlog2/sdlog2.c
	src/modules/sdlog2/sdlog2_messages.h
2013-06-27 09:23:11 +02:00
px4dev 90c458cb61 Checkpoint: interface abstraction for px4io driver 2013-06-25 23:08:34 -07:00
Sam Kelly b1f3a5c92b Enabled MS5611 by default on FMUv2. 2013-06-25 14:01:27 -07:00
Anton Babushkin 85d35777e0 sdlog2: bugfix in FLOW message 2013-06-25 22:51:51 +04:00
Anton Babushkin fdc7247fcf sdlog2: FLOW message added, bug fixed in optical_flow topic 2013-06-25 21:04:08 +04:00
Julian Oes 0ecc9c4bf4 Shrinking the main commander file a bit 2013-06-25 16:30:35 +02:00
Julian Oes 9ce2b62eb5 Beep when arming or disarming with RC 2013-06-25 14:45:27 +02:00
Julian Oes a6ba7e4485 Dropped superseded safety topic, added warning tones before arming 2013-06-25 13:15:38 +02:00
Julian Oes 2096da2d4d Don't interrupt a playing tune unless its a repeated one 2013-06-25 13:11:15 +02:00
Julian Oes 794a2248f0 Only some small cleanup to att control 2013-06-24 17:24:49 +02:00
Julian Oes d563960267 Added Flow messages to sdlog2 2013-06-24 17:24:04 +02:00
Julian Oes 60e9ea977d Conditions where set wrongly in the first 2s after boot 2013-06-24 09:50:55 +02:00
Julian Oes 53dec130c4 Adapted flow estimator, position and velocity control to new state machine 2013-06-24 09:49:46 +02:00
Lorenz Meier 582ee13d2a Merge branch 'mag-correct-yaw' of github.com:jgoppert/Firmware into fw_hil_test 2013-06-22 11:49:52 +02:00
Anton Babushkin 72694825de Copyright fixes 2013-06-22 11:28:21 +04:00
Lorenz Meier c8f4f84c2b Merged master 2013-06-21 19:20:52 +02:00
Anton Babushkin 5cb1f4662f multirotor_attitude_control performance improved, tested in flight. PID library new functionality and bugfixes. 2013-06-20 19:25:37 +04:00
Anton Babushkin 7d37c2a8b3 multirotor_pos_control: bugs fixed 2013-06-20 17:34:09 +04:00
Julian Oes a183f3e273 Merge remote-tracking branch 'drton/pid_fixes_drton_debug' into new_state_machine
Conflicts:
	src/modules/multirotor_att_control/multirotor_att_control_main.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.h
	src/modules/sdlog2/sdlog2.c
2013-06-20 12:52:16 +02:00
Anton Babushkin bf0de77532 Critical bugfix in PID 2013-06-20 12:33:35 +04:00
Anton Babushkin dec1fdbde0 Cleanup: remove useless angular rates from attitude rate controller 2013-06-20 11:52:05 +04:00
Anton Babushkin 462a9c8454 sdlog2: add angular accelerations to ATT message 2013-06-20 11:38:37 +04:00
Anton Babushkin 3bfc4ed517 Att rate PID fix 2013-06-20 11:38:19 +04:00
Julian Oes 9b6c9358ed First try for an ESC calibration tool 2013-06-20 01:13:49 +02:00
Julian Oes 23858a6726 Added functionality to enable PWM output for stupid ESCs even when safety is not off, arming button functionality remains as is 2013-06-19 22:59:40 +02:00
Julian Oes ece93ab628 Added integral reset for rate controller 2013-06-19 12:24:14 +02:00
Julian Oes c1049483a8 Added integral reset for rate controller 2013-06-19 12:01:22 +02:00
Julian Oes d6c15b1679 Fixed numeration that was introduced through merge, I should add new log messages to the end 2013-06-19 10:35:17 +02:00
Julian Oes 53eb76f4d5 Fixed numeration that was introduced through merge, I should add new log messages to the end 2013-06-19 10:34:41 +02:00
Julian Oes 26858ad403 Merge remote-tracking branch 'upstream/master' into pid_fixes
Conflicts:
	src/modules/sdlog2/sdlog2.c
2013-06-19 10:20:56 +02:00
Anton Babushkin eb38ea1789 position_estimator_inav: better handling of lost GPS, minor fixes 2013-06-19 12:17:10 +04:00
Julian Oes 8d6cc86b4f Cherry-picked commit e2ff60b0a6: use rateacc values 2013-06-19 10:01:16 +02:00
Julian Oes e2ff60b0a6 Use rollacc and pitchacc from the estimator instead of differentiating in the controller 2013-06-19 09:35:59 +02:00
Julian Oes f3ce61d740 Forgot to remove some debug stuff 2013-06-19 09:35:19 +02:00
Anton Babushkin dc0bf64434 Merge branch 'master' into seatbelt_multirotor 2013-06-18 21:56:57 +04:00
James Goppert cbd95d644d Changed to yaw only mag correction. 2013-06-18 12:23:50 -04:00
Julian Oes 202792294a Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +02:00
Julian Oes 34c197c7cc Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-18 10:26:48 +02:00