Commit Graph

3589 Commits

Author SHA1 Message Date
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
Julian Oes 9ea6636237 Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-19 10:02:57 +02:00
Julian Oes 8d6cc86b4f Cherry-picked commit e2ff60b0a6dbcd714d57e781d9fe174b110a6237: 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
Lorenz Meier 85b5da8078 Merge pull request #312 from samized/flowboard_master
Add PX4IOAR PX4FLOW example startup script
2013-06-18 07:10:43 -07: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
samuezih 4254bbfe6d Add PX4IOAR PX4FLOW example startup script 2013-06-18 10:45:08 +02:00
Julian Oes 34c197c7cc Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-18 10:26:48 +02:00
Julian Oes b5f4f1ee80 Adressed performance concern and fixed a copy paste bug 2013-06-18 10:00:42 +02:00
Lorenz Meier b23f238d98 Merge pull request #311 from DrTon/sdlog2
sdlog2 bugs fixed
2013-06-17 23:35:15 -07:00
Anton Babushkin 447fc5e291 sdlog2 bugs fixed 2013-06-18 10:31:24 +04:00
Julian Oes cc452834c0 First try to prevent motors from stopping when armed 2013-06-18 00:30:10 +02:00
Julian Oes c874f68108 Checkpoint: Quad is flying after PID lib changes
Conflicts:
	src/modules/multirotor_att_control/multirotor_attitude_control.c
2013-06-17 21:10:38 +02:00
Julian Oes e8dbc1fada Merge remote-tracking branch 'upstream/att_fix' into pid_fixes 2013-06-17 21:05:15 +02:00
Julian Oes 2daff9ebbf Checkpoint: Quad is flying after PID lib changes 2013-06-17 21:03:55 +02:00
Julian Oes 52f8565f0b Corrected number of ORB structs in sdlog2 2013-06-17 21:02:52 +02:00
Julian Oes a25d68440d Merge with att_fix 2013-06-17 21:01:25 +02:00
Lorenz Meier 91e1680c1b fixed attitude estimator params 2013-06-17 17:13:34 +02:00
Lorenz Meier 419750fe61 Merge pull request #309 from DrTon/sdlog2
sdlog2 critical bug fixed, added ARSP message
2013-06-17 06:42:59 -07:00
Julian Oes 7bb78a4f9b Merge remote-tracking branch 'drton/sdlog2' into new_state_machine
Conflicts:
	src/modules/sdlog2/sdlog2.c
2013-06-17 14:45:20 +02:00
Anton Babushkin a11895ac43 Critical bug fixed, cleanup 2013-06-17 16:06:35 +04:00
Anton Babushkin d9f30858c8 sdlog2 messages ID fix 2013-06-17 14:46:18 +04:00
Anton Babushkin 22a925adeb Merge branch 'master' into sdlog2 2013-06-17 14:44:45 +04:00
Lorenz Meier badaa5e4a2 Fixed too low stack sizes 2013-06-17 09:57:34 +02:00
Lorenz Meier c240e843aa Merge pull request #305 from sjwilks/sdlog-airspeed
Add airspeed logging to sdlog2.
2013-06-16 13:46:35 -07:00
Lorenz Meier f1419d4f5f Merge pull request #307 from sjwilks/ets-airspeed-fix
Fix the usage help and lots of formatting fixes.
2013-06-16 12:29:37 -07:00
Simon Wilks 24cb66c833 And yet more formatting cleanups 2013-06-16 21:17:07 +02:00
Simon Wilks 7a99de9d30 More formatting cleanups 2013-06-16 21:07:42 +02:00
Lorenz Meier 9e26e8de79 Merge pull request #306 from sjwilks/hott-airspeed
Report airspeed via HoTT telemetry
2013-06-16 11:53:29 -07:00
Simon Wilks 1fc3c8f723 Fix usage help and cleanup formatting 2013-06-16 20:52:15 +02:00
Simon Wilks dadac932da Report airspeed over HoTT telemetry 2013-06-16 20:44:11 +02:00
Julian Oes bca60b98bd Merge branch 'pid_fixes' into new_state_machine
Conflicts:
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/sdlog2/sdlog2.c
	src/modules/sdlog2/sdlog2_messages.h

and some fixes, logging of control PID values now working
2013-06-16 17:14:22 +02:00
Julian Oes 216617431d Logging of ctrl debug values working now 2013-06-16 16:18:40 +02:00
Julian Oes 38558f0f16 Count and write for control debug loging was missing (still not working) 2013-06-16 16:00:44 +02:00
Julian Oes 6f108e18d2 Just include the rate controls for now 2013-06-16 15:32:53 +02:00
Julian Oes 2cb928d87c Added ctrl debugging values
Conflicts:
	src/modules/sdlog2/sdlog2.c
2013-06-16 15:25:24 +02:00
Julian Oes c189ac1c85 Added possibility to log pid control values
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
	src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 15:22:20 +02:00
Julian Oes 303694f5f7 Fixed pid bug, attitude was not controlled 2013-06-16 15:22:10 +02:00