fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 05:13:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,101 Commits 852 Branches 161 Tags
2fbb1aee84912032dff3faaef2cf337bef5a9f31
Commit Graph
520 Commits
Author SHA1 Message Date
marco c4dfc345a1 Version from esc_status topic added to sdlog2 2013-07-07 18:27:08 +02:00
marco 209dc7100e mkclctrl 8/11Bit support, uOrb Topic added, ESC Topic to Sdlog2 added 2013-07-02 19:46:15 +02:00
Lorenz Meier e9290e7fc0 Merge branch 'master' of github.com:PX4/Firmware into origin_integration 2013-07-02 16:40:26 +02:00
sjwilks 697c0a1a1d Merge pull request #314 from DrTon/att_control_der_fix 
Multirotor attitude controller updated
 2013-07-02 01:19:14 -07:00
Anton Babushkin f6b0a27295 Merge branch 'master' into seatbelt_multirotor 2013-06-30 23:36:42 +04:00
Lorenz Meier d51b97fe2f Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-30 19:47:12 +02:00
Lorenz Meier aa04701c89 Added global position to logging 2013-06-30 19:15:02 +02:00
Anton Babushkin 7b73df6440 Merge branch 'att_control_der_fix' into seatbelt_multirotor 2013-06-28 11:11:26 +04:00
Anton Babushkin 665a9b8865 Merge commit '8191130bbc8f2cbd53e69a7bcd1a4d4b1b2d68bb' into seatbelt_multirotor 2013-06-28 11:09:21 +04: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
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 d563960267 Added Flow messages to sdlog2 2013-06-24 17:24:04 +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
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 462a9c8454 sdlog2: add angular accelerations to ATT message 2013-06-20 11:38:37 +04: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 dc0bf64434 Merge branch 'master' into seatbelt_multirotor 2013-06-18 21:56:57 +04:00
Julian Oes 34c197c7cc Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-18 10:26:48 +02:00
Anton Babushkin 447fc5e291 sdlog2 bugs fixed 2013-06-18 10:31:24 +04:00
Julian Oes 52f8565f0b Corrected number of ORB structs in sdlog2 2013-06-17 21:02:52 +02:00
Anton Babushkin effce6edfa sdlog2 GPOS message bug fix 2013-06-17 22:07:05 +04:00
Anton Babushkin e12ae6b3ba Merge branch 'master' into seatbelt_multirotor 2013-06-17 18:47:41 +04: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
Anton Babushkin 650de90a90 sdlog2: ARSP, GPOS messages added 2013-06-17 14:40:55 +04:00
Anton Babushkin 95d324f061 Merge branch 'master' into seatbelt_multirotor 2013-06-17 13:52:20 +04:00
Lorenz Meier 34058ae565 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-17 09:57:47 +02:00
Lorenz Meier badaa5e4a2 Fixed too low stack sizes 2013-06-17 09:57:34 +02:00
Lorenz Meier 92e0687022 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-17 08:44:07 +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
Anton Babushkin 138ce117ab ATSP.ThrustSP added 2013-06-16 17:20:07 +04:00
Julian Oes bd7f86bb6a Tried to add ctrl debug values to sdlog2 (WIP) 2013-06-16 14:59:00 +02:00
Julian Oes b52d561b11 Added ctrl debugging values 2013-06-16 12:59:50 +02:00
Julian Oes 562253c508 Fixed bug that I introduced in sdlog2 2013-06-16 11:55:08 +02:00
Simon Wilks 4253c16b3f Increase array size. 2013-06-15 23:24:57 +02:00
Simon Wilks 12ac41802e Log airspeed. 2013-06-15 22:58:14 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Lorenz Meier 3945dae8d3 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-13 08:27:13 +02:00
Anton Babushkin 95236c379a sdlog2: ARSP (attitude rates setpoint) message added, attitude rates added to ATT message 2013-06-13 06:51:09 +04:00