TickTock-
|
07c35010aa
|
Merged in upstream master
|
2014-04-27 12:43:13 -07:00 |
|
Lorenz Meier
|
f7065dce84
|
Merged master into ekf_params
|
2014-04-27 16:14:02 +02:00 |
|
Lorenz Meier
|
bfb2b8f8a0
|
Merge branch 'master' of github.com:PX4/Firmware into mtecs
|
2014-04-27 16:12:51 +02:00 |
|
Lorenz Meier
|
08408594ec
|
Renamed parameters which changed from RAD to DEGREES to avoid user confusion. Also made naming of the two parameters more consistent.
|
2014-04-27 16:06:34 +02:00 |
|
Lorenz Meier
|
e6d332aa7c
|
Make commander less pedantic about position status
|
2014-04-27 15:50:53 +02:00 |
|
Lorenz Meier
|
c74248c8b1
|
Merged mpc_rc with master
|
2014-04-27 15:45:33 +02:00 |
|
Lorenz Meier
|
96ddea0826
|
Introduce debug option for mTECS and silence it as default
|
2014-04-27 12:45:02 +02:00 |
|
Thomas Gubler
|
811dd12ac5
|
Merge remote-tracking branch 'upstream/master' into mtecs
|
2014-04-26 22:01:18 +02:00 |
|
Lorenz Meier
|
6ab878c021
|
Emit the local position against the GPS reference - this means it can jump.
|
2014-04-26 18:38:37 +02:00 |
|
Lorenz Meier
|
925430796e
|
Reworked how we deal with altitudes
|
2014-04-26 18:37:26 +02:00 |
|
Lorenz Meier
|
6612cdab85
|
Let commander be less pedantic about positioning data
|
2014-04-26 18:36:09 +02:00 |
|
Lorenz Meier
|
2d978beefb
|
Compile fixes
|
2014-04-26 16:16:44 +02:00 |
|
Lorenz Meier
|
0d50b3ea86
|
Fix struct inits
|
2014-04-26 16:06:25 +02:00 |
|
Lorenz Meier
|
9358eb2428
|
Fixed string formatting error
|
2014-04-26 15:22:03 +02:00 |
|
Lorenz Meier
|
5ad3ff95bf
|
Merged master into ekf_params
|
2014-04-26 15:19:21 +02:00 |
|
Lorenz Meier
|
ad1be765bf
|
Fix warnings, use more efficient atan2f where it can be safely used
|
2014-04-26 15:14:23 +02:00 |
|
Lorenz Meier
|
22d3bcdab6
|
Merged mpc_rc into ekf_params
|
2014-04-26 15:13:03 +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 |
|
Lorenz Meier
|
5bd8e6f6b3
|
Merge pull request #845 from PX4/mag_decl_hotfix
Mag declination hotfix
|
2014-04-26 12:23:48 +02:00 |
|
Lorenz Meier
|
eb520e7dcd
|
Merge pull request #849 from PX4/compile_pedantic
Compile pedantic
|
2014-04-26 12:22:13 +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
|
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 |
|
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 |
|
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 |
|
Thomas Gubler
|
cfe346ddfa
|
Merge remote-tracking branch 'upstream/master' into mtecs
|
2014-04-24 16:19:42 +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
|
a30411e9f2
|
Fixed printing in attitude control
|
2014-04-22 11:02:53 +02:00 |
|
Lorenz Meier
|
4585df1182
|
Robustified filter init / sequencing
|
2014-04-22 11:02:31 +02:00 |
|
Lorenz Meier
|
1e80e62491
|
ekf: Better variable zeroing
|
2014-04-22 10:26:44 +02:00 |
|
Lorenz Meier
|
bd637697e4
|
Removed verbose print
|
2014-04-22 10:26:26 +02:00 |
|