diff --git a/msg/ManualControlSwitches.msg b/msg/ManualControlSwitches.msg index 4d1cbab..39b6efe 100644 --- a/msg/ManualControlSwitches.msg +++ b/msg/ManualControlSwitches.msg @@ -29,6 +29,8 @@ uint8 transition_switch # VTOL transition switch: _HOVER, FORWARD_FLIGH uint8 photo_switch # Photo trigger switch uint8 video_switch # Photo trigger switch +uint8 payload_power_switch # Payload power switch + uint8 engage_main_motor_switch # Engage the main motor (for helicopters) uint32 switch_changes # number of switch changes diff --git a/msg/RcChannels.msg b/msg/RcChannels.msg index 546755f..b932dfd 100644 --- a/msg/RcChannels.msg +++ b/msg/RcChannels.msg @@ -28,13 +28,14 @@ uint8 FUNCTION_FLTBTN_SLOT_4 = 24 uint8 FUNCTION_FLTBTN_SLOT_5 = 25 uint8 FUNCTION_FLTBTN_SLOT_6 = 26 uint8 FUNCTION_ENGAGE_MAIN_MOTOR = 27 +uint8 FUNCTION_PAYLOAD_POWER = 28 uint8 FUNCTION_FLTBTN_SLOT_COUNT = 6 uint64 timestamp_last_valid # Timestamp of last valid RC signal float32[18] channels # Scaled to -1..1 (throttle: 0..1) uint8 channel_count # Number of valid channels -int8[28] function # Functions mapping +int8[29] function # Functions mapping uint8 rssi # Receive signal strength index bool signal_lost # Control signal lost, should be checked together with topic timeout uint32 frame_drop_count # Number of dropped frames diff --git a/msg/SystemPower.msg b/msg/SystemPower.msg index 21b35ba..05754da 100644 --- a/msg/SystemPower.msg +++ b/msg/SystemPower.msg @@ -1,5 +1,6 @@ uint64 timestamp # time since system start (microseconds) float32 voltage5v_v # peripheral 5V rail voltage +float32 voltage_payload_v # payload rail voltage float32[4] sensors3v3 # Sensors 3V3 rail voltage uint8 sensors3v3_valid # Sensors 3V3 rail voltage was read (bitfield). uint8 usb_connected # USB is connected when 1 @@ -10,6 +11,7 @@ uint8 periph_5v_oc # peripheral overcurrent when 1 uint8 hipower_5v_oc # high power peripheral overcurrent when 1 uint8 comp_5v_valid # 5V to companion valid uint8 can1_gps1_5v_valid # 5V for CAN1/GPS1 valid +uint8 payload_v_valid # payload rail voltage is valid uint8 BRICK1_VALID_SHIFTS=0 uint8 BRICK1_VALID_MASK=1