dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
3,991 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

3991 Commits

Author SHA1 Message Date
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
Anton Babushkin effce6edfa sdlog2 GPOS message bug fix 2013-06-17 22:07:05 +04:00
Anton Babushkin 2124c52cff position_estimator_inav bugfixes 2013-06-17 22:06:45 +04:00
Lorenz Meier 91e1680c1b fixed attitude estimator params 2013-06-17 17:13:34 +02:00
Anton Babushkin e12ae6b3ba Merge branch 'master' into seatbelt_multirotor 2013-06-17 18:47:41 +04: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
Anton Babushkin a83aca753c position_estimator_inav rewrite, publishes vehicle_global_position now 2013-06-17 14:41:35 +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
px4dev b2ff8b5e1a Turn off logging 2013-06-16 23:02:46 -07:00
px4dev 3163d7ac09 Set the serial port speed before trying to talk to IO 2013-06-16 22:41:08 -07: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
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
Julian Oes 1ea9ff3640 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 09:57:32 +02:00
Julian Oes 68fb200f0b Fixed pid bug, attitude was not controlled 2013-06-16 09:55:28 +02:00
Julian Oes 263b60c200 Hack to make flow controll to compile 2013-06-16 09:54:57 +02:00