diff --git a/mavlink_lib/gemini/gemini.h b/mavlink_lib/gemini/gemini.h
index 457e61daf6b96f756a429de708c6071f653973be..289076da6a4250f5436d00ebe66e1761a22aab68 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 -92144619654996972
+#define MAVLINK_THIS_XML_HASH -186839194089598031
#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, 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}
+#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, 38, 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}
#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, 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}
+#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, 43, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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"
@@ -214,7 +214,7 @@ typedef enum PinsList
#undef MAVLINK_THIS_XML_HASH
-#define MAVLINK_THIS_XML_HASH -92144619654996972
+#define MAVLINK_THIS_XML_HASH -186839194089598031
#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 c9b231defc8985fe7ebd0f06616ef76992a55c1c..aac8dec9e53e3a1a91097377766663d3e9be5f06 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 -92144619654996972
+#define MAVLINK_PRIMARY_XML_HASH -186839194089598031
#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 cd81daf9435741f4a6889583d2056932ae7c1305..13987102f391bfafaa8b3ec215897cef816910e1 100644
--- a/mavlink_lib/gemini/mavlink_msg_gse_tm.h
+++ b/mavlink_lib/gemini/mavlink_msg_gse_tm.h
@@ -10,6 +10,8 @@ typedef struct __mavlink_gse_tm_t {
float loadcell_vessel; /*< [kg] External tank weight*/
float filling_pressure; /*< [Bar] Refueling line pressure*/
float vessel_pressure; /*< [Bar] Vessel tank pressure*/
+ float battery_voltage; /*< Battery voltage*/
+ float current_consumption; /*< RIG current */
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*/
@@ -18,13 +20,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 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_LEN 38
+#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 38
+#define MAVLINK_MSG_ID_212_LEN 38
+#define MAVLINK_MSG_ID_212_MIN_LEN 38
-#define MAVLINK_MSG_ID_GSE_TM_CRC 17
-#define MAVLINK_MSG_ID_212_CRC 17
+#define MAVLINK_MSG_ID_GSE_TM_CRC 43
+#define MAVLINK_MSG_ID_212_CRC 43
@@ -32,35 +34,39 @@ typedef struct __mavlink_gse_tm_t {
#define MAVLINK_MESSAGE_INFO_GSE_TM { \
212, \
"GSE_TM", \
- 11, \
+ 13, \
{ { "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_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) }, \
{ "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) }, \
+ { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_gse_tm_t, arming_state) }, \
+ { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 33, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \
+ { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 34, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \
+ { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 35, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \
+ { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 36, offsetof(mavlink_gse_tm_t, ignition_state) }, \
+ { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 37, offsetof(mavlink_gse_tm_t, tars_state) }, \
+ { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, battery_voltage) }, \
+ { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, current_consumption) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_GSE_TM { \
"GSE_TM", \
- 11, \
+ 13, \
{ { "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_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) }, \
{ "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) }, \
+ { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 32, offsetof(mavlink_gse_tm_t, arming_state) }, \
+ { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 33, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \
+ { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 34, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \
+ { "release_vlave_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 35, offsetof(mavlink_gse_tm_t, release_vlave_state) }, \
+ { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 36, offsetof(mavlink_gse_tm_t, ignition_state) }, \
+ { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 37, offsetof(mavlink_gse_tm_t, tars_state) }, \
+ { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, battery_voltage) }, \
+ { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, current_consumption) }, \
} \
}
#endif
@@ -82,10 +88,12 @@ typedef struct __mavlink_gse_tm_t {
* @param release_vlave_state 1 If the release valve is open
* @param ignition_state 1 If the RIG is in ignition process
* @param tars_state 1 If the TARS algorithm is running
+ * @param battery_voltage Battery voltage
+ * @param current_consumption RIG current
* @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_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)
+ 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, float battery_voltage, float current_consumption)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
@@ -94,12 +102,14 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
_mav_put_float(buf, 12, loadcell_vessel);
_mav_put_float(buf, 16, filling_pressure);
_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_put_float(buf, 24, battery_voltage);
+ _mav_put_float(buf, 28, current_consumption);
+ _mav_put_uint8_t(buf, 32, arming_state);
+ _mav_put_uint8_t(buf, 33, filling_valve_state);
+ _mav_put_uint8_t(buf, 34, venting_valve_state);
+ _mav_put_uint8_t(buf, 35, release_vlave_state);
+ _mav_put_uint8_t(buf, 36, ignition_state);
+ _mav_put_uint8_t(buf, 37, tars_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN);
#else
@@ -109,6 +119,8 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
packet.loadcell_vessel = loadcell_vessel;
packet.filling_pressure = filling_pressure;
packet.vessel_pressure = vessel_pressure;
+ packet.battery_voltage = battery_voltage;
+ packet.current_consumption = current_consumption;
packet.arming_state = arming_state;
packet.filling_valve_state = filling_valve_state;
packet.venting_valve_state = venting_valve_state;
@@ -140,11 +152,13 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
* @param release_vlave_state 1 If the release valve is open
* @param ignition_state 1 If the RIG is in ignition process
* @param tars_state 1 If the TARS algorithm is running
+ * @param battery_voltage Battery voltage
+ * @param current_consumption RIG current
* @return length of the message in bytes (excluding serial stream start sign)
*/
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_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)
+ 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,float battery_voltage,float current_consumption)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
@@ -153,12 +167,14 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
_mav_put_float(buf, 12, loadcell_vessel);
_mav_put_float(buf, 16, filling_pressure);
_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_put_float(buf, 24, battery_voltage);
+ _mav_put_float(buf, 28, current_consumption);
+ _mav_put_uint8_t(buf, 32, arming_state);
+ _mav_put_uint8_t(buf, 33, filling_valve_state);
+ _mav_put_uint8_t(buf, 34, venting_valve_state);
+ _mav_put_uint8_t(buf, 35, release_vlave_state);
+ _mav_put_uint8_t(buf, 36, ignition_state);
+ _mav_put_uint8_t(buf, 37, tars_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN);
#else
@@ -168,6 +184,8 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
packet.loadcell_vessel = loadcell_vessel;
packet.filling_pressure = filling_pressure;
packet.vessel_pressure = vessel_pressure;
+ packet.battery_voltage = battery_voltage;
+ packet.current_consumption = current_consumption;
packet.arming_state = arming_state;
packet.filling_valve_state = filling_valve_state;
packet.venting_valve_state = venting_valve_state;
@@ -192,7 +210,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_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);
+ 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, gse_tm->battery_voltage, gse_tm->current_consumption);
}
/**
@@ -206,7 +224,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_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);
+ 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, gse_tm->battery_voltage, gse_tm->current_consumption);
}
/**
@@ -224,10 +242,12 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t
* @param release_vlave_state 1 If the release valve is open
* @param ignition_state 1 If the RIG is in ignition process
* @param tars_state 1 If the TARS algorithm is running
+ * @param battery_voltage Battery voltage
+ * @param current_consumption RIG current
*/
#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_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)
+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, float battery_voltage, float current_consumption)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
@@ -236,12 +256,14 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
_mav_put_float(buf, 12, loadcell_vessel);
_mav_put_float(buf, 16, filling_pressure);
_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_put_float(buf, 24, battery_voltage);
+ _mav_put_float(buf, 28, current_consumption);
+ _mav_put_uint8_t(buf, 32, arming_state);
+ _mav_put_uint8_t(buf, 33, filling_valve_state);
+ _mav_put_uint8_t(buf, 34, venting_valve_state);
+ _mav_put_uint8_t(buf, 35, release_vlave_state);
+ _mav_put_uint8_t(buf, 36, ignition_state);
+ _mav_put_uint8_t(buf, 37, 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
@@ -251,6 +273,8 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
packet.loadcell_vessel = loadcell_vessel;
packet.filling_pressure = filling_pressure;
packet.vessel_pressure = vessel_pressure;
+ packet.battery_voltage = battery_voltage;
+ packet.current_consumption = current_consumption;
packet.arming_state = arming_state;
packet.filling_valve_state = filling_valve_state;
packet.venting_valve_state = venting_valve_state;
@@ -270,7 +294,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_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);
+ 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, gse_tm->battery_voltage, gse_tm->current_consumption);
#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
@@ -284,7 +308,7 @@ 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_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)
+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, float battery_voltage, float current_consumption)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
@@ -293,12 +317,14 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
_mav_put_float(buf, 12, loadcell_vessel);
_mav_put_float(buf, 16, filling_pressure);
_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_put_float(buf, 24, battery_voltage);
+ _mav_put_float(buf, 28, current_consumption);
+ _mav_put_uint8_t(buf, 32, arming_state);
+ _mav_put_uint8_t(buf, 33, filling_valve_state);
+ _mav_put_uint8_t(buf, 34, venting_valve_state);
+ _mav_put_uint8_t(buf, 35, release_vlave_state);
+ _mav_put_uint8_t(buf, 36, ignition_state);
+ _mav_put_uint8_t(buf, 37, 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
@@ -308,6 +334,8 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
packet->loadcell_vessel = loadcell_vessel;
packet->filling_pressure = filling_pressure;
packet->vessel_pressure = vessel_pressure;
+ packet->battery_voltage = battery_voltage;
+ packet->current_consumption = current_consumption;
packet->arming_state = arming_state;
packet->filling_valve_state = filling_valve_state;
packet->venting_valve_state = venting_valve_state;
@@ -382,7 +410,7 @@ static inline float mavlink_msg_gse_tm_get_vessel_pressure(const mavlink_message
*/
static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 24);
+ return _MAV_RETURN_uint8_t(msg, 32);
}
/**
@@ -392,7 +420,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, 25);
+ return _MAV_RETURN_uint8_t(msg, 33);
}
/**
@@ -402,7 +430,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, 26);
+ return _MAV_RETURN_uint8_t(msg, 34);
}
/**
@@ -412,7 +440,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, 27);
+ return _MAV_RETURN_uint8_t(msg, 35);
}
/**
@@ -422,7 +450,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, 28);
+ return _MAV_RETURN_uint8_t(msg, 36);
}
/**
@@ -432,7 +460,27 @@ 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, 29);
+ return _MAV_RETURN_uint8_t(msg, 37);
+}
+
+/**
+ * @brief Get field battery_voltage from gse_tm message
+ *
+ * @return Battery voltage
+ */
+static inline float mavlink_msg_gse_tm_get_battery_voltage(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_float(msg, 24);
+}
+
+/**
+ * @brief Get field current_consumption from gse_tm message
+ *
+ * @return RIG current
+ */
+static inline float mavlink_msg_gse_tm_get_current_consumption(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_float(msg, 28);
}
/**
@@ -449,6 +497,8 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli
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->battery_voltage = mavlink_msg_gse_tm_get_battery_voltage(msg);
+ gse_tm->current_consumption = mavlink_msg_gse_tm_get_current_consumption(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 a7de1d1948572a02e9b0d90cf6f9d166c2c1a31e..508ce65e21679c49c95c240cb5fb0f05ade61e0f 100644
--- a/mavlink_lib/gemini/mavlink_msg_motor_tm.h
+++ b/mavlink_lib/gemini/mavlink_msg_motor_tm.h
@@ -10,17 +10,17 @@ typedef struct __mavlink_motor_tm_t {
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*/
+ uint8_t main_valve_state; /*< 1 If the main valve is open */
} mavlink_motor_tm_t;
-#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_LEN 26
+#define MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN 26
+#define MAVLINK_MSG_ID_213_LEN 26
+#define MAVLINK_MSG_ID_213_MIN_LEN 26
-#define MAVLINK_MSG_ID_MOTOR_TM_CRC 38
-#define MAVLINK_MSG_ID_213_CRC 38
+#define MAVLINK_MSG_ID_MOTOR_TM_CRC 241
+#define MAVLINK_MSG_ID_213_CRC 241
@@ -33,9 +33,9 @@ typedef struct __mavlink_motor_tm_t {
{ "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) }, \
- { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_motor_tm_t, floating_level) }, \
+ { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, 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) }, \
+ { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
} \
}
#else
@@ -46,9 +46,9 @@ typedef struct __mavlink_motor_tm_t {
{ "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) }, \
- { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_motor_tm_t, floating_level) }, \
+ { "floating_level", NULL, MAVLINK_TYPE_UINT8_T, 0, 24, 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) }, \
+ { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 25, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
} \
}
#endif
@@ -65,11 +65,11 @@ typedef struct __mavlink_motor_tm_t {
* @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
+ * @param main_valve_state 1 If the main valve is open
* @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, 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, uint8_t main_valve_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
@@ -78,8 +78,8 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp
_mav_put_float(buf, 12, bottom_tank_pressure);
_mav_put_float(buf, 16, combustion_chamber_pressure);
_mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, estimated_mass);
- _mav_put_uint8_t(buf, 28, floating_level);
+ _mav_put_uint8_t(buf, 24, floating_level);
+ _mav_put_uint8_t(buf, 25, main_valve_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#else
@@ -89,8 +89,8 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp
packet.bottom_tank_pressure = bottom_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
packet.tank_temperature = tank_temperature;
- packet.estimated_mass = estimated_mass;
packet.floating_level = floating_level;
+ packet.main_valve_state = main_valve_state;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#endif
@@ -111,12 +111,12 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp
* @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
+ * @param main_valve_state 1 If the main valve is open
* @return length of the message in bytes (excluding serial stream start sign)
*/
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,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,uint8_t main_valve_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
@@ -125,8 +125,8 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t
_mav_put_float(buf, 12, bottom_tank_pressure);
_mav_put_float(buf, 16, combustion_chamber_pressure);
_mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, estimated_mass);
- _mav_put_uint8_t(buf, 28, floating_level);
+ _mav_put_uint8_t(buf, 24, floating_level);
+ _mav_put_uint8_t(buf, 25, main_valve_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#else
@@ -136,8 +136,8 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t
packet.bottom_tank_pressure = bottom_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
packet.tank_temperature = tank_temperature;
- packet.estimated_mass = estimated_mass;
packet.floating_level = floating_level;
+ packet.main_valve_state = main_valve_state;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#endif
@@ -156,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->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->main_valve_state);
}
/**
@@ -170,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->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->main_valve_state);
}
/**
@@ -183,11 +183,11 @@ static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8
* @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
+ * @param main_valve_state 1 If the main valve is open
*/
#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, 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, uint8_t main_valve_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
@@ -196,8 +196,8 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti
_mav_put_float(buf, 12, bottom_tank_pressure);
_mav_put_float(buf, 16, combustion_chamber_pressure);
_mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, estimated_mass);
- _mav_put_uint8_t(buf, 28, floating_level);
+ _mav_put_uint8_t(buf, 24, floating_level);
+ _mav_put_uint8_t(buf, 25, main_valve_state);
_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
@@ -207,8 +207,8 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti
packet.bottom_tank_pressure = bottom_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
packet.tank_temperature = tank_temperature;
- packet.estimated_mass = estimated_mass;
packet.floating_level = floating_level;
+ packet.main_valve_state = main_valve_state;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)&packet, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
#endif
@@ -222,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->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->main_valve_state);
#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
@@ -236,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, 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, uint8_t main_valve_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
@@ -245,8 +245,8 @@ static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavl
_mav_put_float(buf, 12, bottom_tank_pressure);
_mav_put_float(buf, 16, combustion_chamber_pressure);
_mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, estimated_mass);
- _mav_put_uint8_t(buf, 28, floating_level);
+ _mav_put_uint8_t(buf, 24, floating_level);
+ _mav_put_uint8_t(buf, 25, main_valve_state);
_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
@@ -256,8 +256,8 @@ static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavl
packet->bottom_tank_pressure = bottom_tank_pressure;
packet->combustion_chamber_pressure = combustion_chamber_pressure;
packet->tank_temperature = tank_temperature;
- packet->estimated_mass = estimated_mass;
packet->floating_level = floating_level;
+ packet->main_valve_state = main_valve_state;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)packet, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
#endif
@@ -316,7 +316,7 @@ static inline float mavlink_msg_motor_tm_get_combustion_chamber_pressure(const m
*/
static inline uint8_t mavlink_msg_motor_tm_get_floating_level(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 28);
+ return _MAV_RETURN_uint8_t(msg, 24);
}
/**
@@ -330,13 +330,13 @@ static inline float mavlink_msg_motor_tm_get_tank_temperature(const mavlink_mess
}
/**
- * @brief Get field estimated_mass from motor_tm message
+ * @brief Get field main_valve_state from motor_tm message
*
- * @return Mass estimated from floating level
+ * @return 1 If the main valve is open
*/
-static inline float mavlink_msg_motor_tm_get_estimated_mass(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_motor_tm_get_main_valve_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_float(msg, 24);
+ return _MAV_RETURN_uint8_t(msg, 25);
}
/**
@@ -353,8 +353,8 @@ static inline void mavlink_msg_motor_tm_decode(const mavlink_message_t* msg, mav
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->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);
+ motor_tm->main_valve_state = mavlink_msg_motor_tm_get_main_valve_state(msg);
#else
uint8_t len = msg->len < MAVLINK_MSG_ID_MOTOR_TM_LEN? msg->len : MAVLINK_MSG_ID_MOTOR_TM_LEN;
memset(motor_tm, 0, MAVLINK_MSG_ID_MOTOR_TM_LEN);
diff --git a/mavlink_lib/gemini/testsuite.h b/mavlink_lib/gemini/testsuite.h
index 16d9f8264ba6b7da2812cf9bf4c15b044875149a..e281f97153e3549b8798fd67ee1238574dfa6ce3 100644
--- a/mavlink_lib/gemini/testsuite.h
+++ b/mavlink_lib/gemini/testsuite.h
@@ -3015,7 +3015,7 @@ 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,157.0,77,144,211,22,89,156
+ 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,101,168,235,46,113,180
};
mavlink_gse_tm_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
@@ -3024,6 +3024,8 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
packet1.loadcell_vessel = packet_in.loadcell_vessel;
packet1.filling_pressure = packet_in.filling_pressure;
packet1.vessel_pressure = packet_in.vessel_pressure;
+ packet1.battery_voltage = packet_in.battery_voltage;
+ packet1.current_consumption = packet_in.current_consumption;
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;
@@ -3044,12 +3046,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_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_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 , packet1.battery_voltage , packet1.current_consumption );
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_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_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 , packet1.battery_voltage , packet1.current_consumption );
mavlink_msg_gse_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -3062,7 +3064,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_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_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 , packet1.battery_voltage , packet1.current_consumption );
mavlink_msg_gse_tm_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -3084,7 +3086,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,89
+ 93372036854775807ULL,73.0,101.0,129.0,157.0,77,144
};
mavlink_motor_tm_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
@@ -3093,8 +3095,8 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli
packet1.bottom_tank_pressure = packet_in.bottom_tank_pressure;
packet1.combustion_chamber_pressure = packet_in.combustion_chamber_pressure;
packet1.tank_temperature = packet_in.tank_temperature;
- packet1.estimated_mass = packet_in.estimated_mass;
packet1.floating_level = packet_in.floating_level;
+ packet1.main_valve_state = packet_in.main_valve_state;
#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
@@ -3109,12 +3111,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.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.main_valve_state );
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.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.main_valve_state );
mavlink_msg_motor_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -3127,7 +3129,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.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.main_valve_state );
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 85ecaa0ea44a7721fbec7533dbbb8fa7c719b119..1fd61d311c9a9c71584a8814819875e22c3f5f02 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 "Fri Mar 10 2023"
+#define MAVLINK_BUILD_DATE "Sat Apr 15 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 7eee2916d6f66cd656c9b65ea08a4aaba33fdcb3..98513a6f6ff4062c41ad1ee59af089de06744fbf 100644
--- a/message_definitions/gemini.xml
+++ b/message_definitions/gemini.xml
@@ -679,6 +679,8 @@
<field name="release_vlave_state" type="uint8_t">1 If the release valve is open</field>
<field name="ignition_state" type="uint8_t">1 If the RIG is in ignition process</field>
<field name="tars_state" type="uint8_t">1 If the TARS algorithm is running</field>
+ <field name="battery_voltage" type="float">Battery voltage</field>
+ <field name="current_consumption" type="float"> RIG current </field>
</message>
<message id="213" name="MOTOR_TM">
<description>Motor rocket telemetry</description>
@@ -688,7 +690,7 @@
<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>
+ <field name="main_valve_state" type="uint8_t"> 1 If the main valve is open </field>
</message>
</messages>
</mavlink>