fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,146 Commits 852 Branches 161 Tags
Commit Graph

67 Commits

Author SHA1 Message Date
Julian Oes
f51320d1af Lov voltage warning should work again 2013-08-15 17:27:29 +02:00
Julian Oes
56575eb068 Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton 
Conflicts:
	src/drivers/blinkm/blinkm.cpp
	src/drivers/px4io/px4io.cpp
	src/modules/commander/state_machine_helper.c
	src/modules/px4iofirmware/protocol.h
	src/modules/px4iofirmware/registers.c
	src/modules/systemlib/systemlib.h
	src/systemcmds/reboot/reboot.c
 2013-08-15 14:04:46 +02:00
Julian Oes
561ec495b7 Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton 
Conflicts:
	Documentation/flight_mode_state_machine.odg
 2013-08-15 10:43:11 +02:00
Anton Babushkin
7476b03543 Merge branch 'master' into new_state_machine_drton 2013-08-15 10:33:45 +02:00
Julian Oes
39ae01dd07 Fix the low priority loop, calibration routines work again 2013-08-15 10:31:35 +02:00
Julian Oes
e5af29be17 Fixed param save and load 2013-08-15 10:21:58 +02:00
Lorenz Meier
cc9f1e81ad Rejecting arming if safety switch is not in safe position, added reboot command 2013-08-15 09:52:22 +02:00
Lorenz Meier
aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
Anton Babushkin
27d0885453 gyro_calibration: confusing typo in mavlink message fixed 2013-08-14 22:38:14 +02:00
Julian Oes
53def47216 Fixed gyro scale calibration (it was storing scale even though the scale calibration was skipped 2013-08-14 22:33:43 +02:00
Anton Babushkin
9505654f91 commander/px4_custom_mode.h added 2013-08-14 17:57:01 +02:00
Anton Babushkin
d7730a3444 commander, mavlink: fixed base_mode and custom_mode in mavlink 2013-08-14 10:59:22 +02:00
Anton Babushkin
32439d748a commander: set mode using base_mode and custom_mode 2013-08-07 20:21:49 +02:00
px4dev
e931d3b9cd Add an option to the systemreset() call and to the reboot command (-b) to reboot into the bootloader. 
The system will remain in the bootloader until it's reset, or until an upload is completed.
 2013-08-03 22:35:18 -07:00
Anton Babushkin
02d4480e8e commander rewrite almost completed, WIP 2013-07-31 20:58:27 +04:00
Lorenz Meier
1543c99003 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-07-30 11:28:30 +02:00
Lorenz Meier
d14891554e Merge branch 'config' of github.com:PX4/Firmware 2013-07-30 11:03:45 +02:00
Anton Babushkin
8c1067a017 State machine rewritten, compiles, WIP 2013-07-28 23:12:16 +04:00
Lorenz Meier
4e5eb9740b Fixed led and reboot linker challenges in C++ environments 2013-07-28 14:50:27 +02:00
Lorenz Meier
95dde5f1be Implemented config command, fixed a number range set / get issues for some sensor drivers, fixed gyro calibration 2013-07-26 18:24:37 +02:00
Anton Babushkin
7c1693a877 commander: don't notify user about rejected disarm to not confuse, flag_control_altitude_enabled added, flags values fixed 2013-07-23 14:56:12 +04:00
Anton Babushkin
963abd66ba commander: WIP, SEATBELT renamed to ASSISTED, added SIMPLE mode, added ASSISTED switch, some cleanup and reorganizing 2013-07-22 21:48:21 +04:00
Lorenz Meier
dc5bcdda76 Hotfix: Made accel calibration a bit more forgiving about motion threshold 2013-07-21 11:29:10 +02:00
Lorenz Meier
68ab69de01 moved commander to C++, preparation for better gyro scale calibration respecting the current attitude for more accurate results 2013-07-20 13:47:51 +02:00
Lorenz Meier
da1bf69ce2 Added gyro scale estimation (but param is NOT written) 2013-07-19 13:07:51 +02:00
Lorenz Meier
1575da4390 Merge branch 'master' of github.com:PX4/Firmware into new_state_machine 2013-07-19 12:53:37 +02:00
Lorenz Meier
a5c8d8c5f2 Robustified accel cal 2013-07-18 14:24:32 +02:00
Julian Oes
bcdedd9a35 Changed location of lots of flags and conditions, needs testing and more work 2013-07-16 18:56:31 +02:00
Lorenz Meier
6e44a486c1 Merged 2013-07-16 18:28:05 +02:00
Julian Oes
76edfa896b Fixed disarming bug, use flag instead of mode switch 2013-07-16 13:24:02 +02:00
Julian Oes
6dc3fcd1ad Some more commander cleanup, param update handling code was doubled 2013-07-16 10:05:51 +02:00
Julian Oes
08926019ea Just some reordering in commander 2013-07-16 09:35:31 +02:00
Julian Oes
3e161049ac Got rid of useless orb_receive_loop, moved some helper functions 2013-07-16 09:24:21 +02:00
Lorenz Meier
1d883ad4c6 Hotfix: Fixed RC calibration 2013-07-16 08:10:38 +02:00
Julian Oes
1b38cf715d Renamed actuator_safety back to actuator_armed, compiling but untested 2013-07-15 22:15:15 +02:00
Lorenz Meier
bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Lorenz Meier
3a76162b08 Merge pull request #317 from DrTon/arm_safe_fix 
Arm/disarm and SAS modes order safety fixes
 2013-07-10 22:53:45 -07:00
Julian Oes
88389ea255 Merge branch 'master' into new_state_machine 
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
 2013-07-08 10:31:32 +02:00
Lorenz Meier
e9290e7fc0 Merge branch 'master' of github.com:PX4/Firmware into origin_integration 2013-07-02 16:40:26 +02: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
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
60e9ea977d Conditions where set wrongly in the first 2s after boot 2013-06-24 09:50:55 +02:00
Anton Babushkin
72694825de Copyright fixes 2013-06-22 11:28:21 +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
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