Skip to content

Commit

Permalink
Ardupilot downstream 20200129 (mavlink#1298)
Browse files Browse the repository at this point in the history 
* common: added extension for GPS_RAW_INT and GPS2_RAW for yaw - this allows moving baseline GPS configurations to show their yaw solution to the GCS. It also allows a GCS to display a warning if the GPS is configured to provide yaw (eg. configured as a moving baseline rover) and currently cannot provide yaw
* pymavlink: fixed JS test for GPS_RAW_INT
* common.xml: use https url for ardupilot.org
* ardupilotmega: add MAV_CMD_DEBUG_TRAP
* ArduPilot: Add EFI_STATUS - for Electronic Fuel Injection

Co-authored-by: Andrew Tridgell <[email protected]>
Co-authored-by: Peter Barker <[email protected]>
Co-authored-by: David Ingraham <[email protected]>
  • Loading branch information
@amilcarlucas @tridge
@peterbarker @DavidIngraham
4 people authored Feb 17, 2020
1 parent 5ae49b3 commit 6c8b8a0
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 16 deletions.
41 changes: 27 additions & 14 deletions message_definitions/v1.0/ardupilotmega.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,16 @@
<param index="1" label="battery mask">Bitmask of batteries to reset. Least significant bit is for the first battery.</param>
<param index="2" label="percentage" minValue="0" maxValue="100" increment="1">Battery percentage remaining to set.</param>
</entry>
<entry value="42700" name="MAV_CMD_DEBUG_TRAP">
<description>Issue a trap signal to the autopilot process, presumably to enter the debugger.</description>
<param index="1">Magic number - set to 32451 to actually trap.</param>
<param index="2">Empty.</param>
<param index="3">Empty.</param>
<param index="4">Empty.</param>
<param index="5">Empty.</param>
<param index="6">Empty.</param>
<param index="7">Empty.</param>
</entry>
</enum>
<!-- AP_Limits Enums -->
<enum name="LIMITS_STATE">
Expand Down Expand Up @@ -1498,21 +1508,24 @@
</message>
<!-- 219 to 224 RESERVED for more GOPRO-->
<message id="225" name="EFI_STATUS">
<description>EFI Status Output</description>
<field type="uint8_t" name="health">EFI Health status</field>
<field type="float" name="ecu_index">ECU Index</field>
<description>EFI status output</description>
<field type="uint8_t" name="health">EFI health status</field>
<field type="float" name="ecu_index">ECU index</field>
<field type="float" name="rpm">RPM</field>
<field type="float" name="fuel_consumed" units="g">Fuel Consumed (grams)</field>
<field type="float" name="fuel_flow" units="g/min">Fuel Flow Rate (g/min)</field>
<field type="float" name="engine_load" units="%">Engine Load (%)</field>
<field type="float" name="throttle_position" units="%">Throttle Position (%)</field>
<field type="float" name="spark_dwell_time" units="ms">Spark Dwell Time (ms)</field>
<field type="float" name="barometric_pressure" units="kPa">Barometric Pressure (kPa)</field>
<field type="float" name="intake_manifold_pressure" units="kPa">Intake Manifold Pressure (kPa)(</field>
<field type="float" name="intake_manifold_temperature" units="degC">Intake Manifold Temperature (degC)</field>
<field type="float" name="cylinder_head_temperature" units="degC">cylinder_head_temperature (degC)</field>
<field type="float" name="ignition_timing" units="deg">Ignition timing for cylinder i (Crank Angle degrees)</field>
<field type="float" name="injection_time" units="ms">Injection time for injector i (ms)</field>
<field type="float" name="fuel_consumed" units="g">Fuel consumed</field>
<field type="float" name="fuel_flow" units="g/min">Fuel flow rate</field>
<field type="float" name="engine_load" units="%">Engine load</field>
<field type="float" name="throttle_position" units="%">Throttle position</field>
<field type="float" name="spark_dwell_time" units="ms">Spark dwell time</field>
<field type="float" name="barometric_pressure" units="kPa">Barometric pressure</field>
<field type="float" name="intake_manifold_pressure" units="kPa">Intake manifold pressure(</field>
<field type="float" name="intake_manifold_temperature" units="degC">Intake manifold temperature</field>
<field type="float" name="cylinder_head_temperature" units="degC">Cylinder head temperature</field>
<field type="float" name="ignition_timing" units="deg">Ignition timing (Crank angle degrees)</field>
<field type="float" name="injection_time" units="ms">Injection time</field>
<field type="float" name="exhaust_gas_temperature" units="degC">Exhaust gas temperature</field>
<field type="float" name="throttle_out" units="%">Output throttle</field>
<field type="float" name="pt_compensation">Pressure/temperature compensation</field>
</message>
<message id="226" name="RPM">
<description>RPM sensor output.</description>
Expand Down
5 changes: 4 additions & 1 deletion message_definitions/v1.0/common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>SLUGS autopilot, http://slugsuav.soe.ucsc.edu</description>
</entry>
<entry value="3" name="MAV_AUTOPILOT_ARDUPILOTMEGA">
<description>ArduPilot - Plane/Copter/Rover/Sub/Tracker, http://ardupilot.org</description>
<description>ArduPilot - Plane/Copter/Rover/Sub/Tracker, https://ardupilot.org</description>
</entry>
<entry value="4" name="MAV_AUTOPILOT_OPENPILOT">
<description>OpenPilot, http://openpilot.org</description>
Expand Down Expand Up @@ -4206,6 +4206,7 @@
<field type="uint32_t" name="v_acc" units="mm">Altitude uncertainty. Positive for up.</field>
<field type="uint32_t" name="vel_acc" units="mm">Speed uncertainty. Positive for up.</field>
<field type="uint32_t" name="hdg_acc" units="degE5">Heading / track uncertainty</field>
<field type="uint16_t" name="yaw" units="cdeg">Yaw in earth frame from north. Use 0 if this GPS does not provide yaw. Use 65535 if this GPS is configured to provide yaw and is currently unable to provide it. Use 36000 for north.</field>
</message>
<message id="25" name="GPS_STATUS">
<description>The positioning status, as reported by GPS. This message is intended to display status information about each satellite visible to the receiver. See message GLOBAL_POSITION for the global position estimate. This message can contain information for up to 20 satellites.</description>
Expand Down Expand Up @@ -5172,6 +5173,8 @@
<field type="uint8_t" name="satellites_visible">Number of satellites visible. If unknown, set to 255</field>
<field type="uint8_t" name="dgps_numch">Number of DGPS satellites</field>
<field type="uint32_t" name="dgps_age" units="ms">Age of DGPS info</field>
<extensions/>
<field type="uint16_t" name="yaw" units="cdeg">Yaw in earth frame from north. Use 0 if this GPS does not provide yaw. Use 65535 if this GPS is configured to provide yaw and is currently unable to provide it. Use 36000 for north.</field>
</message>
<message id="125" name="POWER_STATUS">
<description>Power supply status</description>
Expand Down
2 changes: 1 addition & 1 deletion pymavlink
Submodule pymavlink updated 4 files
+2 −2 generator/javascript/test/message20.js
+85 −101 mavextra.py
+1 −1 setup.py
+9 −3 tools/magfit_WMM.py

0 comments on commit 6c8b8a0

Please sign in to comment.