31b5d0f5c8
Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-25 20:30:01 -07:00
84943644d7
mc_pos_control: parameters comments minor fixes
2014-04-25 23:06:32 +02:00
a432ed4900
mc_pos_control: convert tilt_max to degrees
2014-04-25 22:53:48 +02:00
2453b354fa
Failsafe landing without position control fixed
2014-04-25 22:26:51 +02:00
0c1de81785
Merge branch 'master' into mpc_rc
2014-04-25 21:39:59 +02:00
f0298e005a
Merge pull request #852 from PX4/sensors_loop
...
sensors: Keep looping in sensors app even if gyros do not update any mor...
2014-04-25 16:52:53 +02:00
22aaae197b
Merge branch 'rc_timeout' into mpc_rc
2014-04-24 22:40:46 +02:00
63c50676f9
MISSION switch renamed to LOITER
2014-04-24 22:38:19 +02:00
cfe346ddfa
Merge remote-tracking branch 'upstream/master' into mtecs
2014-04-24 16:19:42 +02:00
db474072a7
Merge branch 'rc_timeout' into mpc_rc
2014-04-23 19:03:03 +02:00
56592ec77d
commander: don't start RTL on failsafe if landed
2014-04-23 19:01:05 +02:00
d7d6a3d3b7
filter gps simulation hil gps message with sysid
2014-04-23 16:26:44 +02:00
a2940182ef
add parameter to mavlink app to allow parsing of HIL GPS message even if not in HIL mode
...
Conflicts:
src/modules/mavlink/mavlink_receiver.cpp
2014-04-23 15:53:48 +02:00
34597599fc
navigator: merging bug fixed
2014-04-23 15:26:24 +02:00
dc8a0b291a
Merge branch 'mpc_local_pos' into mpc_rc
2014-04-23 15:25:13 +02:00
320c97c498
navigator: check if mission reached on vehicle_status updates
2014-04-23 15:24:45 +02:00
2998685a3a
Merge branch 'mpc_local_pos' into mpc_rc
2014-04-23 14:22:52 +02:00
60554c8a56
navigator: publish global_position_setpoint on vehicle_status updates
2014-04-23 14:15:59 +02:00
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
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
831a7c4a83
Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default to THROTTLE
2014-04-22 20:53:07 -07:00
7e621070ca
renamed mission_switch to loiter_switch and assisted_switch to easy_switch
2014-04-22 18:23:27 -07:00
d6e6ee3440
Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-22 17:43:36 -07:00
a1cf8801bb
sdlog2: add failsafe state logging
2014-04-22 11:36:25 +02:00
e4a4430f9f
Merge branch 'master' into rc_timeout
2014-04-22 11:18:07 +02:00
302233a34f
Merge branch 'master' into mpc_local_pos
2014-04-22 11:13:11 +02:00
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
a30411e9f2
Fixed printing in attitude control
2014-04-22 11:02:53 +02:00
4585df1182
Robustified filter init / sequencing
2014-04-22 11:02:31 +02:00
1e80e62491
ekf: Better variable zeroing
2014-04-22 10:26:44 +02:00
bd637697e4
Removed verbose print
2014-04-22 10:26:26 +02:00
2ecaab98f9
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
2014-04-22 09:58:07 +02:00
aefea1a95d
Merge pull request #850 from PX4/mavlink_startup_cleanup
...
mavlink: Start the same in HIL mode as in normal mode. Requires all HIL ...
2014-04-22 09:57:56 +02:00
af56e65a37
Merge branch 'master' into ekf_params
2014-04-22 09:57:28 +02:00
bf4558c31b
Reduce data manager SD card wear and tear
...
When the data manager was first designed each file record contained a 2
byte header and an 126 byte data section, resulting in a record length
of 128 bytes. Along the way it was decided to add 2 spare bytes to the
record header, but regrettably the data section was not correspondingly
reduced in size so we end up with a record length of 130 bytes. This is
bad since it does not align with SD card flash sectors and results in
more erase/write flash cycles than necessary thus reducing the SD cards
life.
This update reduced the data section of the data manager to 124,
resulting in an optimal record length of 128 bytes.
In order to avoid the reuse of data previously written data in the old
format, which could result in catastrophic misinterpretation, the data
manager file is checked at startup. If it is found to be in the old
format, it is deleted and recreated with in the new record length. In
this case previously stored data is lost, but that is far safer than the
unpredictable result of using the old file.
2014-04-22 01:19:01 -04:00
125f0b2f88
Added trap to filter to catch NaN handling
2014-04-22 02:25:38 +02:00
39a0d4e54d
Better error handling / reporting in filter
2014-04-22 02:24:29 +02:00
904ada124b
ekf: Put reset statements after variable zero operation to ensure values get initialized correctly
2014-04-22 02:15:33 +02:00
119dfc44e2
Merged home_fix
2014-04-22 01:42:12 +02:00
3a4874b22e
Merge branch 'sensors_loop' of github.com:PX4/Firmware into ekf_params
2014-04-22 01:40:45 +02:00
42e9c84d50
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
2014-04-22 01:40:27 +02:00
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
db15e2811e
commander: Fix altitude initialisation, do not depend on global pos valid flag.
2014-04-22 01:36:32 +02:00
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
815e221c1f
mavlink: Start the same in HIL mode as in normal mode. Requires all HIL tools to run sh /etc/init.d/rc.usb now. Improve UART error handling
2014-04-22 01:23:55 +02:00
706d08055d
Better / cleaner initialization of the attitude estimator
2014-04-22 01:18:30 +02:00
d41a01483a
fw_att_pos_estimator: lines were commented out by mistake
2014-04-21 22:48:12 +02:00
267b78f072
Fix of errors triggered by more pedantic compile options
2014-04-21 21:31:30 +02:00
5e32ca29d5
Fixed LPOS message in log, added ground flags field
2014-04-21 21:25:54 +02:00
6297b451ba
sdlog2: Fix indendation to expose length better, cut string lengths for excessive strings
2014-04-21 21:00:24 +02:00
TickTock-