Lorenz Meier
eb520e7dcd
Merge pull request #849 from PX4/compile_pedantic
...
Compile pedantic
2014-04-26 12:22:13 +02:00
Lorenz Meier
b20fe3b2ba
Merge pull request #869 from PX4/warnings
...
warnings: don't spam with warning for missing field initializer
2014-04-26 12:03:43 +02:00
Julian Oes
dcf1dbb7f4
warnings: don't spam with warning for missing field initializer
2014-04-26 11:48:43 +02:00
TickTock-
31b5d0f5c8
Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-25 20:30:01 -07:00
Anton Babushkin
84943644d7
mc_pos_control: parameters comments minor fixes
2014-04-25 23:06:32 +02:00
Anton Babushkin
a432ed4900
mc_pos_control: convert tilt_max to degrees
2014-04-25 22:53:48 +02:00
Anton Babushkin
ac0b50eaa4
rc_mode_switch diagram updated
2014-04-25 22:41:26 +02:00
Anton Babushkin
2453b354fa
Failsafe landing without position control fixed
2014-04-25 22:26:51 +02:00
Anton Babushkin
0c1de81785
Merge branch 'master' into mpc_rc
2014-04-25 21:39:59 +02:00
ufoncz
fd95adc710
corrections before xmerge
2014-04-25 21:34:45 +02:00
ufoncz
08e5ed5a1d
added version nsh command, it can replace hw_ver
...
sss
2014-04-25 21:14:12 +02:00
Lorenz Meier
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
Lorenz Meier
9d08517c31
Merge pull request #867 from PX4/launchdetector_copyright
...
launchdetector: fix copyright header
2014-04-25 16:43:53 +02:00
Thomas Gubler
437825a5a8
launchdetector: fix copyright header
2014-04-25 16:39:16 +02:00
Lorenz Meier
5ef57b8af6
Merge pull request #843 from PX4/sensor_err_handling
...
Sensor error handling
2014-04-25 10:14:08 +02:00
Anton Babushkin
22aaae197b
Merge branch 'rc_timeout' into mpc_rc
2014-04-24 22:40:46 +02:00
Anton Babushkin
63c50676f9
MISSION switch renamed to LOITER
2014-04-24 22:38:19 +02:00
Lorenz Meier
7e5b684f8c
Merge pull request #860 from PX4/vicongpssimulation
...
Indoor gps simulation mode
2014-04-24 16:36:24 +02:00
Thomas Gubler
fbd782ff06
remove tags file
2014-04-24 16:32:56 +02:00
Lorenz Meier
8102c5a460
Merge pull request #862 from thomasgubler/gitignore_tags
...
add tags file to .gitignore
2014-04-24 16:13:21 +02:00
Thomas Gubler
496cba0855
add tags file to .gitignore
2014-04-24 16:03:36 +02:00
Anton Babushkin
db474072a7
Merge branch 'rc_timeout' into mpc_rc
2014-04-23 19:03:03 +02:00
Anton Babushkin
56592ec77d
commander: don't start RTL on failsafe if landed
2014-04-23 19:01:05 +02:00
Thomas Gubler
d7d6a3d3b7
filter gps simulation hil gps message with sysid
2014-04-23 16:26:44 +02:00
Thomas Gubler
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
Anton Babushkin
34597599fc
navigator: merging bug fixed
2014-04-23 15:26:24 +02:00
Anton Babushkin
dc8a0b291a
Merge branch 'mpc_local_pos' into mpc_rc
2014-04-23 15:25:13 +02:00
Anton Babushkin
320c97c498
navigator: check if mission reached on vehicle_status updates
2014-04-23 15:24:45 +02:00
Anton Babushkin
2998685a3a
Merge branch 'mpc_local_pos' into mpc_rc
2014-04-23 14:22:52 +02:00
Anton Babushkin
60554c8a56
navigator: publish global_position_setpoint on vehicle_status updates
2014-04-23 14:15:59 +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
Anton Babushkin
a1cf8801bb
sdlog2: add failsafe state logging
2014-04-22 11:36:25 +02: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
Lorenz Meier
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
Lorenz Meier
f0e28a60ca
Revert "HIL: Increased MAVLink link wait time based on previous experience that this is timing sensitive."
...
This reverts commit 78bf7ed969
.
2014-04-22 09:57:16 +02:00
Lorenz Meier
5481b91ed1
Merge pull request #854 from jean-m-cyr/master
...
Reduce data manager SD card wear and tear
2014-04-22 09:39:13 +02:00
Jean Cyr
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
Lorenz Meier
af33660351
Merge pull request #853 from PX4/hil_batt_fix
...
commander: Also publish battery status in HIL, since we have a fake batt...
2014-04-22 01:39:12 +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
20f20d54b0
Merge pull request #848 from PX4/lpos_logfix
...
Lpos logfix
2014-04-22 01:32:11 +02:00
Lorenz Meier
25b64e07ab
Merge pull request #851 from PX4/hil_hotfix
...
HIL: Increased MAVLink link wait time based on previous experience that ...
2014-04-22 01:30:08 +02:00
Lorenz Meier
78bf7ed969
HIL: Increased MAVLink link wait time based on previous experience that this is timing sensitive.
2014-04-22 01:29:39 +02: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
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
Lorenz Meier
267b78f072
Fix of errors triggered by more pedantic compile options
2014-04-21 21:31:30 +02:00