diff --git a/mavlink_lib.py b/mavlink_lib.py index 88b070e5d3c619324a5a6946e43f5e95c7069f37..b5a90fe0311d7516e9cb83c60f1e01a1d677e42b 100644 --- a/mavlink_lib.py +++ b/mavlink_lib.py @@ -1217,17 +1217,17 @@ class MAVLink_set_stepper_steps_tc_message(MAVLink_message): name = 'SET_STEPPER_STEPS_TC' fieldnames = ['stepper_id', 'steps'] ordered_fieldnames = ['steps', 'stepper_id'] - fieldtypes = ['uint8_t', 'float'] + fieldtypes = ['uint8_t', 'int16_t'] fielddisplays_by_name = {} fieldenums_by_name = {} fieldunits_by_name = {} - format = '<fB' - native_format = bytearray('<fB', 'ascii') + format = '<hB' + native_format = bytearray('<hB', 'ascii') orders = [1, 0] lengths = [1, 1] array_lengths = [0, 0] - crc_extra = 246 - unpacker = struct.Struct('<fB') + crc_extra = 26 + unpacker = struct.Struct('<hB') instance_field = None instance_offset = -1 @@ -1240,7 +1240,7 @@ class MAVLink_set_stepper_steps_tc_message(MAVLink_message): self.steps = steps def pack(self, mav, force_mavlink1=False): - return MAVLink_message.pack(self, mav, 246, struct.pack('<fB', self.steps, self.stepper_id), force_mavlink1=force_mavlink1) + return MAVLink_message.pack(self, mav, 26, struct.pack('<hB', self.steps, self.stepper_id), force_mavlink1=force_mavlink1) class MAVLink_ack_tm_message(MAVLink_message): ''' @@ -1862,32 +1862,33 @@ class MAVLink_set_antenna_coordinates_arp_tc_message(MAVLink_message): ''' id = MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC name = 'SET_ANTENNA_COORDINATES_ARP_TC' - fieldnames = ['latitude', 'longitude'] - ordered_fieldnames = ['latitude', 'longitude'] - fieldtypes = ['float', 'float'] + fieldnames = ['latitude', 'longitude', 'height'] + ordered_fieldnames = ['latitude', 'longitude', 'height'] + fieldtypes = ['float', 'float', 'float'] fielddisplays_by_name = {} fieldenums_by_name = {} - fieldunits_by_name = {"latitude": "deg", "longitude": "deg"} - format = '<ff' - native_format = bytearray('<ff', 'ascii') - orders = [0, 1] - lengths = [1, 1] - array_lengths = [0, 0] - crc_extra = 202 - unpacker = struct.Struct('<ff') + fieldunits_by_name = {"latitude": "deg", "longitude": "deg", "height": "m"} + format = '<fff' + native_format = bytearray('<fff', 'ascii') + orders = [0, 1, 2] + lengths = [1, 1, 1] + array_lengths = [0, 0, 0] + crc_extra = 183 + unpacker = struct.Struct('<fff') instance_field = None instance_offset = -1 - def __init__(self, latitude, longitude): + def __init__(self, latitude, longitude, height): MAVLink_message.__init__(self, MAVLink_set_antenna_coordinates_arp_tc_message.id, MAVLink_set_antenna_coordinates_arp_tc_message.name) self._fieldnames = MAVLink_set_antenna_coordinates_arp_tc_message.fieldnames self._instance_field = MAVLink_set_antenna_coordinates_arp_tc_message.instance_field self._instance_offset = MAVLink_set_antenna_coordinates_arp_tc_message.instance_offset self.latitude = latitude self.longitude = longitude + self.height = height def pack(self, mav, force_mavlink1=False): - return MAVLink_message.pack(self, mav, 202, struct.pack('<ff', self.latitude, self.longitude), force_mavlink1=force_mavlink1) + return MAVLink_message.pack(self, mav, 183, struct.pack('<fff', self.latitude, self.longitude, self.height), force_mavlink1=force_mavlink1) class MAVLink_set_rocket_coordinates_arp_tc_message(MAVLink_message): ''' @@ -1895,32 +1896,33 @@ class MAVLink_set_rocket_coordinates_arp_tc_message(MAVLink_message): ''' id = MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC name = 'SET_ROCKET_COORDINATES_ARP_TC' - fieldnames = ['latitude', 'longitude'] - ordered_fieldnames = ['latitude', 'longitude'] - fieldtypes = ['float', 'float'] + fieldnames = ['latitude', 'longitude', 'height'] + ordered_fieldnames = ['latitude', 'longitude', 'height'] + fieldtypes = ['float', 'float', 'float'] fielddisplays_by_name = {} fieldenums_by_name = {} - fieldunits_by_name = {"latitude": "deg", "longitude": "deg"} - format = '<ff' - native_format = bytearray('<ff', 'ascii') - orders = [0, 1] - lengths = [1, 1] - array_lengths = [0, 0] - crc_extra = 164 - unpacker = struct.Struct('<ff') + fieldunits_by_name = {"latitude": "deg", "longitude": "deg", "height": "m"} + format = '<fff' + native_format = bytearray('<fff', 'ascii') + orders = [0, 1, 2] + lengths = [1, 1, 1] + array_lengths = [0, 0, 0] + crc_extra = 220 + unpacker = struct.Struct('<fff') instance_field = None instance_offset = -1 - def __init__(self, latitude, longitude): + def __init__(self, latitude, longitude, height): MAVLink_message.__init__(self, MAVLink_set_rocket_coordinates_arp_tc_message.id, MAVLink_set_rocket_coordinates_arp_tc_message.name) self._fieldnames = MAVLink_set_rocket_coordinates_arp_tc_message.fieldnames self._instance_field = MAVLink_set_rocket_coordinates_arp_tc_message.instance_field self._instance_offset = MAVLink_set_rocket_coordinates_arp_tc_message.instance_offset self.latitude = latitude self.longitude = longitude + self.height = height def pack(self, mav, force_mavlink1=False): - return MAVLink_message.pack(self, mav, 164, struct.pack('<ff', self.latitude, self.longitude), force_mavlink1=force_mavlink1) + return MAVLink_message.pack(self, mav, 220, struct.pack('<fff', self.latitude, self.longitude, self.height), force_mavlink1=force_mavlink1) class MAVLink_sys_tm_message(MAVLink_message): ''' @@ -3493,7 +3495,7 @@ class MAVLink(object): Move the stepper of a certain amount of steps stepper_id : A member of the StepperList enum (type:uint8_t) - steps : Number of steps (type:float) + steps : Number of steps (type:int16_t) ''' return MAVLink_set_stepper_steps_tc_message(stepper_id, steps) @@ -3503,7 +3505,7 @@ class MAVLink(object): Move the stepper of a certain amount of steps stepper_id : A member of the StepperList enum (type:uint8_t) - steps : Number of steps (type:float) + steps : Number of steps (type:int16_t) ''' return self.send(self.set_stepper_steps_tc_encode(stepper_id, steps), force_mavlink1=force_mavlink1) @@ -4000,45 +4002,49 @@ class MAVLink(object): ''' return self.send(self.arp_tm_encode(timestamp, yaw, pitch, roll, target_yaw, target_pitch, stepperX_pos, stepperX_delta, stepperX_speed, stepperY_pos, stepperY_delta, stepperY_speed, gps_latitude, gps_longitude, gps_height, gps_fix, main_radio_present, main_packet_tx_error_count, main_tx_bitrate, main_packet_rx_success_count, main_packet_rx_drop_count, main_rx_bitrate, main_rx_rssi, ethernet_present, ethernet_status, battery_voltage), force_mavlink1=force_mavlink1) - def set_antenna_coordinates_arp_tc_encode(self, latitude, longitude): + def set_antenna_coordinates_arp_tc_encode(self, latitude, longitude, height): ''' Sets current antennas coordinates latitude : Latitude [deg] (type:float) longitude : Longitude [deg] (type:float) + height : Height [m] (type:float) ''' - return MAVLink_set_antenna_coordinates_arp_tc_message(latitude, longitude) + return MAVLink_set_antenna_coordinates_arp_tc_message(latitude, longitude, height) - def set_antenna_coordinates_arp_tc_send(self, latitude, longitude, force_mavlink1=False): + def set_antenna_coordinates_arp_tc_send(self, latitude, longitude, height, force_mavlink1=False): ''' Sets current antennas coordinates latitude : Latitude [deg] (type:float) longitude : Longitude [deg] (type:float) + height : Height [m] (type:float) ''' - return self.send(self.set_antenna_coordinates_arp_tc_encode(latitude, longitude), force_mavlink1=force_mavlink1) + return self.send(self.set_antenna_coordinates_arp_tc_encode(latitude, longitude, height), force_mavlink1=force_mavlink1) - def set_rocket_coordinates_arp_tc_encode(self, latitude, longitude): + def set_rocket_coordinates_arp_tc_encode(self, latitude, longitude, height): ''' Sets current rocket coordinates latitude : Latitude [deg] (type:float) longitude : Longitude [deg] (type:float) + height : Height [m] (type:float) ''' - return MAVLink_set_rocket_coordinates_arp_tc_message(latitude, longitude) + return MAVLink_set_rocket_coordinates_arp_tc_message(latitude, longitude, height) - def set_rocket_coordinates_arp_tc_send(self, latitude, longitude, force_mavlink1=False): + def set_rocket_coordinates_arp_tc_send(self, latitude, longitude, height, force_mavlink1=False): ''' Sets current rocket coordinates latitude : Latitude [deg] (type:float) longitude : Longitude [deg] (type:float) + height : Height [m] (type:float) ''' - return self.send(self.set_rocket_coordinates_arp_tc_encode(latitude, longitude), force_mavlink1=force_mavlink1) + return self.send(self.set_rocket_coordinates_arp_tc_encode(latitude, longitude, height), force_mavlink1=force_mavlink1) def sys_tm_encode(self, timestamp, logger, event_broker, radio, pin_observer, sensors, board_scheduler): ''' diff --git a/mavlink_lib/lyra/lyra.h b/mavlink_lib/lyra/lyra.h index aa09b7c7ddfe2d4e25915f8465aa7e99a5496f9a..84941bcedeac6fa5ffac5849c16ff1bf12c024cd 100644 --- a/mavlink_lib/lyra/lyra.h +++ b/mavlink_lib/lyra/lyra.h @@ -11,7 +11,7 @@ #endif #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH -6834851485668065312 +#define MAVLINK_THIS_XML_HASH -9082272118780446039 #ifdef __cplusplus extern "C" { @@ -20,11 +20,11 @@ extern "C" { // MESSAGE LENGTHS AND CRCS #ifndef MAVLINK_MESSAGE_LENGTHS -#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 8, 2, 4, 8, 1, 5, 5, 7, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 74, 64, 32, 60, 32, 32, 32, 32, 56, 21, 5, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 46, 28, 27, 53, 77, 29, 176, 163, 92, 76, 42, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 8, 2, 4, 8, 1, 5, 5, 7, 4, 5, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 74, 64, 32, 60, 32, 32, 32, 32, 56, 21, 5, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 46, 28, 27, 53, 77, 29, 176, 163, 92, 76, 42, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #endif #ifndef MAVLINK_MESSAGE_CRCS -#define MAVLINK_MESSAGE_CRCS {0, 136, 198, 165, 248, 184, 215, 160, 226, 113, 38, 71, 67, 218, 44, 81, 181, 110, 22, 65, 79, 180, 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 146, 57, 72, 87, 229, 245, 212, 140, 148, 6, 155, 87, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 202, 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 183, 242, 142, 108, 133, 234, 66, 11, 214, 84, 245, 115, 63, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define MAVLINK_MESSAGE_CRCS {0, 136, 198, 165, 248, 184, 215, 160, 226, 113, 38, 71, 67, 218, 44, 81, 181, 110, 22, 65, 79, 180, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 146, 57, 72, 87, 229, 245, 212, 140, 148, 6, 155, 87, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 183, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 183, 242, 142, 108, 133, 234, 66, 11, 214, 84, 245, 115, 63, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #endif #include "../protocol.h" @@ -246,7 +246,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH -6834851485668065312 +#define MAVLINK_THIS_XML_HASH -9082272118780446039 #if MAVLINK_THIS_XML_HASH == MAVLINK_PRIMARY_XML_HASH # define MAVLINK_MESSAGE_INFO {{"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING_TC, MAVLINK_MESSAGE_INFO_COMMAND_TC, MAVLINK_MESSAGE_INFO_SYSTEM_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SENSOR_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SERVO_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SET_SERVO_ANGLE_TC, MAVLINK_MESSAGE_INFO_WIGGLE_SERVO_TC, MAVLINK_MESSAGE_INFO_RESET_SERVO_TC, MAVLINK_MESSAGE_INFO_SET_REFERENCE_ALTITUDE_TC, MAVLINK_MESSAGE_INFO_SET_REFERENCE_TEMPERATURE_TC, MAVLINK_MESSAGE_INFO_SET_ORIENTATION_TC, MAVLINK_MESSAGE_INFO_SET_COORDINATES_TC, MAVLINK_MESSAGE_INFO_RAW_EVENT_TC, MAVLINK_MESSAGE_INFO_SET_DEPLOYMENT_ALTITUDE_TC, MAVLINK_MESSAGE_INFO_SET_TARGET_COORDINATES_TC, MAVLINK_MESSAGE_INFO_SET_ALGORITHM_TC, MAVLINK_MESSAGE_INFO_SET_ATOMIC_VALVE_TIMING_TC, MAVLINK_MESSAGE_INFO_SET_VALVE_MAXIMUM_APERTURE_TC, MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC, MAVLINK_MESSAGE_INFO_SET_IGNITION_TIME_TC, MAVLINK_MESSAGE_INFO_SET_STEPPER_ANGLE_TC, MAVLINK_MESSAGE_INFO_SET_STEPPER_STEPS_TC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACK_TM, MAVLINK_MESSAGE_INFO_NACK_TM, MAVLINK_MESSAGE_INFO_GPS_TM, MAVLINK_MESSAGE_INFO_IMU_TM, MAVLINK_MESSAGE_INFO_PRESSURE_TM, MAVLINK_MESSAGE_INFO_ADC_TM, MAVLINK_MESSAGE_INFO_VOLTAGE_TM, MAVLINK_MESSAGE_INFO_CURRENT_TM, MAVLINK_MESSAGE_INFO_TEMP_TM, MAVLINK_MESSAGE_INFO_LOAD_TM, MAVLINK_MESSAGE_INFO_ATTITUDE_TM, MAVLINK_MESSAGE_INFO_SENSOR_STATE_TM, MAVLINK_MESSAGE_INFO_SERVO_TM, MAVLINK_MESSAGE_INFO_PIN_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_RECEIVER_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ARP_TM, MAVLINK_MESSAGE_INFO_SET_ANTENNA_COORDINATES_ARP_TC, MAVLINK_MESSAGE_INFO_SET_ROCKET_COORDINATES_ARP_TC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SYS_TM, MAVLINK_MESSAGE_INFO_FSM_TM, MAVLINK_MESSAGE_INFO_LOGGER_TM, MAVLINK_MESSAGE_INFO_MAVLINK_STATS_TM, MAVLINK_MESSAGE_INFO_TASK_STATS_TM, MAVLINK_MESSAGE_INFO_ADA_TM, MAVLINK_MESSAGE_INFO_NAS_TM, MAVLINK_MESSAGE_INFO_MEA_TM, MAVLINK_MESSAGE_INFO_ROCKET_FLIGHT_TM, MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM, MAVLINK_MESSAGE_INFO_ROCKET_STATS_TM, MAVLINK_MESSAGE_INFO_PAYLOAD_STATS_TM, MAVLINK_MESSAGE_INFO_GSE_TM, MAVLINK_MESSAGE_INFO_MOTOR_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}} diff --git a/mavlink_lib/lyra/mavlink.h b/mavlink_lib/lyra/mavlink.h index 20de852be485f52799c1360308e7abec8122a18b..d6f25c26ab002f8d6d55043dbbf3b738d816b912 100644 --- a/mavlink_lib/lyra/mavlink.h +++ b/mavlink_lib/lyra/mavlink.h @@ -6,7 +6,7 @@ #ifndef MAVLINK_H #define MAVLINK_H -#define MAVLINK_PRIMARY_XML_HASH -6834851485668065312 +#define MAVLINK_PRIMARY_XML_HASH -9082272118780446039 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/lyra/mavlink_msg_set_antenna_coordinates_arp_tc.h b/mavlink_lib/lyra/mavlink_msg_set_antenna_coordinates_arp_tc.h index f24281f4327bf2e569f908cac94a679c428be1c2..b9ce3e450ab02da5d99d18f3711971b7051ba7ff 100644 --- a/mavlink_lib/lyra/mavlink_msg_set_antenna_coordinates_arp_tc.h +++ b/mavlink_lib/lyra/mavlink_msg_set_antenna_coordinates_arp_tc.h @@ -7,15 +7,16 @@ typedef struct __mavlink_set_antenna_coordinates_arp_tc_t { float latitude; /*< [deg] Latitude*/ float longitude; /*< [deg] Longitude*/ + float height; /*< [m] Height*/ } mavlink_set_antenna_coordinates_arp_tc_t; -#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN 8 -#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN 8 -#define MAVLINK_MSG_ID_170_LEN 8 -#define MAVLINK_MSG_ID_170_MIN_LEN 8 +#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN 12 +#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN 12 +#define MAVLINK_MSG_ID_170_LEN 12 +#define MAVLINK_MSG_ID_170_MIN_LEN 12 -#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC 202 -#define MAVLINK_MSG_ID_170_CRC 202 +#define MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC 183 +#define MAVLINK_MSG_ID_170_CRC 183 @@ -23,17 +24,19 @@ typedef struct __mavlink_set_antenna_coordinates_arp_tc_t { #define MAVLINK_MESSAGE_INFO_SET_ANTENNA_COORDINATES_ARP_TC { \ 170, \ "SET_ANTENNA_COORDINATES_ARP_TC", \ - 2, \ + 3, \ { { "latitude", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, latitude) }, \ { "longitude", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, longitude) }, \ + { "height", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, height) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_SET_ANTENNA_COORDINATES_ARP_TC { \ "SET_ANTENNA_COORDINATES_ARP_TC", \ - 2, \ + 3, \ { { "latitude", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, latitude) }, \ { "longitude", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, longitude) }, \ + { "height", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_set_antenna_coordinates_arp_tc_t, height) }, \ } \ } #endif @@ -46,21 +49,24 @@ typedef struct __mavlink_set_antenna_coordinates_arp_tc_t { * * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - float latitude, float longitude) + float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN); #else mavlink_set_antenna_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN); #endif @@ -77,22 +83,25 @@ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_pack(uint8_t s * @param msg The MAVLink message to compress the data into * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - float latitude,float longitude) + float latitude,float longitude,float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN); #else mavlink_set_antenna_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN); #endif @@ -111,7 +120,7 @@ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(uint */ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_antenna_coordinates_arp_tc_t* set_antenna_coordinates_arp_tc) { - return mavlink_msg_set_antenna_coordinates_arp_tc_pack(system_id, component_id, msg, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude); + return mavlink_msg_set_antenna_coordinates_arp_tc_pack(system_id, component_id, msg, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude, set_antenna_coordinates_arp_tc->height); } /** @@ -125,7 +134,7 @@ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_encode(uint8_t */ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_set_antenna_coordinates_arp_tc_t* set_antenna_coordinates_arp_tc) { - return mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(system_id, component_id, chan, msg, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude); + return mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(system_id, component_id, chan, msg, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude, set_antenna_coordinates_arp_tc->height); } /** @@ -134,21 +143,24 @@ static inline uint16_t mavlink_msg_set_antenna_coordinates_arp_tc_encode_chan(ui * * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send(mavlink_channel_t chan, float latitude, float longitude) +static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send(mavlink_channel_t chan, float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC, buf, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC); #else mavlink_set_antenna_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC, (const char *)&packet, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC); #endif @@ -162,7 +174,7 @@ static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send(mavlink_chann static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send_struct(mavlink_channel_t chan, const mavlink_set_antenna_coordinates_arp_tc_t* set_antenna_coordinates_arp_tc) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_set_antenna_coordinates_arp_tc_send(chan, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude); + mavlink_msg_set_antenna_coordinates_arp_tc_send(chan, set_antenna_coordinates_arp_tc->latitude, set_antenna_coordinates_arp_tc->longitude, set_antenna_coordinates_arp_tc->height); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC, (const char *)set_antenna_coordinates_arp_tc, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC); #endif @@ -176,18 +188,20 @@ static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send_struct(mavlin is usually the receive buffer for the channel, and allows a reply to an incoming message with minimum stack space usage. */ -static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, float latitude, float longitude) +static inline void mavlink_msg_set_antenna_coordinates_arp_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC, buf, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC); #else mavlink_set_antenna_coordinates_arp_tc_t *packet = (mavlink_set_antenna_coordinates_arp_tc_t *)msgbuf; packet->latitude = latitude; packet->longitude = longitude; + packet->height = height; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC, (const char *)packet, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_CRC); #endif @@ -219,6 +233,16 @@ static inline float mavlink_msg_set_antenna_coordinates_arp_tc_get_longitude(con return _MAV_RETURN_float(msg, 4); } +/** + * @brief Get field height from set_antenna_coordinates_arp_tc message + * + * @return [m] Height + */ +static inline float mavlink_msg_set_antenna_coordinates_arp_tc_get_height(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 8); +} + /** * @brief Decode a set_antenna_coordinates_arp_tc message into a struct * @@ -230,6 +254,7 @@ static inline void mavlink_msg_set_antenna_coordinates_arp_tc_decode(const mavli #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS set_antenna_coordinates_arp_tc->latitude = mavlink_msg_set_antenna_coordinates_arp_tc_get_latitude(msg); set_antenna_coordinates_arp_tc->longitude = mavlink_msg_set_antenna_coordinates_arp_tc_get_longitude(msg); + set_antenna_coordinates_arp_tc->height = mavlink_msg_set_antenna_coordinates_arp_tc_get_height(msg); #else uint8_t len = msg->len < MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN? msg->len : MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN; memset(set_antenna_coordinates_arp_tc, 0, MAVLINK_MSG_ID_SET_ANTENNA_COORDINATES_ARP_TC_LEN); diff --git a/mavlink_lib/lyra/mavlink_msg_set_rocket_coordinates_arp_tc.h b/mavlink_lib/lyra/mavlink_msg_set_rocket_coordinates_arp_tc.h index 0cca27cd5973de3fb8d91fc9743ffa980aaf41ba..fa1231c34aa982dc6701ccf49dcaea42fa1a91a4 100644 --- a/mavlink_lib/lyra/mavlink_msg_set_rocket_coordinates_arp_tc.h +++ b/mavlink_lib/lyra/mavlink_msg_set_rocket_coordinates_arp_tc.h @@ -7,15 +7,16 @@ typedef struct __mavlink_set_rocket_coordinates_arp_tc_t { float latitude; /*< [deg] Latitude*/ float longitude; /*< [deg] Longitude*/ + float height; /*< [m] Height*/ } mavlink_set_rocket_coordinates_arp_tc_t; -#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN 8 -#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN 8 -#define MAVLINK_MSG_ID_171_LEN 8 -#define MAVLINK_MSG_ID_171_MIN_LEN 8 +#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN 12 +#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN 12 +#define MAVLINK_MSG_ID_171_LEN 12 +#define MAVLINK_MSG_ID_171_MIN_LEN 12 -#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC 164 -#define MAVLINK_MSG_ID_171_CRC 164 +#define MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC 220 +#define MAVLINK_MSG_ID_171_CRC 220 @@ -23,17 +24,19 @@ typedef struct __mavlink_set_rocket_coordinates_arp_tc_t { #define MAVLINK_MESSAGE_INFO_SET_ROCKET_COORDINATES_ARP_TC { \ 171, \ "SET_ROCKET_COORDINATES_ARP_TC", \ - 2, \ + 3, \ { { "latitude", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, latitude) }, \ { "longitude", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, longitude) }, \ + { "height", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, height) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_SET_ROCKET_COORDINATES_ARP_TC { \ "SET_ROCKET_COORDINATES_ARP_TC", \ - 2, \ + 3, \ { { "latitude", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, latitude) }, \ { "longitude", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, longitude) }, \ + { "height", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_set_rocket_coordinates_arp_tc_t, height) }, \ } \ } #endif @@ -46,21 +49,24 @@ typedef struct __mavlink_set_rocket_coordinates_arp_tc_t { * * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - float latitude, float longitude) + float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN); #else mavlink_set_rocket_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN); #endif @@ -77,22 +83,25 @@ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_pack(uint8_t sy * @param msg The MAVLink message to compress the data into * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - float latitude,float longitude) + float latitude,float longitude,float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN); #else mavlink_set_rocket_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN); #endif @@ -111,7 +120,7 @@ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(uint8 */ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_set_rocket_coordinates_arp_tc_t* set_rocket_coordinates_arp_tc) { - return mavlink_msg_set_rocket_coordinates_arp_tc_pack(system_id, component_id, msg, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude); + return mavlink_msg_set_rocket_coordinates_arp_tc_pack(system_id, component_id, msg, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude, set_rocket_coordinates_arp_tc->height); } /** @@ -125,7 +134,7 @@ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_encode(uint8_t */ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_set_rocket_coordinates_arp_tc_t* set_rocket_coordinates_arp_tc) { - return mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(system_id, component_id, chan, msg, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude); + return mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(system_id, component_id, chan, msg, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude, set_rocket_coordinates_arp_tc->height); } /** @@ -134,21 +143,24 @@ static inline uint16_t mavlink_msg_set_rocket_coordinates_arp_tc_encode_chan(uin * * @param latitude [deg] Latitude * @param longitude [deg] Longitude + * @param height [m] Height */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send(mavlink_channel_t chan, float latitude, float longitude) +static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send(mavlink_channel_t chan, float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN]; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC, buf, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC); #else mavlink_set_rocket_coordinates_arp_tc_t packet; packet.latitude = latitude; packet.longitude = longitude; + packet.height = height; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC, (const char *)&packet, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC); #endif @@ -162,7 +174,7 @@ static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send(mavlink_channe static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send_struct(mavlink_channel_t chan, const mavlink_set_rocket_coordinates_arp_tc_t* set_rocket_coordinates_arp_tc) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_set_rocket_coordinates_arp_tc_send(chan, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude); + mavlink_msg_set_rocket_coordinates_arp_tc_send(chan, set_rocket_coordinates_arp_tc->latitude, set_rocket_coordinates_arp_tc->longitude, set_rocket_coordinates_arp_tc->height); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC, (const char *)set_rocket_coordinates_arp_tc, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC); #endif @@ -176,18 +188,20 @@ static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send_struct(mavlink is usually the receive buffer for the channel, and allows a reply to an incoming message with minimum stack space usage. */ -static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, float latitude, float longitude) +static inline void mavlink_msg_set_rocket_coordinates_arp_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, float latitude, float longitude, float height) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; _mav_put_float(buf, 0, latitude); _mav_put_float(buf, 4, longitude); + _mav_put_float(buf, 8, height); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC, buf, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC); #else mavlink_set_rocket_coordinates_arp_tc_t *packet = (mavlink_set_rocket_coordinates_arp_tc_t *)msgbuf; packet->latitude = latitude; packet->longitude = longitude; + packet->height = height; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC, (const char *)packet, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_MIN_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_CRC); #endif @@ -219,6 +233,16 @@ static inline float mavlink_msg_set_rocket_coordinates_arp_tc_get_longitude(cons return _MAV_RETURN_float(msg, 4); } +/** + * @brief Get field height from set_rocket_coordinates_arp_tc message + * + * @return [m] Height + */ +static inline float mavlink_msg_set_rocket_coordinates_arp_tc_get_height(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 8); +} + /** * @brief Decode a set_rocket_coordinates_arp_tc message into a struct * @@ -230,6 +254,7 @@ static inline void mavlink_msg_set_rocket_coordinates_arp_tc_decode(const mavlin #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS set_rocket_coordinates_arp_tc->latitude = mavlink_msg_set_rocket_coordinates_arp_tc_get_latitude(msg); set_rocket_coordinates_arp_tc->longitude = mavlink_msg_set_rocket_coordinates_arp_tc_get_longitude(msg); + set_rocket_coordinates_arp_tc->height = mavlink_msg_set_rocket_coordinates_arp_tc_get_height(msg); #else uint8_t len = msg->len < MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN? msg->len : MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN; memset(set_rocket_coordinates_arp_tc, 0, MAVLINK_MSG_ID_SET_ROCKET_COORDINATES_ARP_TC_LEN); diff --git a/mavlink_lib/lyra/mavlink_msg_set_stepper_steps_tc.h b/mavlink_lib/lyra/mavlink_msg_set_stepper_steps_tc.h index 5381c0fea9043603df6814431bbe96e1276221da..ca51b47f0fecbc2f971af9efe3258b97fa7a036b 100644 --- a/mavlink_lib/lyra/mavlink_msg_set_stepper_steps_tc.h +++ b/mavlink_lib/lyra/mavlink_msg_set_stepper_steps_tc.h @@ -5,17 +5,17 @@ typedef struct __mavlink_set_stepper_steps_tc_t { - float steps; /*< Number of steps*/ + int16_t steps; /*< Number of steps*/ uint8_t stepper_id; /*< A member of the StepperList enum*/ } mavlink_set_stepper_steps_tc_t; -#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN 5 -#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_MIN_LEN 5 -#define MAVLINK_MSG_ID_22_LEN 5 -#define MAVLINK_MSG_ID_22_MIN_LEN 5 +#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN 3 +#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_MIN_LEN 3 +#define MAVLINK_MSG_ID_22_LEN 3 +#define MAVLINK_MSG_ID_22_MIN_LEN 3 -#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_CRC 246 -#define MAVLINK_MSG_ID_22_CRC 246 +#define MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_CRC 26 +#define MAVLINK_MSG_ID_22_CRC 26 @@ -24,16 +24,16 @@ typedef struct __mavlink_set_stepper_steps_tc_t { 22, \ "SET_STEPPER_STEPS_TC", \ 2, \ - { { "stepper_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_set_stepper_steps_tc_t, stepper_id) }, \ - { "steps", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_stepper_steps_tc_t, steps) }, \ + { { "stepper_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_set_stepper_steps_tc_t, stepper_id) }, \ + { "steps", NULL, MAVLINK_TYPE_INT16_T, 0, 0, offsetof(mavlink_set_stepper_steps_tc_t, steps) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_SET_STEPPER_STEPS_TC { \ "SET_STEPPER_STEPS_TC", \ 2, \ - { { "stepper_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_set_stepper_steps_tc_t, stepper_id) }, \ - { "steps", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_stepper_steps_tc_t, steps) }, \ + { { "stepper_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_set_stepper_steps_tc_t, stepper_id) }, \ + { "steps", NULL, MAVLINK_TYPE_INT16_T, 0, 0, offsetof(mavlink_set_stepper_steps_tc_t, steps) }, \ } \ } #endif @@ -49,12 +49,12 @@ typedef struct __mavlink_set_stepper_steps_tc_t { * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_set_stepper_steps_tc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint8_t stepper_id, float steps) + uint8_t stepper_id, int16_t steps) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN]; - _mav_put_float(buf, 0, steps); - _mav_put_uint8_t(buf, 4, stepper_id); + _mav_put_int16_t(buf, 0, steps); + _mav_put_uint8_t(buf, 2, stepper_id); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN); #else @@ -81,12 +81,12 @@ static inline uint16_t mavlink_msg_set_stepper_steps_tc_pack(uint8_t system_id, */ static inline uint16_t mavlink_msg_set_stepper_steps_tc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint8_t stepper_id,float steps) + uint8_t stepper_id,int16_t steps) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN]; - _mav_put_float(buf, 0, steps); - _mav_put_uint8_t(buf, 4, stepper_id); + _mav_put_int16_t(buf, 0, steps); + _mav_put_uint8_t(buf, 2, stepper_id); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN); #else @@ -137,12 +137,12 @@ static inline uint16_t mavlink_msg_set_stepper_steps_tc_encode_chan(uint8_t syst */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_set_stepper_steps_tc_send(mavlink_channel_t chan, uint8_t stepper_id, float steps) +static inline void mavlink_msg_set_stepper_steps_tc_send(mavlink_channel_t chan, uint8_t stepper_id, int16_t steps) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN]; - _mav_put_float(buf, 0, steps); - _mav_put_uint8_t(buf, 4, stepper_id); + _mav_put_int16_t(buf, 0, steps); + _mav_put_uint8_t(buf, 2, stepper_id); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC, buf, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_MIN_LEN, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_CRC); #else @@ -176,12 +176,12 @@ static inline void mavlink_msg_set_stepper_steps_tc_send_struct(mavlink_channel_ is usually the receive buffer for the channel, and allows a reply to an incoming message with minimum stack space usage. */ -static inline void mavlink_msg_set_stepper_steps_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t stepper_id, float steps) +static inline void mavlink_msg_set_stepper_steps_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t stepper_id, int16_t steps) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; - _mav_put_float(buf, 0, steps); - _mav_put_uint8_t(buf, 4, stepper_id); + _mav_put_int16_t(buf, 0, steps); + _mav_put_uint8_t(buf, 2, stepper_id); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC, buf, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_MIN_LEN, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_LEN, MAVLINK_MSG_ID_SET_STEPPER_STEPS_TC_CRC); #else @@ -206,7 +206,7 @@ static inline void mavlink_msg_set_stepper_steps_tc_send_buf(mavlink_message_t * */ static inline uint8_t mavlink_msg_set_stepper_steps_tc_get_stepper_id(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 4); + return _MAV_RETURN_uint8_t(msg, 2); } /** @@ -214,9 +214,9 @@ static inline uint8_t mavlink_msg_set_stepper_steps_tc_get_stepper_id(const mavl * * @return Number of steps */ -static inline float mavlink_msg_set_stepper_steps_tc_get_steps(const mavlink_message_t* msg) +static inline int16_t mavlink_msg_set_stepper_steps_tc_get_steps(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 0); + return _MAV_RETURN_int16_t(msg, 0); } /** diff --git a/mavlink_lib/lyra/testsuite.h b/mavlink_lib/lyra/testsuite.h index cc485ecebc1914107c152c22331824516ca1683c..fdd818dd4067ff06d8933c07570b69285b00975e 100644 --- a/mavlink_lib/lyra/testsuite.h +++ b/mavlink_lib/lyra/testsuite.h @@ -1291,7 +1291,7 @@ static void mavlink_test_set_stepper_steps_tc(uint8_t system_id, uint8_t compone uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_set_stepper_steps_tc_t packet_in = { - 17.0,17 + 17235,139 }; mavlink_set_stepper_steps_tc_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -2395,12 +2395,13 @@ static void mavlink_test_set_antenna_coordinates_arp_tc(uint8_t system_id, uint8 uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_set_antenna_coordinates_arp_tc_t packet_in = { - 17.0,45.0 + 17.0,45.0,73.0 }; mavlink_set_antenna_coordinates_arp_tc_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); packet1.latitude = packet_in.latitude; packet1.longitude = packet_in.longitude; + packet1.height = packet_in.height; #ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1 @@ -2415,12 +2416,12 @@ static void mavlink_test_set_antenna_coordinates_arp_tc(uint8_t system_id, uint8 MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_antenna_coordinates_arp_tc_pack(system_id, component_id, &msg , packet1.latitude , packet1.longitude ); + mavlink_msg_set_antenna_coordinates_arp_tc_pack(system_id, component_id, &msg , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_antenna_coordinates_arp_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.latitude , packet1.longitude ); + mavlink_msg_set_antenna_coordinates_arp_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_antenna_coordinates_arp_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2433,7 +2434,7 @@ static void mavlink_test_set_antenna_coordinates_arp_tc(uint8_t system_id, uint8 MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_antenna_coordinates_arp_tc_send(MAVLINK_COMM_1 , packet1.latitude , packet1.longitude ); + mavlink_msg_set_antenna_coordinates_arp_tc_send(MAVLINK_COMM_1 , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_antenna_coordinates_arp_tc_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2455,12 +2456,13 @@ static void mavlink_test_set_rocket_coordinates_arp_tc(uint8_t system_id, uint8_ uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_set_rocket_coordinates_arp_tc_t packet_in = { - 17.0,45.0 + 17.0,45.0,73.0 }; mavlink_set_rocket_coordinates_arp_tc_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); packet1.latitude = packet_in.latitude; packet1.longitude = packet_in.longitude; + packet1.height = packet_in.height; #ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1 @@ -2475,12 +2477,12 @@ static void mavlink_test_set_rocket_coordinates_arp_tc(uint8_t system_id, uint8_ MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_rocket_coordinates_arp_tc_pack(system_id, component_id, &msg , packet1.latitude , packet1.longitude ); + mavlink_msg_set_rocket_coordinates_arp_tc_pack(system_id, component_id, &msg , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_rocket_coordinates_arp_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.latitude , packet1.longitude ); + mavlink_msg_set_rocket_coordinates_arp_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_rocket_coordinates_arp_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2493,7 +2495,7 @@ static void mavlink_test_set_rocket_coordinates_arp_tc(uint8_t system_id, uint8_ MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_set_rocket_coordinates_arp_tc_send(MAVLINK_COMM_1 , packet1.latitude , packet1.longitude ); + mavlink_msg_set_rocket_coordinates_arp_tc_send(MAVLINK_COMM_1 , packet1.latitude , packet1.longitude , packet1.height ); mavlink_msg_set_rocket_coordinates_arp_tc_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); diff --git a/mavlink_lib/lyra/version.h b/mavlink_lib/lyra/version.h index 3eba20e8566c37c8f5823d77a2ed5b11049235d7..68531d53a9d27edf4f574a730e48898ab5291f4f 100644 --- a/mavlink_lib/lyra/version.h +++ b/mavlink_lib/lyra/version.h @@ -7,7 +7,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Sun Dec 10 2023" +#define MAVLINK_BUILD_DATE "Tue Dec 12 2023" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 176 diff --git a/message_definitions/lyra.xml b/message_definitions/lyra.xml index e2a924657e91af449a680481b2a3123c92089aa1..9c58dca2ee24d23c3790858e31205ddc639dbc8e 100644 --- a/message_definitions/lyra.xml +++ b/message_definitions/lyra.xml @@ -329,7 +329,7 @@ <message id="22" name="SET_STEPPER_STEPS_TC"> <description>Move the stepper of a certain amount of steps</description> <field name="stepper_id" type="uint8_t">A member of the StepperList enum</field> - <field name="steps" type="float">Number of steps</field> + <field name="steps" type="int16_t">Number of steps</field> </message> <!-- FROM ROCKET TO GROUND: GENERIC --> @@ -505,11 +505,13 @@ <description>Sets current antennas coordinates</description> <field name="latitude" type="float" units="deg">Latitude</field> <field name="longitude" type="float" units="deg">Longitude</field> + <field name="height" type="float" units="m">Height</field> </message> <message id="171" name="SET_ROCKET_COORDINATES_ARP_TC"> <description>Sets current rocket coordinates</description> <field name="latitude" type="float" units="deg">Latitude</field> <field name="longitude" type="float" units="deg">Longitude</field> + <field name="height" type="float" units="m">Height</field> </message> <!-- FROM ROCKET TO GROUND: SPECIFIC -->