fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 13:58:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,594 Commits 852 Branches 161 Tags
2096da2d4da2d4482dcdb328d35255101fc722bd
Commit Graph
50 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
Julian Oes b5f4f1ee80 Adressed performance concern and fixed a copy paste bug 2013-06-18 10:00:42 +02: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
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
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 303694f5f7 Fixed pid bug, attitude was not controlled 2013-06-16 15:22:10 +02: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 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
Julian Oes 3230f22446 Merge branch 'pid_fixes' into new_state_machine 2013-06-15 20:06:30 +02:00
Julian Oes 9f5565de32 Controllers should not access state machine anymore but access the vehicle_control_mode flags 2013-06-15 19:41:54 +02:00
Julian Oes e556649f2f Beep when mode is not possible 2013-06-14 16:48:41 +02:00
Julian Oes 5b21362e1f Arming with IO working now 2013-06-14 16:04:23 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Julian Oes 236053a600 Fixed param save 2013-06-13 15:04:16 +02:00
Julian Oes 54cd1d055f Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-06-13 13:36:54 +02:00
Julian Oes ec08dec8ba Two hacks here to make it compile 2013-06-12 12:47:00 +02:00
Julian Oes 7f90ebf537 Merge remote-tracking branch 'upstream/master' into new_state_machine 
Conflicts:
	src/examples/fixedwing_control/main.c
 2013-06-12 12:24:52 +02:00
Julian Oes f5c157e74d Merge remote-tracking branch 'upstream/master' into new_state_machine 
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
 2013-05-17 11:24:02 +02:00
Julian Oes 8bc2338466 Adapted upper and lower values for test jig voltages 2013-01-14 09:18:17 -08:00
Julian Oes 9f1ab9348c One printf made the tests unreadable 2013-01-11 20:09:45 -08:00