Lorenz Meier
|
9dbc83cce1
|
Merged master into prearm_checks
|
2014-06-30 16:24:48 +02:00 |
|
Lorenz Meier
|
799f568ab4
|
commander: Minor checks / improvements to power enforce patch
|
2014-06-30 14:33:56 +02:00 |
|
Lorenz Meier
|
154f14e747
|
Merged master into power_enforce
|
2014-06-30 00:50:38 +02:00 |
|
Lorenz Meier
|
b20d0c0f01
|
commander: Remove prearm test print statements
|
2014-06-26 12:36:43 +02:00 |
|
Lorenz Meier
|
a1132580c5
|
commander: Add pre-arm check for main sensors.
|
2014-06-26 12:11:39 +02:00 |
|
Lorenz Meier
|
571e139c24
|
commander: Formatting and logic flow cleanup, no functional change
|
2014-06-24 21:33:03 +02:00 |
|
Julian Oes
|
62faa2ee51
|
commander/navigator: renamed FS modes to RTL and RTGS (return to ground station)
|
2014-06-19 10:26:56 +02:00 |
|
Julian Oes
|
e24925c743
|
commander: added some failsafe logic
|
2014-06-18 19:01:41 +02:00 |
|
Anton Babushkin
|
55e5f747de
|
commander: modes display fixes, don't activate failsafe while disarmed
|
2014-06-17 13:19:50 +02:00 |
|
Anton Babushkin
|
e0ed0625f8
|
commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions
|
2014-06-16 17:34:21 +02:00 |
|
Julian Oes
|
d48a8bc073
|
navigator: renamed the different RTL states
|
2014-06-12 19:09:18 +02:00 |
|
Julian Oes
|
ed6c2a5168
|
commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP)
|
2014-05-27 21:56:32 +02:00 |
|
Julian Oes
|
063caba36b
|
Merge branch 'master' into navigator_rewrite
Conflicts:
src/drivers/gps/gps.cpp
src/drivers/gps/mtk.cpp
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
src/modules/navigator/mission.cpp
src/modules/navigator/mission.h
src/modules/navigator/navigator_main.cpp
src/modules/navigator/navigator_state.h
src/modules/position_estimator_inav/position_estimator_inav_main.c
|
2014-05-26 20:19:11 +02:00 |
|
Lorenz Meier
|
064329dd09
|
commander: put circuit breaker into effect
|
2014-05-25 20:34:32 +02:00 |
|
Lorenz Meier
|
c7bf00562d
|
commander: Enforce (in presence of power sensing) that a) system is not purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail
|
2014-05-25 08:22:54 +02:00 |
|
Lorenz Meier
|
5f752cdb7c
|
commander: Better audio indications on arming reject reasons
|
2014-05-23 13:41:48 +02:00 |
|
Anton Babushkin
|
b12928548c
|
Merge branch 'master' into acro2
|
2014-05-20 00:03:00 +02:00 |
|
Anton Babushkin
|
349809f535
|
sensors, commander: code style fixed
|
2014-05-11 13:36:51 +02:00 |
|
Anton Babushkin
|
88b18bbad1
|
ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL
|
2014-05-11 13:35:05 +02:00 |
|
TickTock-
|
31089a290b
|
Replaces poshold/althold with posctrl/altctrl
|
2014-04-28 21:47:45 -07:00 |
|
TickTock-
|
269800b48c
|
renamed EASY to POSHOLD and SEATBELT to ALTHOLD
|
2014-04-27 14:06:00 -07:00 |
|
Julian Oes
|
3a12cb4648
|
Merge remote-tracking branch 'px4/master' into navigator_cleanup
|
2014-04-26 12:56:18 +02:00 |
|
Lorenz Meier
|
4a949a9565
|
Merge pull request #749 from DonLakeFlyer/ArmDisarm
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
|
2014-04-26 12:24:42 +02:00 |
|
Julian Oes
|
c3c0328e8b
|
navigator: lot's of cleanup (WIP)
|
2014-04-21 17:36:59 +02:00 |
|
Don Gagne
|
b9a56fbeb9
|
Fixed bug with transition from in air restore to armed
Also added better debug output for invalid transitions
|
2014-03-27 13:05:51 -07:00 |
|
Don Gagne
|
521539897e
|
Simpler state transition code
Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR
transition.
|
2014-03-26 14:51:57 -07:00 |
|
Don Gagne
|
4b980b508c
|
arming_state_transition now outputs error messages
If mavlink fd is passed in method will output reason for arming failure
to mavlink.
|
2014-03-16 21:39:06 -07:00 |
|
Lorenz Meier
|
2fe9f65c45
|
commander: Fixed compile error and some stupidity in usage of path names
|
2014-03-16 19:16:18 +01:00 |
|
Lorenz Meier
|
6db2191a71
|
commander: Skip devices we do not want to touch in HIL
|
2014-03-16 18:50:20 +01:00 |
|
Lorenz Meier
|
c52969639f
|
Merged upstream mavlink2_hil branch
|
2014-03-16 18:42:07 +01:00 |
|
Lorenz Meier
|
8383603f76
|
commander: Linting: Reduce scope of variable
|
2014-03-16 18:41:03 +01:00 |
|
Lorenz Meier
|
772fce9f82
|
commander: Improve HIL publication blocking call handling
|
2014-03-16 18:38:55 +01:00 |
|
Anton Babushkin
|
8818425e58
|
commander: fixed message formatting when disabling sensors publishing in HIL mode
|
2014-03-16 18:25:09 +04:00 |
|
Anton Babushkin
|
b165e6ba20
|
Merge branch 'master' into acro2
|
2014-03-08 22:19:18 +04:00 |
|
Lorenz Meier
|
1b978293d9
|
Merged master into beta
|
2014-02-11 08:24:18 +01:00 |
|
Anton Babushkin
|
77c6231c8e
|
Merge branch 'beta' into acro2
|
2014-02-01 11:27:41 +01:00 |
|
Anton Babushkin
|
8897894b19
|
commander, navigator, mc_att_control, mc_pos_control: code style fixed
|
2014-02-01 11:14:21 +01:00 |
|
Anton Babushkin
|
7f4f9a5f5f
|
ACRO mode implemented
|
2014-01-31 22:44:05 +01:00 |
|
Anton Babushkin
|
d1508a7813
|
vehicle_control_mode publication moved to commander, WIP
|
2014-01-27 20:49:17 +01:00 |
|
Anton Babushkin
|
b7c69262a7
|
state_machine_helper: added missed transition to FAILSAFE_STATE_LAND, transition conditions fixed
|
2014-01-26 11:58:50 +01:00 |
|
Anton Babushkin
|
7d2efe9367
|
commander, navigator: minor cleanup (refactoring), code style fixed
|
2014-01-26 11:52:33 +01:00 |
|
Anton Babushkin
|
c7f0553938
|
cammander: state machine can now deny current state (e.g. when position lock lost during EASY mode), added FAILSAFE_STATE_LAND
|
2014-01-26 11:50:34 +01:00 |
|
Anton Babushkin
|
ebc7cb03b7
|
«flighttermination state» replaced by more general «failsafe state»
|
2014-01-25 23:24:12 +01:00 |
|
Lorenz Meier
|
c4dc310ebd
|
Fixed bogus return value of publication blocking disable
|
2014-01-14 14:03:57 +01:00 |
|
Lorenz Meier
|
b23af61087
|
System disables all driver publications it can get hold of once entering HIL
|
2014-01-12 11:47:35 +01:00 |
|
Anton Babushkin
|
7e29028429
|
Moving nav state from commander to navigator, WIP
|
2013-12-29 12:16:49 +04:00 |
|
Thomas Gubler
|
367d5d0cf2
|
fix wrong usage of navigation state in flighttermination state machine
|
2013-12-14 11:02:16 +01:00 |
|
Thomas Gubler
|
278e05e425
|
added simple flight termination state machine which enbales parachute on request
|
2013-12-08 16:52:41 +01:00 |
|
Thomas Gubler
|
668f9dc552
|
enable seatbelt without position lock for non rotary wing vehicles
|
2013-11-08 16:45:22 +01:00 |
|
Lorenz Meier
|
db4ff7f080
|
Merge pull request #446 from PX4/commander_fixes
commander fixes
|
2013-10-13 03:10:23 -07:00 |
|