diff --git a/mavlink_lib/gemini/gemini.h b/mavlink_lib/gemini/gemini.h index b2c051de7305feb7ded333ebc812925455e4ac7b..457e61daf6b96f756a429de708c6071f653973be 100644 --- a/mavlink_lib/gemini/gemini.h +++ b/mavlink_lib/gemini/gemini.h @@ -11,7 +11,7 @@ #endif #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH 5142576801243758047 +#define MAVLINK_THIS_XML_HASH -92144619654996972 #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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 44, 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, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 9, 171, 162, 92, 76, 26, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 44, 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, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 9, 171, 162, 92, 76, 30, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 223, 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, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 122, 141, 6, 245, 115, 110, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 223, 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, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 122, 141, 6, 245, 115, 17, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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" @@ -77,19 +77,20 @@ typedef enum SensorsTMList MAV_PITOT_PRESS_ID=12, /* Pitot pressure data | */ MAV_BATTERY_VOLTAGE_ID=13, /* Battery voltage data | */ MAV_LOAD_CELL_ID=14, /* Load cell data | */ - MAV_FILLING_PRES_ID=15, /* Filling line pressure | */ - MAV_TANK_TOP_PRES_ID=16, /* Top tank pressure | */ - MAV_TANK_BOTTOM_PRES_ID=17, /* Bottom tank pressure | */ + MAV_FILLING_PRESS_ID=15, /* Filling line pressure | */ + MAV_TANK_TOP_PRESS_ID=16, /* Top tank pressure | */ + MAV_TANK_BOTTOM_PRESS_ID=17, /* Bottom tank pressure | */ MAV_TANK_TEMP_ID=18, /* Tank temperature | */ - MAV_COMBUSTION_PRES_ID=19, /* Combustion chamber pressure | */ - MAV_LOAD_CELL_TANK_COTS_ID=20, /* COTS tank weight | */ - MAV_LOAD_CELL_TANK_SRAD_ID=21, /* SRAD tank weight | */ - MAV_LIS2MDL_ID=22, /* Magnetometer data | */ - MAV_LPS28DFW_ID=23, /* Pressure sensor data | */ - MAV_LSM6DSRX_ID=24, /* IMU data | */ - MAV_H3LIS331DL_ID=25, /* 400G accelerometer | */ - MAV_LPS22DF_ID=26, /* Pressure sensor data | */ - SensorsTMList_ENUM_END=27, /* | */ + MAV_COMBUSTION_PRESS_ID=19, /* Combustion chamber pressure | */ + MAV_VESSEL_PRESS_ID=20, /* Vessel pressure | */ + MAV_LOAD_CELL_VESSEL_ID=21, /* Vessel tank weight | */ + MAV_LOAD_CELL_TANK_ID=22, /* Tank weight | */ + MAV_LIS2MDL_ID=23, /* Magnetometer data | */ + MAV_LPS28DFW_ID=24, /* Pressure sensor data | */ + MAV_LSM6DSRX_ID=25, /* IMU data | */ + MAV_H3LIS331DL_ID=26, /* 400G accelerometer | */ + MAV_LPS22DF_ID=27, /* Pressure sensor data | */ + SensorsTMList_ENUM_END=28, /* | */ } SensorsTMList; #endif @@ -213,7 +214,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH 5142576801243758047 +#define MAVLINK_THIS_XML_HASH -92144619654996972 #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, {"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}}}, {"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}}}, {"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_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_TARS_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/gemini/mavlink.h b/mavlink_lib/gemini/mavlink.h index c453cff9372a34b910148f889a842114aa228d36..c9b231defc8985fe7ebd0f06616ef76992a55c1c 100644 --- a/mavlink_lib/gemini/mavlink.h +++ b/mavlink_lib/gemini/mavlink.h @@ -6,7 +6,7 @@ #ifndef MAVLINK_H #define MAVLINK_H -#define MAVLINK_PRIMARY_XML_HASH 5142576801243758047 +#define MAVLINK_PRIMARY_XML_HASH -92144619654996972 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/gemini/mavlink_msg_gse_tm.h b/mavlink_lib/gemini/mavlink_msg_gse_tm.h index 07ae1bc91f61ca6e0b32577de26bcfdac1f95a7c..cd81daf9435741f4a6889583d2056932ae7c1305 100644 --- a/mavlink_lib/gemini/mavlink_msg_gse_tm.h +++ b/mavlink_lib/gemini/mavlink_msg_gse_tm.h @@ -7,8 +7,9 @@ typedef struct __mavlink_gse_tm_t { uint64_t timestamp; /*< [us] Timestamp in microseconds*/ float loadcell_tank; /*< [kg] Rocket weight*/ - float loadcell_COTS_tank; /*< [kg] External tank weight*/ - float filling_pressure; /*< [Pa] Refueling line pressure*/ + float loadcell_vessel; /*< [kg] External tank weight*/ + float filling_pressure; /*< [Bar] Refueling line pressure*/ + float vessel_pressure; /*< [Bar] Vessel tank pressure*/ uint8_t arming_state; /*< 1 If the rocket is armed*/ uint8_t filling_valve_state; /*< 1 If the filling valve is open*/ uint8_t venting_valve_state; /*< 1 If the venting valve is open*/ @@ -17,13 +18,13 @@ typedef struct __mavlink_gse_tm_t { uint8_t tars_state; /*< 1 If the TARS algorithm is running*/ } mavlink_gse_tm_t; -#define MAVLINK_MSG_ID_GSE_TM_LEN 26 -#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 26 -#define MAVLINK_MSG_ID_212_LEN 26 -#define MAVLINK_MSG_ID_212_MIN_LEN 26 +#define MAVLINK_MSG_ID_GSE_TM_LEN 30 +#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 30 +#define MAVLINK_MSG_ID_212_LEN 30 +#define MAVLINK_MSG_ID_212_MIN_LEN 30 -#define MAVLINK_MSG_ID_GSE_TM_CRC 110 -#define MAVLINK_MSG_ID_212_CRC 110 +#define MAVLINK_MSG_ID_GSE_TM_CRC 17 +#define MAVLINK_MSG_ID_212_CRC 17 @@ -31,33 +32,35 @@ typedef struct __mavlink_gse_tm_t { #define MAVLINK_MESSAGE_INFO_GSE_TM { \ 212, \ "GSE_TM", \ - 10, \ + 11, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \ { "loadcell_tank", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, loadcell_tank) }, \ - { "loadcell_COTS_tank", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_COTS_tank) }, \ + { "loadcell_vessel", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_vessel) }, \ { "filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, filling_pressure) }, \ - { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_gse_tm_t, arming_state) }, \ - { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 21, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ - { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 22, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ - { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 23, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \ - { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_gse_tm_t, ignition_state) }, \ - { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_gse_tm_t, tars_state) }, \ + { "vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, vessel_pressure) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ + { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 26, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ + { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 27, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \ + { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_gse_tm_t, ignition_state) }, \ + { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_gse_tm_t, tars_state) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_GSE_TM { \ "GSE_TM", \ - 10, \ + 11, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \ { "loadcell_tank", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, loadcell_tank) }, \ - { "loadcell_COTS_tank", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_COTS_tank) }, \ + { "loadcell_vessel", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_vessel) }, \ { "filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, filling_pressure) }, \ - { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_gse_tm_t, arming_state) }, \ - { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 21, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ - { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 22, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ - { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 23, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \ - { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_gse_tm_t, ignition_state) }, \ - { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_gse_tm_t, tars_state) }, \ + { "vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, vessel_pressure) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ + { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 26, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ + { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 27, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \ + { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_gse_tm_t, ignition_state) }, \ + { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 29, offsetof(mavlink_gse_tm_t, tars_state) }, \ } \ } #endif @@ -70,8 +73,9 @@ typedef struct __mavlink_gse_tm_t { * * @param timestamp [us] Timestamp in microseconds * @param loadcell_tank [kg] Rocket weight - * @param loadcell_COTS_tank [kg] External tank weight - * @param filling_pressure [Pa] Refueling line pressure + * @param loadcell_vessel [kg] External tank weight + * @param filling_pressure [Bar] Refueling line pressure + * @param vessel_pressure [Bar] Vessel tank pressure * @param arming_state 1 If the rocket is armed * @param filling_valve_state 1 If the filling valve is open * @param venting_valve_state 1 If the venting valve is open @@ -81,28 +85,30 @@ typedef struct __mavlink_gse_tm_t { * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint64_t timestamp, float loadcell_tank, float loadcell_COTS_tank, float filling_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) + uint64_t timestamp, float loadcell_tank, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; _mav_put_uint64_t(buf, 0, timestamp); _mav_put_float(buf, 8, loadcell_tank); - _mav_put_float(buf, 12, loadcell_COTS_tank); + _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); - _mav_put_uint8_t(buf, 20, arming_state); - _mav_put_uint8_t(buf, 21, filling_valve_state); - _mav_put_uint8_t(buf, 22, venting_valve_state); - _mav_put_uint8_t(buf, 23, release_vlave_state); - _mav_put_uint8_t(buf, 24, ignition_state); - _mav_put_uint8_t(buf, 25, tars_state); + _mav_put_float(buf, 20, vessel_pressure); + _mav_put_uint8_t(buf, 24, arming_state); + _mav_put_uint8_t(buf, 25, filling_valve_state); + _mav_put_uint8_t(buf, 26, venting_valve_state); + _mav_put_uint8_t(buf, 27, release_vlave_state); + _mav_put_uint8_t(buf, 28, ignition_state); + _mav_put_uint8_t(buf, 29, tars_state); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN); #else mavlink_gse_tm_t packet; packet.timestamp = timestamp; packet.loadcell_tank = loadcell_tank; - packet.loadcell_COTS_tank = loadcell_COTS_tank; + packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; + packet.vessel_pressure = vessel_pressure; packet.arming_state = arming_state; packet.filling_valve_state = filling_valve_state; packet.venting_valve_state = venting_valve_state; @@ -125,8 +131,9 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon * @param msg The MAVLink message to compress the data into * @param timestamp [us] Timestamp in microseconds * @param loadcell_tank [kg] Rocket weight - * @param loadcell_COTS_tank [kg] External tank weight - * @param filling_pressure [Pa] Refueling line pressure + * @param loadcell_vessel [kg] External tank weight + * @param filling_pressure [Bar] Refueling line pressure + * @param vessel_pressure [Bar] Vessel tank pressure * @param arming_state 1 If the rocket is armed * @param filling_valve_state 1 If the filling valve is open * @param venting_valve_state 1 If the venting valve is open @@ -137,28 +144,30 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon */ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint64_t timestamp,float loadcell_tank,float loadcell_COTS_tank,float filling_pressure,uint8_t arming_state,uint8_t filling_valve_state,uint8_t venting_valve_state,uint8_t release_vlave_state,uint8_t ignition_state,uint8_t tars_state) + uint64_t timestamp,float loadcell_tank,float loadcell_vessel,float filling_pressure,float vessel_pressure,uint8_t arming_state,uint8_t filling_valve_state,uint8_t venting_valve_state,uint8_t release_vlave_state,uint8_t ignition_state,uint8_t tars_state) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; _mav_put_uint64_t(buf, 0, timestamp); _mav_put_float(buf, 8, loadcell_tank); - _mav_put_float(buf, 12, loadcell_COTS_tank); + _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); - _mav_put_uint8_t(buf, 20, arming_state); - _mav_put_uint8_t(buf, 21, filling_valve_state); - _mav_put_uint8_t(buf, 22, venting_valve_state); - _mav_put_uint8_t(buf, 23, release_vlave_state); - _mav_put_uint8_t(buf, 24, ignition_state); - _mav_put_uint8_t(buf, 25, tars_state); + _mav_put_float(buf, 20, vessel_pressure); + _mav_put_uint8_t(buf, 24, arming_state); + _mav_put_uint8_t(buf, 25, filling_valve_state); + _mav_put_uint8_t(buf, 26, venting_valve_state); + _mav_put_uint8_t(buf, 27, release_vlave_state); + _mav_put_uint8_t(buf, 28, ignition_state); + _mav_put_uint8_t(buf, 29, tars_state); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN); #else mavlink_gse_tm_t packet; packet.timestamp = timestamp; packet.loadcell_tank = loadcell_tank; - packet.loadcell_COTS_tank = loadcell_COTS_tank; + packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; + packet.vessel_pressure = vessel_pressure; packet.arming_state = arming_state; packet.filling_valve_state = filling_valve_state; packet.venting_valve_state = venting_valve_state; @@ -183,7 +192,7 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c */ static inline uint16_t mavlink_msg_gse_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gse_tm_t* gse_tm) { - return mavlink_msg_gse_tm_pack(system_id, component_id, msg, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_COTS_tank, gse_tm->filling_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); + return mavlink_msg_gse_tm_pack(system_id, component_id, msg, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); } /** @@ -197,7 +206,7 @@ static inline uint16_t mavlink_msg_gse_tm_encode(uint8_t system_id, uint8_t comp */ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gse_tm_t* gse_tm) { - return mavlink_msg_gse_tm_pack_chan(system_id, component_id, chan, msg, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_COTS_tank, gse_tm->filling_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); + return mavlink_msg_gse_tm_pack_chan(system_id, component_id, chan, msg, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); } /** @@ -206,8 +215,9 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t * * @param timestamp [us] Timestamp in microseconds * @param loadcell_tank [kg] Rocket weight - * @param loadcell_COTS_tank [kg] External tank weight - * @param filling_pressure [Pa] Refueling line pressure + * @param loadcell_vessel [kg] External tank weight + * @param filling_pressure [Bar] Refueling line pressure + * @param vessel_pressure [Bar] Vessel tank pressure * @param arming_state 1 If the rocket is armed * @param filling_valve_state 1 If the filling valve is open * @param venting_valve_state 1 If the venting valve is open @@ -217,28 +227,30 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t timestamp, float loadcell_tank, float loadcell_COTS_tank, float filling_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) +static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t timestamp, float loadcell_tank, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; _mav_put_uint64_t(buf, 0, timestamp); _mav_put_float(buf, 8, loadcell_tank); - _mav_put_float(buf, 12, loadcell_COTS_tank); + _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); - _mav_put_uint8_t(buf, 20, arming_state); - _mav_put_uint8_t(buf, 21, filling_valve_state); - _mav_put_uint8_t(buf, 22, venting_valve_state); - _mav_put_uint8_t(buf, 23, release_vlave_state); - _mav_put_uint8_t(buf, 24, ignition_state); - _mav_put_uint8_t(buf, 25, tars_state); + _mav_put_float(buf, 20, vessel_pressure); + _mav_put_uint8_t(buf, 24, arming_state); + _mav_put_uint8_t(buf, 25, filling_valve_state); + _mav_put_uint8_t(buf, 26, venting_valve_state); + _mav_put_uint8_t(buf, 27, release_vlave_state); + _mav_put_uint8_t(buf, 28, ignition_state); + _mav_put_uint8_t(buf, 29, tars_state); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, buf, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC); #else mavlink_gse_tm_t packet; packet.timestamp = timestamp; packet.loadcell_tank = loadcell_tank; - packet.loadcell_COTS_tank = loadcell_COTS_tank; + packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; + packet.vessel_pressure = vessel_pressure; packet.arming_state = arming_state; packet.filling_valve_state = filling_valve_state; packet.venting_valve_state = venting_valve_state; @@ -258,7 +270,7 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time static inline void mavlink_msg_gse_tm_send_struct(mavlink_channel_t chan, const mavlink_gse_tm_t* gse_tm) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_gse_tm_send(chan, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_COTS_tank, gse_tm->filling_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); + mavlink_msg_gse_tm_send(chan, gse_tm->timestamp, gse_tm->loadcell_tank, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->arming_state, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_vlave_state, gse_tm->ignition_state, gse_tm->tars_state); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, (const char *)gse_tm, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC); #endif @@ -272,28 +284,30 @@ static inline void mavlink_msg_gse_tm_send_struct(mavlink_channel_t chan, const 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_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float loadcell_tank, float loadcell_COTS_tank, float filling_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) +static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float loadcell_tank, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t arming_state, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_vlave_state, uint8_t ignition_state, uint8_t tars_state) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; _mav_put_uint64_t(buf, 0, timestamp); _mav_put_float(buf, 8, loadcell_tank); - _mav_put_float(buf, 12, loadcell_COTS_tank); + _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); - _mav_put_uint8_t(buf, 20, arming_state); - _mav_put_uint8_t(buf, 21, filling_valve_state); - _mav_put_uint8_t(buf, 22, venting_valve_state); - _mav_put_uint8_t(buf, 23, release_vlave_state); - _mav_put_uint8_t(buf, 24, ignition_state); - _mav_put_uint8_t(buf, 25, tars_state); + _mav_put_float(buf, 20, vessel_pressure); + _mav_put_uint8_t(buf, 24, arming_state); + _mav_put_uint8_t(buf, 25, filling_valve_state); + _mav_put_uint8_t(buf, 26, venting_valve_state); + _mav_put_uint8_t(buf, 27, release_vlave_state); + _mav_put_uint8_t(buf, 28, ignition_state); + _mav_put_uint8_t(buf, 29, tars_state); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, buf, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC); #else mavlink_gse_tm_t *packet = (mavlink_gse_tm_t *)msgbuf; packet->timestamp = timestamp; packet->loadcell_tank = loadcell_tank; - packet->loadcell_COTS_tank = loadcell_COTS_tank; + packet->loadcell_vessel = loadcell_vessel; packet->filling_pressure = filling_pressure; + packet->vessel_pressure = vessel_pressure; packet->arming_state = arming_state; packet->filling_valve_state = filling_valve_state; packet->venting_valve_state = venting_valve_state; @@ -332,11 +346,11 @@ static inline float mavlink_msg_gse_tm_get_loadcell_tank(const mavlink_message_t } /** - * @brief Get field loadcell_COTS_tank from gse_tm message + * @brief Get field loadcell_vessel from gse_tm message * * @return [kg] External tank weight */ -static inline float mavlink_msg_gse_tm_get_loadcell_COTS_tank(const mavlink_message_t* msg) +static inline float mavlink_msg_gse_tm_get_loadcell_vessel(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 12); } @@ -344,13 +358,23 @@ static inline float mavlink_msg_gse_tm_get_loadcell_COTS_tank(const mavlink_mess /** * @brief Get field filling_pressure from gse_tm message * - * @return [Pa] Refueling line pressure + * @return [Bar] Refueling line pressure */ static inline float mavlink_msg_gse_tm_get_filling_pressure(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 16); } +/** + * @brief Get field vessel_pressure from gse_tm message + * + * @return [Bar] Vessel tank pressure + */ +static inline float mavlink_msg_gse_tm_get_vessel_pressure(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 20); +} + /** * @brief Get field arming_state from gse_tm message * @@ -358,7 +382,7 @@ static inline float mavlink_msg_gse_tm_get_filling_pressure(const mavlink_messag */ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 20); + return _MAV_RETURN_uint8_t(msg, 24); } /** @@ -368,7 +392,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_ */ static inline uint8_t mavlink_msg_gse_tm_get_filling_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 21); + return _MAV_RETURN_uint8_t(msg, 25); } /** @@ -378,7 +402,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_filling_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_venting_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 22); + return _MAV_RETURN_uint8_t(msg, 26); } /** @@ -388,7 +412,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_venting_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_release_vlave_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 23); + return _MAV_RETURN_uint8_t(msg, 27); } /** @@ -398,7 +422,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_release_vlave_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_ignition_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 24); + return _MAV_RETURN_uint8_t(msg, 28); } /** @@ -408,7 +432,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_ignition_state(const mavlink_messag */ static inline uint8_t mavlink_msg_gse_tm_get_tars_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 25); + return _MAV_RETURN_uint8_t(msg, 29); } /** @@ -422,8 +446,9 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS gse_tm->timestamp = mavlink_msg_gse_tm_get_timestamp(msg); gse_tm->loadcell_tank = mavlink_msg_gse_tm_get_loadcell_tank(msg); - gse_tm->loadcell_COTS_tank = mavlink_msg_gse_tm_get_loadcell_COTS_tank(msg); + gse_tm->loadcell_vessel = mavlink_msg_gse_tm_get_loadcell_vessel(msg); gse_tm->filling_pressure = mavlink_msg_gse_tm_get_filling_pressure(msg); + gse_tm->vessel_pressure = mavlink_msg_gse_tm_get_vessel_pressure(msg); gse_tm->arming_state = mavlink_msg_gse_tm_get_arming_state(msg); gse_tm->filling_valve_state = mavlink_msg_gse_tm_get_filling_valve_state(msg); gse_tm->venting_valve_state = mavlink_msg_gse_tm_get_venting_valve_state(msg); diff --git a/mavlink_lib/gemini/mavlink_msg_motor_tm.h b/mavlink_lib/gemini/mavlink_msg_motor_tm.h index fdc9da334e326d1e9332a54ff896e8526a250031..a7de1d1948572a02e9b0d90cf6f9d166c2c1a31e 100644 --- a/mavlink_lib/gemini/mavlink_msg_motor_tm.h +++ b/mavlink_lib/gemini/mavlink_msg_motor_tm.h @@ -6,22 +6,21 @@ typedef struct __mavlink_motor_tm_t { uint64_t timestamp; /*< [us] Timestamp in microseconds*/ - float top_tank_pressure; /*< [Pa] Tank upper pressure*/ - float bottom_tank_pressure; /*< [Pa] Tank bottom pressure*/ - float combustion_chamber_pressure; /*< [Pa] Pressure inside the combustion chamber used for automatic shutdown*/ - float combustion_chamber_temperature; /*< [degC] Combustion chamber inner temperature*/ + float top_tank_pressure; /*< [Bar] Tank upper pressure*/ + float bottom_tank_pressure; /*< [Bar] Tank bottom pressure*/ + float combustion_chamber_pressure; /*< [Bar] Pressure inside the combustion chamber used for automatic shutdown*/ float tank_temperature; /*< Tank temperature*/ float estimated_mass; /*< Mass estimated from floating level*/ uint8_t floating_level; /*< Floating level in tank*/ } mavlink_motor_tm_t; -#define MAVLINK_MSG_ID_MOTOR_TM_LEN 33 -#define MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN 33 -#define MAVLINK_MSG_ID_213_LEN 33 -#define MAVLINK_MSG_ID_213_MIN_LEN 33 +#define MAVLINK_MSG_ID_MOTOR_TM_LEN 29 +#define MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN 29 +#define MAVLINK_MSG_ID_213_LEN 29 +#define MAVLINK_MSG_ID_213_MIN_LEN 29 -#define MAVLINK_MSG_ID_MOTOR_TM_CRC 151 -#define MAVLINK_MSG_ID_213_CRC 151 +#define MAVLINK_MSG_ID_MOTOR_TM_CRC 38 +#define MAVLINK_MSG_ID_213_CRC 38 @@ -29,29 +28,27 @@ typedef struct __mavlink_motor_tm_t { #define MAVLINK_MESSAGE_INFO_MOTOR_TM { \ 213, \ "MOTOR_TM", \ - 8, \ + 7, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_motor_tm_t, timestamp) }, \ { "top_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, top_tank_pressure) }, \ { "bottom_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, bottom_tank_pressure) }, \ { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \ - { "combustion_chamber_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, combustion_chamber_temperature) }, \ - { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_motor_tm_t, floating_level) }, \ - { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, tank_temperature) }, \ - { "estimated_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_motor_tm_t, estimated_mass) }, \ + { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_motor_tm_t, floating_level) }, \ + { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, tank_temperature) }, \ + { "estimated_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, estimated_mass) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_MOTOR_TM { \ "MOTOR_TM", \ - 8, \ + 7, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_motor_tm_t, timestamp) }, \ { "top_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, top_tank_pressure) }, \ { "bottom_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, bottom_tank_pressure) }, \ { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \ - { "combustion_chamber_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, combustion_chamber_temperature) }, \ - { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_motor_tm_t, floating_level) }, \ - { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, tank_temperature) }, \ - { "estimated_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_motor_tm_t, estimated_mass) }, \ + { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_motor_tm_t, floating_level) }, \ + { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, tank_temperature) }, \ + { "estimated_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, estimated_mass) }, \ } \ } #endif @@ -63,17 +60,16 @@ typedef struct __mavlink_motor_tm_t { * @param msg The MAVLink message to compress the data into * * @param timestamp [us] Timestamp in microseconds - * @param top_tank_pressure [Pa] Tank upper pressure - * @param bottom_tank_pressure [Pa] Tank bottom pressure - * @param combustion_chamber_pressure [Pa] Pressure inside the combustion chamber used for automatic shutdown - * @param combustion_chamber_temperature [degC] Combustion chamber inner temperature + * @param top_tank_pressure [Bar] Tank upper pressure + * @param bottom_tank_pressure [Bar] Tank bottom pressure + * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown * @param floating_level Floating level in tank * @param tank_temperature Tank temperature * @param estimated_mass Mass estimated from floating level * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float combustion_chamber_temperature, uint8_t floating_level, float tank_temperature, float estimated_mass) + uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, uint8_t floating_level, float tank_temperature, float estimated_mass) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN]; @@ -81,10 +77,9 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp _mav_put_float(buf, 8, top_tank_pressure); _mav_put_float(buf, 12, bottom_tank_pressure); _mav_put_float(buf, 16, combustion_chamber_pressure); - _mav_put_float(buf, 20, combustion_chamber_temperature); - _mav_put_float(buf, 24, tank_temperature); - _mav_put_float(buf, 28, estimated_mass); - _mav_put_uint8_t(buf, 32, floating_level); + _mav_put_float(buf, 20, tank_temperature); + _mav_put_float(buf, 24, estimated_mass); + _mav_put_uint8_t(buf, 28, floating_level); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN); #else @@ -93,7 +88,6 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp packet.top_tank_pressure = top_tank_pressure; packet.bottom_tank_pressure = bottom_tank_pressure; packet.combustion_chamber_pressure = combustion_chamber_pressure; - packet.combustion_chamber_temperature = combustion_chamber_temperature; packet.tank_temperature = tank_temperature; packet.estimated_mass = estimated_mass; packet.floating_level = floating_level; @@ -112,10 +106,9 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp * @param chan The MAVLink channel this message will be sent over * @param msg The MAVLink message to compress the data into * @param timestamp [us] Timestamp in microseconds - * @param top_tank_pressure [Pa] Tank upper pressure - * @param bottom_tank_pressure [Pa] Tank bottom pressure - * @param combustion_chamber_pressure [Pa] Pressure inside the combustion chamber used for automatic shutdown - * @param combustion_chamber_temperature [degC] Combustion chamber inner temperature + * @param top_tank_pressure [Bar] Tank upper pressure + * @param bottom_tank_pressure [Bar] Tank bottom pressure + * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown * @param floating_level Floating level in tank * @param tank_temperature Tank temperature * @param estimated_mass Mass estimated from floating level @@ -123,7 +116,7 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp */ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint64_t timestamp,float top_tank_pressure,float bottom_tank_pressure,float combustion_chamber_pressure,float combustion_chamber_temperature,uint8_t floating_level,float tank_temperature,float estimated_mass) + uint64_t timestamp,float top_tank_pressure,float bottom_tank_pressure,float combustion_chamber_pressure,uint8_t floating_level,float tank_temperature,float estimated_mass) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN]; @@ -131,10 +124,9 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t _mav_put_float(buf, 8, top_tank_pressure); _mav_put_float(buf, 12, bottom_tank_pressure); _mav_put_float(buf, 16, combustion_chamber_pressure); - _mav_put_float(buf, 20, combustion_chamber_temperature); - _mav_put_float(buf, 24, tank_temperature); - _mav_put_float(buf, 28, estimated_mass); - _mav_put_uint8_t(buf, 32, floating_level); + _mav_put_float(buf, 20, tank_temperature); + _mav_put_float(buf, 24, estimated_mass); + _mav_put_uint8_t(buf, 28, floating_level); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN); #else @@ -143,7 +135,6 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t packet.top_tank_pressure = top_tank_pressure; packet.bottom_tank_pressure = bottom_tank_pressure; packet.combustion_chamber_pressure = combustion_chamber_pressure; - packet.combustion_chamber_temperature = combustion_chamber_temperature; packet.tank_temperature = tank_temperature; packet.estimated_mass = estimated_mass; packet.floating_level = floating_level; @@ -165,7 +156,7 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t */ static inline uint16_t mavlink_msg_motor_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_motor_tm_t* motor_tm) { - return mavlink_msg_motor_tm_pack(system_id, component_id, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->combustion_chamber_temperature, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); + return mavlink_msg_motor_tm_pack(system_id, component_id, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); } /** @@ -179,7 +170,7 @@ static inline uint16_t mavlink_msg_motor_tm_encode(uint8_t system_id, uint8_t co */ static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_motor_tm_t* motor_tm) { - return mavlink_msg_motor_tm_pack_chan(system_id, component_id, chan, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->combustion_chamber_temperature, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); + return mavlink_msg_motor_tm_pack_chan(system_id, component_id, chan, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); } /** @@ -187,17 +178,16 @@ static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8 * @param chan MAVLink channel to send the message * * @param timestamp [us] Timestamp in microseconds - * @param top_tank_pressure [Pa] Tank upper pressure - * @param bottom_tank_pressure [Pa] Tank bottom pressure - * @param combustion_chamber_pressure [Pa] Pressure inside the combustion chamber used for automatic shutdown - * @param combustion_chamber_temperature [degC] Combustion chamber inner temperature + * @param top_tank_pressure [Bar] Tank upper pressure + * @param bottom_tank_pressure [Bar] Tank bottom pressure + * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown * @param floating_level Floating level in tank * @param tank_temperature Tank temperature * @param estimated_mass Mass estimated from floating level */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float combustion_chamber_temperature, uint8_t floating_level, float tank_temperature, float estimated_mass) +static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, uint8_t floating_level, float tank_temperature, float estimated_mass) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN]; @@ -205,10 +195,9 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti _mav_put_float(buf, 8, top_tank_pressure); _mav_put_float(buf, 12, bottom_tank_pressure); _mav_put_float(buf, 16, combustion_chamber_pressure); - _mav_put_float(buf, 20, combustion_chamber_temperature); - _mav_put_float(buf, 24, tank_temperature); - _mav_put_float(buf, 28, estimated_mass); - _mav_put_uint8_t(buf, 32, floating_level); + _mav_put_float(buf, 20, tank_temperature); + _mav_put_float(buf, 24, estimated_mass); + _mav_put_uint8_t(buf, 28, floating_level); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, buf, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC); #else @@ -217,7 +206,6 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti packet.top_tank_pressure = top_tank_pressure; packet.bottom_tank_pressure = bottom_tank_pressure; packet.combustion_chamber_pressure = combustion_chamber_pressure; - packet.combustion_chamber_temperature = combustion_chamber_temperature; packet.tank_temperature = tank_temperature; packet.estimated_mass = estimated_mass; packet.floating_level = floating_level; @@ -234,7 +222,7 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti static inline void mavlink_msg_motor_tm_send_struct(mavlink_channel_t chan, const mavlink_motor_tm_t* motor_tm) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_motor_tm_send(chan, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->combustion_chamber_temperature, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); + mavlink_msg_motor_tm_send(chan, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->floating_level, motor_tm->tank_temperature, motor_tm->estimated_mass); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)motor_tm, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC); #endif @@ -248,7 +236,7 @@ static inline void mavlink_msg_motor_tm_send_struct(mavlink_channel_t chan, cons 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_motor_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float combustion_chamber_temperature, uint8_t floating_level, float tank_temperature, float estimated_mass) +static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, uint8_t floating_level, float tank_temperature, float estimated_mass) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; @@ -256,10 +244,9 @@ static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavl _mav_put_float(buf, 8, top_tank_pressure); _mav_put_float(buf, 12, bottom_tank_pressure); _mav_put_float(buf, 16, combustion_chamber_pressure); - _mav_put_float(buf, 20, combustion_chamber_temperature); - _mav_put_float(buf, 24, tank_temperature); - _mav_put_float(buf, 28, estimated_mass); - _mav_put_uint8_t(buf, 32, floating_level); + _mav_put_float(buf, 20, tank_temperature); + _mav_put_float(buf, 24, estimated_mass); + _mav_put_uint8_t(buf, 28, floating_level); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, buf, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC); #else @@ -268,7 +255,6 @@ static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavl packet->top_tank_pressure = top_tank_pressure; packet->bottom_tank_pressure = bottom_tank_pressure; packet->combustion_chamber_pressure = combustion_chamber_pressure; - packet->combustion_chamber_temperature = combustion_chamber_temperature; packet->tank_temperature = tank_temperature; packet->estimated_mass = estimated_mass; packet->floating_level = floating_level; @@ -296,7 +282,7 @@ static inline uint64_t mavlink_msg_motor_tm_get_timestamp(const mavlink_message_ /** * @brief Get field top_tank_pressure from motor_tm message * - * @return [Pa] Tank upper pressure + * @return [Bar] Tank upper pressure */ static inline float mavlink_msg_motor_tm_get_top_tank_pressure(const mavlink_message_t* msg) { @@ -306,7 +292,7 @@ static inline float mavlink_msg_motor_tm_get_top_tank_pressure(const mavlink_mes /** * @brief Get field bottom_tank_pressure from motor_tm message * - * @return [Pa] Tank bottom pressure + * @return [Bar] Tank bottom pressure */ static inline float mavlink_msg_motor_tm_get_bottom_tank_pressure(const mavlink_message_t* msg) { @@ -316,23 +302,13 @@ static inline float mavlink_msg_motor_tm_get_bottom_tank_pressure(const mavlink_ /** * @brief Get field combustion_chamber_pressure from motor_tm message * - * @return [Pa] Pressure inside the combustion chamber used for automatic shutdown + * @return [Bar] Pressure inside the combustion chamber used for automatic shutdown */ static inline float mavlink_msg_motor_tm_get_combustion_chamber_pressure(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 16); } -/** - * @brief Get field combustion_chamber_temperature from motor_tm message - * - * @return [degC] Combustion chamber inner temperature - */ -static inline float mavlink_msg_motor_tm_get_combustion_chamber_temperature(const mavlink_message_t* msg) -{ - return _MAV_RETURN_float(msg, 20); -} - /** * @brief Get field floating_level from motor_tm message * @@ -340,7 +316,7 @@ static inline float mavlink_msg_motor_tm_get_combustion_chamber_temperature(cons */ static inline uint8_t mavlink_msg_motor_tm_get_floating_level(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 32); + return _MAV_RETURN_uint8_t(msg, 28); } /** @@ -350,7 +326,7 @@ static inline uint8_t mavlink_msg_motor_tm_get_floating_level(const mavlink_mess */ static inline float mavlink_msg_motor_tm_get_tank_temperature(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 24); + return _MAV_RETURN_float(msg, 20); } /** @@ -360,7 +336,7 @@ static inline float mavlink_msg_motor_tm_get_tank_temperature(const mavlink_mess */ static inline float mavlink_msg_motor_tm_get_estimated_mass(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 28); + return _MAV_RETURN_float(msg, 24); } /** @@ -376,7 +352,6 @@ static inline void mavlink_msg_motor_tm_decode(const mavlink_message_t* msg, mav motor_tm->top_tank_pressure = mavlink_msg_motor_tm_get_top_tank_pressure(msg); motor_tm->bottom_tank_pressure = mavlink_msg_motor_tm_get_bottom_tank_pressure(msg); motor_tm->combustion_chamber_pressure = mavlink_msg_motor_tm_get_combustion_chamber_pressure(msg); - motor_tm->combustion_chamber_temperature = mavlink_msg_motor_tm_get_combustion_chamber_temperature(msg); motor_tm->tank_temperature = mavlink_msg_motor_tm_get_tank_temperature(msg); motor_tm->estimated_mass = mavlink_msg_motor_tm_get_estimated_mass(msg); motor_tm->floating_level = mavlink_msg_motor_tm_get_floating_level(msg); diff --git a/mavlink_lib/gemini/testsuite.h b/mavlink_lib/gemini/testsuite.h index 44a86abadacb005c86d7c53520352867425057ff..16d9f8264ba6b7da2812cf9bf4c15b044875149a 100644 --- a/mavlink_lib/gemini/testsuite.h +++ b/mavlink_lib/gemini/testsuite.h @@ -3015,14 +3015,15 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_gse_tm_t packet_in = { - 93372036854775807ULL,73.0,101.0,129.0,65,132,199,10,77,144 + 93372036854775807ULL,73.0,101.0,129.0,157.0,77,144,211,22,89,156 }; mavlink_gse_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); packet1.timestamp = packet_in.timestamp; packet1.loadcell_tank = packet_in.loadcell_tank; - packet1.loadcell_COTS_tank = packet_in.loadcell_COTS_tank; + packet1.loadcell_vessel = packet_in.loadcell_vessel; packet1.filling_pressure = packet_in.filling_pressure; + packet1.vessel_pressure = packet_in.vessel_pressure; packet1.arming_state = packet_in.arming_state; packet1.filling_valve_state = packet_in.filling_valve_state; packet1.venting_valve_state = packet_in.venting_valve_state; @@ -3043,12 +3044,12 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_gse_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_COTS_tank , packet1.filling_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); + mavlink_msg_gse_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); mavlink_msg_gse_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_gse_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_COTS_tank , packet1.filling_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); + mavlink_msg_gse_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); mavlink_msg_gse_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -3061,7 +3062,7 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_gse_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_COTS_tank , packet1.filling_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); + mavlink_msg_gse_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.loadcell_tank , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.arming_state , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_vlave_state , packet1.ignition_state , packet1.tars_state ); mavlink_msg_gse_tm_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -3083,7 +3084,7 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_motor_tm_t packet_in = { - 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,101 + 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,89 }; mavlink_motor_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -3091,7 +3092,6 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli packet1.top_tank_pressure = packet_in.top_tank_pressure; packet1.bottom_tank_pressure = packet_in.bottom_tank_pressure; packet1.combustion_chamber_pressure = packet_in.combustion_chamber_pressure; - packet1.combustion_chamber_temperature = packet_in.combustion_chamber_temperature; packet1.tank_temperature = packet_in.tank_temperature; packet1.estimated_mass = packet_in.estimated_mass; packet1.floating_level = packet_in.floating_level; @@ -3109,12 +3109,12 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_motor_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.combustion_chamber_temperature , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); + mavlink_msg_motor_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); mavlink_msg_motor_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_motor_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.combustion_chamber_temperature , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); + mavlink_msg_motor_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); mavlink_msg_motor_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -3127,7 +3127,7 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_motor_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.combustion_chamber_temperature , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); + mavlink_msg_motor_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.floating_level , packet1.tank_temperature , packet1.estimated_mass ); mavlink_msg_motor_tm_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); diff --git a/mavlink_lib/gemini/version.h b/mavlink_lib/gemini/version.h index 03f7987da413dae4ccad3b1fe9cc49c8d174a8ce..85ecaa0ea44a7721fbec7533dbbb8fa7c719b119 100644 --- a/mavlink_lib/gemini/version.h +++ b/mavlink_lib/gemini/version.h @@ -7,7 +7,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Wed Mar 08 2023" +#define MAVLINK_BUILD_DATE "Fri Mar 10 2023" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 171 diff --git a/message_definitions/gemini.xml b/message_definitions/gemini.xml index b0d7098608d934a75369d571c39d63f8aee94564..4d36ec99cbe1b0b9f9028289fed7cff01a793aa3 100644 --- a/message_definitions/gemini.xml +++ b/message_definitions/gemini.xml @@ -95,42 +95,45 @@ <description>Load cell data</description> </entry> <!-- MOTOR --> - <entry name="MAV_FILLING_PRES_ID" value="15"> + <entry name="MAV_FILLING_PRESS_ID" value="15"> <description>Filling line pressure</description> </entry> - <entry name="MAV_TANK_TOP_PRES_ID" value="16"> + <entry name="MAV_TANK_TOP_PRESS_ID" value="16"> <description>Top tank pressure</description> </entry> - <entry name="MAV_TANK_BOTTOM_PRES_ID" value="17"> + <entry name="MAV_TANK_BOTTOM_PRESS_ID" value="17"> <description>Bottom tank pressure</description> </entry> <entry name="MAV_TANK_TEMP_ID" value="18"> <description>Tank temperature</description> </entry> - <entry name="MAV_COMBUSTION_PRES_ID" value="19"> + <entry name="MAV_COMBUSTION_PRESS_ID" value="19"> <description>Combustion chamber pressure</description> </entry> + <entry name="MAV_VESSEL_PRESS_ID" value="20"> + <description>Vessel pressure</description> + </entry> <!-- REFUELING --> - <entry name="MAV_LOAD_CELL_TANK_COTS_ID" value="20"> - <description>COTS tank weight</description> + <entry name="MAV_LOAD_CELL_VESSEL_ID" value="21"> + <description>Vessel tank weight</description> </entry> - <entry name="MAV_LOAD_CELL_TANK_SRAD_ID" value="21"> - <description>SRAD tank weight</description> + <entry name="MAV_LOAD_CELL_TANK_ID" value="22"> + <description>Tank weight</description> </entry> <!-- GEMINI ROCKET --> - <entry name="MAV_LIS2MDL_ID" value="22"> + <entry name="MAV_LIS2MDL_ID" value="23"> <description>Magnetometer data</description> </entry> - <entry name="MAV_LPS28DFW_ID" value="23"> + <entry name="MAV_LPS28DFW_ID" value="24"> <description>Pressure sensor data</description> </entry> - <entry name="MAV_LSM6DSRX_ID" value="24"> + <entry name="MAV_LSM6DSRX_ID" value="25"> <description>IMU data</description> </entry> - <entry name="MAV_H3LIS331DL_ID" value="25"> + <entry name="MAV_H3LIS331DL_ID" value="26"> <description>400G accelerometer</description> </entry> - <entry name="MAV_LPS22DF_ID" value="26"> + <entry name="MAV_LPS22DF_ID" value="27"> <description>Pressure sensor data</description> </entry> </enum> @@ -667,8 +670,9 @@ <description>Ground Segment Equipment telemetry</description> <field name="timestamp" type="uint64_t" units="us">Timestamp in microseconds</field> <field name="loadcell_tank" type="float" units="kg">Rocket weight</field> - <field name="loadcell_COTS_tank" type="float" units="kg">External tank weight</field> - <field name="filling_pressure" type="float" units="Pa">Refueling line pressure</field> + <field name="loadcell_vessel" type="float" units="kg">External tank weight</field> + <field name="filling_pressure" type="float" units="Bar">Refueling line pressure</field> + <field name="vessel_pressure" type="float" units="Bar">Vessel tank pressure</field> <field name="arming_state" type="uint8_t">1 If the rocket is armed</field> <field name="filling_valve_state" type="uint8_t">1 If the filling valve is open</field> <field name="venting_valve_state" type="uint8_t">1 If the venting valve is open</field> @@ -679,11 +683,9 @@ <message id="213" name="MOTOR_TM"> <description>Motor rocket telemetry</description> <field name="timestamp" type="uint64_t" units="us">Timestamp in microseconds</field> - <field name="top_tank_pressure" type="float" units="Pa">Tank upper pressure</field> - <field name="bottom_tank_pressure" type="float" units="Pa">Tank bottom pressure</field> - <field name="combustion_chamber_pressure" type="float" units="Pa">Pressure inside the combustion chamber used for automatic shutdown</field> - <!--TODO DECIDE IF COMBUSTION CHAMBER TEMPERATURE SHOULD BE KEPT--> - <field name="combustion_chamber_temperature" type="float" units="degC">Combustion chamber inner temperature</field> + <field name="top_tank_pressure" type="float" units="Bar">Tank upper pressure</field> + <field name="bottom_tank_pressure" type="float" units="Bar">Tank bottom pressure</field> + <field name="combustion_chamber_pressure" type="float" units="Bar">Pressure inside the combustion chamber used for automatic shutdown</field> <field name="floating_level" type="uint8_t">Floating level in tank</field> <field name="tank_temperature" type="float">Tank temperature</field> <field name="estimated_mass" type="float">Mass estimated from floating level</field>