diff --git a/flight/OpenPilot/UAVObjects/inc/pipxtrememodemsettings.h b/flight/OpenPilot/UAVObjects/inc/pipxtrememodemsettings.h index 114faa45e..3c65502b4 100644 --- a/flight/OpenPilot/UAVObjects/inc/pipxtrememodemsettings.h +++ b/flight/OpenPilot/UAVObjects/inc/pipxtrememodemsettings.h @@ -41,7 +41,7 @@ #define PIPXTREMEMODEMSETTINGS_H // Object constants -#define PIPXTREMEMODEMSETTINGS_OBJID 3841416984U +#define PIPXTREMEMODEMSETTINGS_OBJID 2660664364U #define PIPXTREMEMODEMSETTINGS_NAME "PipXtremeModemSettings" #define PIPXTREMEMODEMSETTINGS_METANAME "PipXtremeModemSettingsMeta" #define PIPXTREMEMODEMSETTINGS_ISSINGLEINST 1 @@ -71,36 +71,36 @@ // Object data typedef struct { - uint8_t Frequency calibration; - uint32_t Frequency min; - uint32_t Frequency max; + uint8_t Frequency_Calibration; + uint32_t Frequency_Min; + uint32_t Frequency_Max; uint32_t Frequency; - uint8_t RF bandwidth; - uint8_t Max Tx power; - uint8_t AESEncryption; - uint8_t AESEncryptionKey[16]; - uint32_t PairedSerialNumberCRC; + uint8_t RF_Bandwidth; + uint8_t Max_Tx_Power; + uint8_t AES_Encryption; + uint8_t AES_EncryptionKey[16]; + uint32_t Paired_Serial_Number_CRC; } __attribute__((packed)) PipXtremeModemSettingsData; // Field information -// Field Frequency calibration information -// Field Frequency min information -// Field Frequency max information +// Field Frequency_Calibration information +// Field Frequency_Min information +// Field Frequency_Max information // Field Frequency information -// Field RF bandwidth information -/* Enumeration options for field RF bandwidth */ -typedef enum { PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_500=0, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_1000=1, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_2000=2, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_4000=3, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_8000=4, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_9600=5, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_16000=6, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_19200=7, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_24000=8, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_32000=9, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_64000=10, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_128000=11, PIPXTREMEMODEMSETTINGS_RF BANDWIDTH_192000=12 } PipXtremeModemSettingsRF bandwidthOptions; -// Field Max Tx power information -/* Enumeration options for field Max Tx power */ -typedef enum { PIPXTREMEMODEMSETTINGS_MAX TX POWER_1=0, PIPXTREMEMODEMSETTINGS_MAX TX POWER_2=1, PIPXTREMEMODEMSETTINGS_MAX TX POWER_5=2, PIPXTREMEMODEMSETTINGS_MAX TX POWER_8=3, PIPXTREMEMODEMSETTINGS_MAX TX POWER_11=4, PIPXTREMEMODEMSETTINGS_MAX TX POWER_14=5, PIPXTREMEMODEMSETTINGS_MAX TX POWER_17=6, PIPXTREMEMODEMSETTINGS_MAX TX POWER_20=7 } PipXtremeModemSettingsMax Tx powerOptions; -// Field AESEncryption information -/* Enumeration options for field AESEncryption */ -typedef enum { PIPXTREMEMODEMSETTINGS_AESENCRYPTION_FALSE=0, PIPXTREMEMODEMSETTINGS_AESENCRYPTION_TRUE=1 } PipXtremeModemSettingsAESEncryptionOptions; -// Field AESEncryptionKey information -/* Number of elements for field AESEncryptionKey */ -#define PIPXTREMEMODEMSETTINGS_AESENCRYPTIONKEY_NUMELEM 16 -// Field PairedSerialNumberCRC information +// Field RF_Bandwidth information +/* Enumeration options for field RF_Bandwidth */ +typedef enum { PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_500=0, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_1000=1, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_2000=2, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_4000=3, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_8000=4, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_9600=5, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_16000=6, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_19200=7, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_24000=8, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_32000=9, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_64000=10, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_128000=11, PIPXTREMEMODEMSETTINGS_RF_BANDWIDTH_192000=12 } PipXtremeModemSettingsRF_BandwidthOptions; +// Field Max_Tx_Power information +/* Enumeration options for field Max_Tx_Power */ +typedef enum { PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_1=0, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_2=1, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_5=2, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_8=3, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_11=4, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_14=5, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_17=6, PIPXTREMEMODEMSETTINGS_MAX_TX_POWER_20=7 } PipXtremeModemSettingsMax_Tx_PowerOptions; +// Field AES_Encryption information +/* Enumeration options for field AES_Encryption */ +typedef enum { PIPXTREMEMODEMSETTINGS_AES_ENCRYPTION_FALSE=0, PIPXTREMEMODEMSETTINGS_AES_ENCRYPTION_TRUE=1 } PipXtremeModemSettingsAES_EncryptionOptions; +// Field AES_EncryptionKey information +/* Number of elements for field AES_EncryptionKey */ +#define PIPXTREMEMODEMSETTINGS_AES_ENCRYPTIONKEY_NUMELEM 16 +// Field Paired_Serial_Number_CRC information // Generic interface functions diff --git a/flight/OpenPilot/UAVObjects/inc/pipxtrememodemstatus.h b/flight/OpenPilot/UAVObjects/inc/pipxtrememodemstatus.h index 69d8ce6c3..fd718ac20 100644 --- a/flight/OpenPilot/UAVObjects/inc/pipxtrememodemstatus.h +++ b/flight/OpenPilot/UAVObjects/inc/pipxtrememodemstatus.h @@ -41,7 +41,7 @@ #define PIPXTREMEMODEMSTATUS_H // Object constants -#define PIPXTREMEMODEMSTATUS_OBJID 2584820952U +#define PIPXTREMEMODEMSTATUS_OBJID 3920019084U #define PIPXTREMEMODEMSTATUS_NAME "PipXtremeModemStatus" #define PIPXTREMEMODEMSTATUS_METANAME "PipXtremeModemStatusMeta" #define PIPXTREMEMODEMSTATUS_ISSINGLEINST 1 @@ -71,34 +71,34 @@ // Object data typedef struct { - uint8_t SerialNumber[24]; - uint32_t SerialNumberCRC; - uint32_t UpTime; + uint8_t Serial_Number[24]; + uint32_t Serial_Number_CRC; + uint32_t Up_Time; uint32_t Frequency; - uint32_t RFBandwidth; - int8_t TxPower; + uint32_t RF_Bandwidth; + int8_t Tx_Power; uint8_t State; - uint16_t TxRetry; - uint32_t TxDataRate; - uint32_t RxDataRate; + uint16_t Tx_Retry; + uint32_t Tx_Data_Rate; + uint32_t Rx_Data_Rate; } __attribute__((packed)) PipXtremeModemStatusData; // Field information -// Field SerialNumber information -/* Number of elements for field SerialNumber */ -#define PIPXTREMEMODEMSTATUS_SERIALNUMBER_NUMELEM 24 -// Field SerialNumberCRC information -// Field UpTime information +// Field Serial_Number information +/* Number of elements for field Serial_Number */ +#define PIPXTREMEMODEMSTATUS_SERIAL_NUMBER_NUMELEM 24 +// Field Serial_Number_CRC information +// Field Up_Time information // Field Frequency information -// Field RFBandwidth information -// Field TxPower information +// Field RF_Bandwidth information +// Field Tx_Power information // Field State information /* Enumeration options for field State */ typedef enum { PIPXTREMEMODEMSTATUS_STATE_DISCONNECTED=0, PIPXTREMEMODEMSTATUS_STATE_CONNECTING=1, PIPXTREMEMODEMSTATUS_STATE_CONNECTED=2, PIPXTREMEMODEMSTATUS_STATE_NOTREADY=3 } PipXtremeModemStatusStateOptions; -// Field TxRetry information -// Field TxDataRate information -// Field RxDataRate information +// Field Tx_Retry information +// Field Tx_Data_Rate information +// Field Rx_Data_Rate information // Generic interface functions diff --git a/flight/OpenPilot/UAVObjects/pipxtrememodemsettings.c b/flight/OpenPilot/UAVObjects/pipxtrememodemsettings.c index bd5de2af6..7c8ebc717 100644 --- a/flight/OpenPilot/UAVObjects/pipxtrememodemsettings.c +++ b/flight/OpenPilot/UAVObjects/pipxtrememodemsettings.c @@ -80,30 +80,30 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId) // Initialize object fields to their default values UAVObjGetInstanceData(obj, instId, &data); memset(&data, 0, sizeof(PipXtremeModemSettingsData)); - data.Frequency calibration = 127; - data.Frequency min = 0; - data.Frequency max = 0; + data.Frequency_Calibration = 127; + data.Frequency_Min = 0; + data.Frequency_Max = 0; data.Frequency = 0; - data.RF bandwidth = 11; - data.Max Tx power = 4; - data.AESEncryption = 0; - data.AESEncryptionKey[0] = 0; - data.AESEncryptionKey[1] = 0; - data.AESEncryptionKey[2] = 0; - data.AESEncryptionKey[3] = 0; - data.AESEncryptionKey[4] = 0; - data.AESEncryptionKey[5] = 0; - data.AESEncryptionKey[6] = 0; - data.AESEncryptionKey[7] = 0; - data.AESEncryptionKey[8] = 0; - data.AESEncryptionKey[9] = 0; - data.AESEncryptionKey[10] = 0; - data.AESEncryptionKey[11] = 0; - data.AESEncryptionKey[12] = 0; - data.AESEncryptionKey[13] = 0; - data.AESEncryptionKey[14] = 0; - data.AESEncryptionKey[15] = 0; - data.PairedSerialNumberCRC = 0; + data.RF_Bandwidth = 11; + data.Max_Tx_Power = 4; + data.AES_Encryption = 0; + data.AES_EncryptionKey[0] = 0; + data.AES_EncryptionKey[1] = 0; + data.AES_EncryptionKey[2] = 0; + data.AES_EncryptionKey[3] = 0; + data.AES_EncryptionKey[4] = 0; + data.AES_EncryptionKey[5] = 0; + data.AES_EncryptionKey[6] = 0; + data.AES_EncryptionKey[7] = 0; + data.AES_EncryptionKey[8] = 0; + data.AES_EncryptionKey[9] = 0; + data.AES_EncryptionKey[10] = 0; + data.AES_EncryptionKey[11] = 0; + data.AES_EncryptionKey[12] = 0; + data.AES_EncryptionKey[13] = 0; + data.AES_EncryptionKey[14] = 0; + data.AES_EncryptionKey[15] = 0; + data.Paired_Serial_Number_CRC = 0; UAVObjSetInstanceData(obj, instId, &data); diff --git a/flight/OpenPilot/UAVObjects/pipxtrememodemstatus.c b/flight/OpenPilot/UAVObjects/pipxtrememodemstatus.c index 9651a1c61..fed663b0f 100644 --- a/flight/OpenPilot/UAVObjects/pipxtrememodemstatus.c +++ b/flight/OpenPilot/UAVObjects/pipxtrememodemstatus.c @@ -80,31 +80,31 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId) // Initialize object fields to their default values UAVObjGetInstanceData(obj, instId, &data); memset(&data, 0, sizeof(PipXtremeModemStatusData)); - data.SerialNumber[0] = 0; - data.SerialNumber[1] = 0; - data.SerialNumber[2] = 0; - data.SerialNumber[3] = 0; - data.SerialNumber[4] = 0; - data.SerialNumber[5] = 0; - data.SerialNumber[6] = 0; - data.SerialNumber[7] = 0; - data.SerialNumber[8] = 0; - data.SerialNumber[9] = 0; - data.SerialNumber[10] = 0; - data.SerialNumber[11] = 0; - data.SerialNumber[12] = 0; - data.SerialNumber[13] = 0; - data.SerialNumber[14] = 0; - data.SerialNumber[15] = 0; - data.SerialNumber[16] = 0; - data.SerialNumber[17] = 0; - data.SerialNumber[18] = 0; - data.SerialNumber[19] = 0; - data.SerialNumber[20] = 0; - data.SerialNumber[21] = 0; - data.SerialNumber[22] = 0; - data.SerialNumber[23] = 0; - data.SerialNumberCRC = 0; + data.Serial_Number[0] = 0; + data.Serial_Number[1] = 0; + data.Serial_Number[2] = 0; + data.Serial_Number[3] = 0; + data.Serial_Number[4] = 0; + data.Serial_Number[5] = 0; + data.Serial_Number[6] = 0; + data.Serial_Number[7] = 0; + data.Serial_Number[8] = 0; + data.Serial_Number[9] = 0; + data.Serial_Number[10] = 0; + data.Serial_Number[11] = 0; + data.Serial_Number[12] = 0; + data.Serial_Number[13] = 0; + data.Serial_Number[14] = 0; + data.Serial_Number[15] = 0; + data.Serial_Number[16] = 0; + data.Serial_Number[17] = 0; + data.Serial_Number[18] = 0; + data.Serial_Number[19] = 0; + data.Serial_Number[20] = 0; + data.Serial_Number[21] = 0; + data.Serial_Number[22] = 0; + data.Serial_Number[23] = 0; + data.Serial_Number_CRC = 0; UAVObjSetInstanceData(obj, instId, &data);