Anton Babushkin
56592ec77d
commander: don't start RTL on failsafe if landed
2014-04-23 19:01:05 +02:00
Anton Babushkin
2998685a3a
Merge branch 'mpc_local_pos' into mpc_rc
2014-04-23 14:22:52 +02:00
TickTock-
831a7c4a83
Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default to THROTTLE
2014-04-22 20:53:07 -07:00
TickTock-
7e621070ca
renamed mission_switch to loiter_switch and assisted_switch to easy_switch
2014-04-22 18:23:27 -07:00
TickTock-
d6e6ee3440
Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-22 17:43:36 -07:00
Anton Babushkin
e4a4430f9f
Merge branch 'master' into rc_timeout
2014-04-22 11:18:07 +02:00
Anton Babushkin
302233a34f
Merge branch 'master' into mpc_local_pos
2014-04-22 11:13:11 +02:00
Julian Oes
fd56c15a20
Merge remote-tracking branch 'px4/master' into navigator_cleanup
...
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
src/modules/mavlink/mavlink_main.cpp
src/modules/mavlink/mavlink_messages.cpp
src/modules/mavlink/module.mk
src/modules/sdlog2/sdlog2_messages.h
2014-04-22 11:10:48 +02:00
Lorenz Meier
119dfc44e2
Merged home_fix
2014-04-22 01:42:12 +02:00
Lorenz Meier
42e9c84d50
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
2014-04-22 01:40:27 +02:00
Lorenz Meier
a0c9227044
commander: Also publish battery status in HIL, since we have a fake battery available and the system freaks out without knowing its main supply
2014-04-22 01:38:15 +02:00
Lorenz Meier
db15e2811e
commander: Fix altitude initialisation, do not depend on global pos valid flag.
2014-04-22 01:36:32 +02:00
Julian Oes
c3c0328e8b
navigator: lot's of cleanup (WIP)
2014-04-21 17:36:59 +02:00
Lorenz Meier
37b133e231
Added home position switch on GPS position - gives a more reliable home position setup
2014-04-21 12:28:11 +02:00
Lorenz Meier
0a89364e3c
Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params
2014-04-21 11:23:35 +02:00
Anton Babushkin
8634780e80
Merge branch 'master' into mpc_rc
2014-04-20 20:10:39 +02:00
Lorenz Meier
46a796fb86
Added home position switch on GPS position - gives a more reliable home position setup
2014-04-20 03:04:56 +02:00
Thomas Gubler
93227f9200
commander: handle_command: do not filter command if componentid == 0
2014-04-18 22:05:46 +02:00
Thomas Gubler
03a3b1d671
commander: handle_command: filter commands by sysid and componentid
2014-04-18 22:05:46 +02:00
Julian Oes
3dd64086e4
commander: put unsupported warning back in place
2014-04-18 22:05:45 +02:00
Julian Oes
3fa82675e7
commander: don't beep if message is not understood
2014-04-18 22:05:45 +02:00
Anton Babushkin
88149311ea
Merge branch 'rc_timeout' into mpc_rc
2014-04-13 11:06:49 +04:00
Anton Babushkin
0b97dd2b77
commander: brackets added to return switch check
2014-04-09 18:55:55 +04:00
Thomas Gubler
bccdbde45e
commander: handle_command: do not filter command if componentid == 0
2014-04-08 17:29:11 +02:00
Thomas Gubler
a6215b7bda
commander: handle_command: filter commands by sysid and componentid
2014-04-08 17:10:22 +02:00
Don Gagne
c1545bd237
Fix float equality comparison
...
Also restructured incorrect return statement
2014-04-07 18:56:03 -07:00
Julian Oes
fc2bfb828f
Merge remote-tracking branch 'px4/master' into mavlink_broadcast
2014-04-07 21:45:45 +02:00
Julian Oes
a4a12dab33
commander: put unsupported warning back in place
2014-04-07 21:42:19 +02:00
Anton Babushkin
dfd9601b57
commander: minor comment fix
2014-04-07 17:24:39 +04:00
Anton Babushkin
b770c9fc1e
position_estimator_inav: increase acceptable EPH/EPV, in commander use EPH/EPV to decide if global position valid
2014-04-07 17:16:43 +04:00
Anton Babushkin
a4ba705e2f
commander: don't use mode switch if it's not mapped
2014-04-06 20:04:18 +04:00
Anton Babushkin
97cde3311e
commander: home publication fixed
2014-04-05 16:59:01 +04:00
Anton Babushkin
0b45e01db9
Merge branch 'failsafe_sbus_cleanup' into rc_timeout
2014-04-05 15:29:46 +04:00
Anton Babushkin
f12c765383
Merge branch 'master' into mpc_local_pos
2014-04-04 20:36:11 +04:00
Lorenz Meier
88cf841f00
Bump RC timeout for all cases to half a second
2014-04-04 18:18:17 +02:00
Julian Oes
ed7b97c020
commander: don't beep if message is not understood
2014-04-03 21:13:03 +02:00
Anton Babushkin
6f38ed3b4b
commander, navigator: use updated manual_control_setpoint
2014-04-03 20:23:34 +04:00
Anton Babushkin
367ce63b86
'signal_lost' flag added to manual_control_setpoint and rc_channels topics to indicate signal loss immediately
2014-04-03 11:45:57 +04:00
Anton Babushkin
93617c4073
commander: set home position on arming only if at least 2 s from commander start spent
2014-04-02 17:09:18 +04:00
Anton Babushkin
553b122830
caommander: setting home position by command implemented
2014-04-02 16:53:22 +04:00
Anton Babushkin
b1d39e65a6
commander: position timeout increased to 30ms
2014-04-02 15:36:11 +04:00
Anton Babushkin
63cd319ff7
commander: set home position on arming
2014-04-02 11:57:41 +04:00
Anton Babushkin
d2553bfd29
Merge branch 'master' into offboard2
2014-03-30 00:25:26 +04:00
Anton Babushkin
a991ebd8ca
Merge branch 'master' into mpc_local_pos
2014-03-28 10:44:28 +04:00
Julian Oes
66527eea02
commander: workaround to prevent RC loss in HIL
2014-03-27 17:54:29 +01:00
Anton Babushkin
83da4ae02d
'vehicle_global_position' topic updated: removed baro_alt and XXX_valid flags.
2014-03-27 00:27:11 +04:00
Don Gagne
783a240396
Function naming and remove unneeded sprintf
2014-03-17 11:01:15 -07:00
Don Gagne
dec13e7f21
Use single set of arm/disarm code
...
Set mode and arm/disarm commands now call a single method to arm
disarm, thus removing code duplication. Also calls updated
arming_state_transition method such that the arming state logic does
not need to be duplicated outside of arming_state_transition.
2014-03-16 21:38:23 -07:00
Anton Babushkin
b165e6ba20
Merge branch 'master' into acro2
2014-03-08 22:19:18 +04:00
Anton Babushkin
b76e26c5e5
commander: allow arming with safety enabled in HIL mode
2014-03-03 21:24:59 +04:00
