Commit Graph

165 Commits

Author SHA1 Message Date
TSC21
db48df15c8 Merge branch 'master' 2015-05-21 12:26:55 +01:00
TSC21
80c7719b42 distance_sensor: typo correction on msg.type 2015-05-20 12:51:20 +01:00
TSC21
796b105382 distance_sensor: updated distance_sensor stream sub 2015-05-20 00:54:36 +01:00
Lorenz Meier
e5fad077df Merge master into linux 2015-05-18 23:28:57 +02:00
Lorenz Meier
83fdb9931a commander / mavlink: Add battery status to output BATTERY_STATUS MAVLink message 2015-05-17 17:44:51 +02:00
Mark Charlebois
190814bc97 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/drivers/rgbled/rgbled.cpp
	src/modules/commander/PreflightCheck.cpp
	src/modules/commander/airspeed_calibration.cpp
	src/modules/commander/calibration_routines.cpp
	src/modules/commander/gyro_calibration.cpp
	src/modules/commander/mag_calibration.cpp
	src/modules/mc_att_control/mc_att_control_main.cpp
2015-04-28 11:48:26 -07:00
Lorenz Meier
1d283bf3c1 MAVLink app: Fix usage of static struct, make streams list const 2015-04-26 14:33:57 +02:00
Lorenz Meier
af22c49497 MAVLink app: send correct value when not estimating battery charge level 2015-04-25 09:45:16 +02:00
Mark Charlebois
a1332e699c QuRT and POSIX changes - part 5
Last part of the main QuRT related changes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-24 01:39:25 -07:00
Lorenz Meier
8279de5a0b MAVLink app: Cleanup RC channel messages / handling 2015-04-21 06:58:03 +02:00
Thomas Gubler
2b2f7e9407 introduce offboard control mode topic
Replace offboard_control_setpoint with offboard_control_mode
Remove all setpoint data from the topic as it's  not used anymore
(setpoint data is directly routed into position/attitude setpoint topics
for some time now)
Remove mode enum and replace with ignore booleans which map better to
the mavlink message
Mavlink: Rework parsing of offboard setpoints
Commander: in offboard mode set control flags based on ignore flags
instead of enum
2015-02-28 15:19:15 +01:00
Lorenz Meier
ccc6f0b020 Improve multi-stream handling by template and index usage. Can be consolidated slightly once multiplatform code knows about multi-topics 2015-02-13 09:33:12 +01:00
Lorenz Meier
dcf03a2594 mavlink app: Use actuator controls message 2015-02-13 09:33:12 +01:00
Thomas Gubler
84ff3c671d Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
	src/drivers/px4fmu/fmu.cpp
2015-02-01 11:06:47 +01:00
Lorenz Meier
cbe3783d5e Support topic groups in MAVLink subscription handling 2015-01-29 16:33:53 +01:00
Thomas Gubler
2d124852c1 propagate uorb contants change through all modules/drivers 2015-01-28 16:31:41 +01:00
Lorenz Meier
7d0c89ded7 mavlink app: Abort writing to text log on microSD once SD is not writeabele any more after 5 tries. Fix to first message write. 2015-01-04 15:53:07 +01:00
Lorenz Meier
5439aa12c0 Merge pull request #1505 from mhkabir/timesync
Timesync
2015-01-04 11:41:44 +01:00
M.H.Kabir
c29972424f fix timestamp 2014-12-27 12:56:31 +01:00
Daniel Agar
d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
M.H.Kabir
f7da65f819 Fix formatting 2014-12-16 14:08:28 +05:30
M.H.Kabir
a5591b4791 Merge remote-tracking branch 'upstream/master' into timesync
Conflicts:
	src/modules/mavlink/mavlink_messages.cpp
2014-12-16 13:50:35 +05:30
M.H.Kabir
8c0d7047b2 Working now. 2014-12-16 13:43:48 +05:30
tumbili
736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
M.H.Kabir
e1bdc4a0fb New timesync interface import. Not working yet. 2014-12-15 14:23:27 +05:30
Thomas Gubler
ea4876da38 mavlink: distance sensor: fix max value 2014-12-13 18:19:12 +01:00
Lorenz Meier
b4a3dcb2f0 Merge pull request #1391 from PX4/vfr_fix
mavlink: use altitude AMSL in VFR message
2014-12-06 17:51:10 +01:00
Roman Bapst
0dc202502d added VTOL geometries to determine number of motors 2014-12-02 10:49:19 +01:00
Lorenz Meier
cbcd1ea1d1 Merged PX4Flow driver changes 2014-11-26 07:43:19 +01:00
Lorenz Meier
4a66b29e55 Merge pull request #1420 from PX4/rctype
Encode RC type in RSSI field for GCS
2014-11-17 00:03:31 +01:00
Lorenz Meier
18dc5e3429 Fix compile warning in MAVLink app 2014-11-15 20:07:32 +01:00
Lorenz Meier
62db84fa75 MAVLink update compile fixes 2014-11-09 18:20:53 +01:00
Anton Babushkin
88bb192722 Merge branch 'master' into vfr_fix 2014-11-08 15:49:23 +01:00
Lorenz Meier
412ddde5dc Force RSSI to zero if RC is lost 2014-11-01 16:58:12 +01:00
Lorenz Meier
c442f820dd Encode RC type in RSSI field for GCS 2014-11-01 16:54:11 +01:00
dominiho
9f64953bb9 replaced optical_flow mavlink message with optical_flow_rad, added gyro_temperature, adapted sd2log for px4flow integral frame 2014-10-30 16:39:02 +01:00
Lorenz Meier
a1ea16f794 Log text messages only in first instance 2014-10-17 09:39:50 +02:00
Lorenz Meier
f500ad4699 Log messages sent via MAVLink 2014-10-17 09:38:04 +02:00
Anton Babushkin
2c023c5d01 mavlink: use altitude AMSL in VFR message 2014-10-16 22:52:08 +02:00
Lorenz Meier
fa194832ce mavlink: Handle new auto sub states. 2014-10-09 09:24:47 +02:00
Lorenz Meier
7bde4fa634 Revert "Use global position altitude to report HUD altitude, for consistency." 2014-10-04 12:31:16 +02:00
tstellanova
5846f217d0 Use global position altitude to report HUD altitude, for consistency.
Otherwise the HUD altitude jumps between two very different values.
2014-10-03 17:18:44 -07:00
Lorenz Meier
b928897ab5 mavlink: code style only fix 2014-08-27 07:58:36 +02:00
Thomas Gubler
3a029926b4 vfr_hud mavlink msg: use baro alt
The vfr_hud message demands the AMSL altitude and not the wgs84
altitude. Use the baro altitude for now. This can be changed to an
output of the position estimator later.
2014-08-23 22:36:40 +02:00
sjwilks
e9b0ee7501 Merge pull request #1273 from PX4/rc_fix
Fixed copy & paste error on RC output
2014-08-14 12:38:08 +02:00
Lorenz Meier
e03c4d4b65 Fixed copy & paste error on RC output 2014-08-14 12:34:47 +02:00
Anton Babushkin
54a6e66ada mavlink: in HIL_CONTROLS send 0 for disabled channels 2014-08-13 19:46:35 +02:00
Lorenz Meier
9ecec7fada Add default initializers and timestamp in local position 2014-08-10 01:30:25 +02:00
Lorenz Meier
5225d87854 Updated MAVLink to latest revision 2014-08-10 01:24:04 +02:00
Anton Babushkin
f3ec46369b mavlink: all streams ported to new API 2014-07-28 20:30:58 +02:00