Commit Graph

163 Commits

Author SHA1 Message Date
Julian Oes 73d6121a9d Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/uORB/topics/rc_channels.h
2014-07-02 15:15:26 +02:00
Julian Oes fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
2014-07-02 14:59:43 +02:00
Lorenz Meier 45016b0df0 Merge pull request #984 from PX4/rc_channels
rc_channels cleanup
2014-06-30 17:11:14 +02:00
Lorenz Meier 083d605f8a sensors: Warning fixes 2014-06-30 12:22:06 +02:00
Don Gagne 92adbe9216 Fix compiler warnings 2014-06-29 17:47:24 -07:00
Darryl Taylor 2475efe13d Pre-compute board orientation offsets on param update. 2014-06-19 13:22:45 +08:00
Darryl Taylor 5ed1cf7e8d Fixed too-long param names. 2014-06-18 21:34:38 +08:00
Darryl Taylor 90a89ff2cd WIP: Support in-flight fine tuning of board alignment. Implemented by applying a user supplied rotation matrix via new SENS_BOARD_(PITCH, ROLL, YAW)_OFF params in the sensors app. Currently only tested in QGC. 2014-06-18 20:27:35 +08:00
Anton Babushkin 950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +02:00
Anton Babushkin e92620b9b2 rc_channels topic cleanup 2014-05-20 23:15:58 +02:00
Anton Babushkin b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Lorenz Meier 97e6090700 Merge pull request #937 from gumstix/aerocore
Aerocore
2014-05-15 01:31:24 -07:00
Lorenz Meier f4279ccc0d sensors: Reduce stack mildly by 50 bytes 2014-05-15 07:35:39 +02:00
Ash Charles e5508a1aa0 Add Gumstix AeroCore device
Based on the work of Andrew Smith [1], add board configuration and device
drivers to support the Gumstix AeroCore (previously Aerodroid) board [2]. The
AeroCore is an autopilot board based on a STM32F427 similar to the FMUv2.

[1] https://github.com/smithandrewc/Firmware
[2] https://store.gumstix.com/index.php/products/585/

Signed-off-by: Ash Charles <ashcharles@gmail.com>
2014-05-13 09:41:41 -07:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler 8cbd38061c sensors: use new manual control setpoint variable names 2014-05-12 09:24:49 +02:00
Anton Babushkin aae42d2607 sensors: commented "offboard" switch removed 2014-05-11 13:41:37 +02:00
Anton Babushkin 349809f535 sensors, commander: code style fixed 2014-05-11 13:36:51 +02:00
Anton Babushkin 808badb34d Use "POSCTL" switch name consistently 2014-05-11 12:54:15 +02:00
Lorenz Meier 88194c5971 Remove noreturn attribute from all apps that actually can return 2014-05-09 09:20:08 +02:00
TickTock- 6c76e8ea50 shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch mapping later 2014-04-29 20:51:04 -07: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
TickTock- 6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock- 07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Lorenz Meier c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +02:00
Lorenz Meier eb520e7dcd Merge pull request #849 from PX4/compile_pedantic
Compile pedantic
2014-04-26 12:22:13 +02:00
Anton Babushkin 0c1de81785 Merge branch 'master' into mpc_rc 2014-04-25 21:39:59 +02:00
Anton Babushkin 63c50676f9 MISSION switch renamed to LOITER 2014-04-24 22:38:19 +02:00
TickTock- 971e8fc4ff Made failsafe more intuitive. Default (0) maps to whatever channel is throttle. If a non-zero value is entered, a direct channel map is used so use 2014-04-22 23:19:04 -07:00
TickTock- 81c03154b9 Added ASSISTED, AUTO, EASY, RETURN, & LOITER programmable thresholds to enable various user mode switch configs (orig., 2x3, 1x6, etc). 2014-04-22 21:49:29 -07: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
Lorenz Meier ca77c380b5 sensors: Keep looping in sensors app even if gyros do not update any more. There are lots of other reasons we might want to keep clocking the system. This resolves the RC timeout dependency in HIL. 2014-04-22 01:25:25 +02:00
Lorenz Meier 267b78f072 Fix of errors triggered by more pedantic compile options 2014-04-21 21:31:30 +02:00
TickTock- 86a0862af6 Added rc_map_failsafe to enable use of channels other than throttle for failsafe. 2014-04-19 13:07:09 -07:00
Anton Babushkin 9f52c44593 sensors: use timestamp_last_signal for actuator_group_3 timestamping 2014-04-07 14:34:14 +04:00
Anton Babushkin eb5cd54023 sensors: lost signal detection rewritten to be more clear 2014-04-07 14:32:37 +04:00
Anton Babushkin aa9ce7cd24 Merge branch 'master' into rc_timeout 2014-04-06 14:47:31 +04:00
Lorenz Meier a1a4013d02 Populate air temperature field 2014-04-05 17:24:11 +02:00
Lorenz Meier e6d48c4f32 Fix failsafe assignment in sensors app 2014-04-05 17:12:21 +02:00
Lorenz Meier 671d35f67c Fix logic for S.Bus failsafe detection 2014-04-05 16:05:58 +02:00
Anton Babushkin b00b70aeb2 manual_control_setpoint: signal_lost flag removed, sensors: bugs fixed 2014-04-05 16:06:10 +04:00
Anton Babushkin 77190f5052 sensors: bug fixed 2014-04-05 15:42:23 +04:00
Anton Babushkin 0b45e01db9 Merge branch 'failsafe_sbus_cleanup' into rc_timeout 2014-04-05 15:29:46 +04:00
Lorenz Meier 3b5e6f9833 sensors and px4io driver: Guard against failsafe trigger for inverted remotes 2014-04-05 11:28:07 +02:00
Lorenz Meier 797698a7a1 Trigger failsafe action also on failsafe flag 2014-04-05 10:34:35 +02:00
Lorenz Meier fb44ad8e22 Simplify the failsafe handling, reduce 3 params to one 2014-04-05 10:29:17 +02:00