1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

Updated UAVObjects

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2225 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-12-12 18:26:26 +00:00 committed by pip
parent d5f6504aa2
commit ed6b02fec2
6 changed files with 222 additions and 222 deletions

View File

@ -42,74 +42,74 @@ PipXtremeModemSettings::PipXtremeModemSettings(): UAVDataObject(OBJID, ISSINGLEI
{
// Create fields
QList<UAVObjectField*> fields;
QStringList Frequency calibrationElemNames;
Frequency calibrationElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency calibration"), QString(""), UAVObjectField::UINT8, Frequency calibrationElemNames, QStringList()) );
QStringList Frequency minElemNames;
Frequency minElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency min"), QString("Hz"), UAVObjectField::UINT32, Frequency minElemNames, QStringList()) );
QStringList Frequency maxElemNames;
Frequency maxElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency max"), QString("Hz"), UAVObjectField::UINT32, Frequency maxElemNames, QStringList()) );
QStringList Frequency_CalibrationElemNames;
Frequency_CalibrationElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency_Calibration"), QString(""), UAVObjectField::UINT8, Frequency_CalibrationElemNames, QStringList()) );
QStringList Frequency_MinElemNames;
Frequency_MinElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency_Min"), QString("Hz"), UAVObjectField::UINT32, Frequency_MinElemNames, QStringList()) );
QStringList Frequency_MaxElemNames;
Frequency_MaxElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency_Max"), QString("Hz"), UAVObjectField::UINT32, Frequency_MaxElemNames, QStringList()) );
QStringList FrequencyElemNames;
FrequencyElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency"), QString("Hz"), UAVObjectField::UINT32, FrequencyElemNames, QStringList()) );
QStringList RF bandwidthElemNames;
RF bandwidthElemNames.append("0");
QStringList RF bandwidthEnumOptions;
RF bandwidthEnumOptions.append("500");
RF bandwidthEnumOptions.append("1000");
RF bandwidthEnumOptions.append("2000");
RF bandwidthEnumOptions.append("4000");
RF bandwidthEnumOptions.append("8000");
RF bandwidthEnumOptions.append("9600");
RF bandwidthEnumOptions.append("16000");
RF bandwidthEnumOptions.append("19200");
RF bandwidthEnumOptions.append("24000");
RF bandwidthEnumOptions.append("32000");
RF bandwidthEnumOptions.append("64000");
RF bandwidthEnumOptions.append("128000");
RF bandwidthEnumOptions.append("192000");
fields.append( new UAVObjectField(QString("RF bandwidth"), QString("Hz"), UAVObjectField::ENUM, RF bandwidthElemNames, RF bandwidthEnumOptions) );
QStringList Max Tx powerElemNames;
Max Tx powerElemNames.append("0");
QStringList Max Tx powerEnumOptions;
Max Tx powerEnumOptions.append("1");
Max Tx powerEnumOptions.append("2");
Max Tx powerEnumOptions.append("5");
Max Tx powerEnumOptions.append("8");
Max Tx powerEnumOptions.append("11");
Max Tx powerEnumOptions.append("14");
Max Tx powerEnumOptions.append("17");
Max Tx powerEnumOptions.append("20");
fields.append( new UAVObjectField(QString("Max Tx power"), QString("dBm"), UAVObjectField::ENUM, Max Tx powerElemNames, Max Tx powerEnumOptions) );
QStringList AESEncryptionElemNames;
AESEncryptionElemNames.append("0");
QStringList AESEncryptionEnumOptions;
AESEncryptionEnumOptions.append("False");
AESEncryptionEnumOptions.append("True");
fields.append( new UAVObjectField(QString("AESEncryption"), QString(""), UAVObjectField::ENUM, AESEncryptionElemNames, AESEncryptionEnumOptions) );
QStringList AESEncryptionKeyElemNames;
AESEncryptionKeyElemNames.append("0");
AESEncryptionKeyElemNames.append("1");
AESEncryptionKeyElemNames.append("2");
AESEncryptionKeyElemNames.append("3");
AESEncryptionKeyElemNames.append("4");
AESEncryptionKeyElemNames.append("5");
AESEncryptionKeyElemNames.append("6");
AESEncryptionKeyElemNames.append("7");
AESEncryptionKeyElemNames.append("8");
AESEncryptionKeyElemNames.append("9");
AESEncryptionKeyElemNames.append("10");
AESEncryptionKeyElemNames.append("11");
AESEncryptionKeyElemNames.append("12");
AESEncryptionKeyElemNames.append("13");
AESEncryptionKeyElemNames.append("14");
AESEncryptionKeyElemNames.append("15");
fields.append( new UAVObjectField(QString("AESEncryptionKey"), QString(""), UAVObjectField::UINT8, AESEncryptionKeyElemNames, QStringList()) );
QStringList PairedSerialNumberCRCElemNames;
PairedSerialNumberCRCElemNames.append("0");
fields.append( new UAVObjectField(QString("PairedSerialNumberCRC"), QString(""), UAVObjectField::UINT32, PairedSerialNumberCRCElemNames, QStringList()) );
QStringList RF_BandwidthElemNames;
RF_BandwidthElemNames.append("0");
QStringList RF_BandwidthEnumOptions;
RF_BandwidthEnumOptions.append("500");
RF_BandwidthEnumOptions.append("1000");
RF_BandwidthEnumOptions.append("2000");
RF_BandwidthEnumOptions.append("4000");
RF_BandwidthEnumOptions.append("8000");
RF_BandwidthEnumOptions.append("9600");
RF_BandwidthEnumOptions.append("16000");
RF_BandwidthEnumOptions.append("19200");
RF_BandwidthEnumOptions.append("24000");
RF_BandwidthEnumOptions.append("32000");
RF_BandwidthEnumOptions.append("64000");
RF_BandwidthEnumOptions.append("128000");
RF_BandwidthEnumOptions.append("192000");
fields.append( new UAVObjectField(QString("RF_Bandwidth"), QString("Hz"), UAVObjectField::ENUM, RF_BandwidthElemNames, RF_BandwidthEnumOptions) );
QStringList Max_Tx_PowerElemNames;
Max_Tx_PowerElemNames.append("0");
QStringList Max_Tx_PowerEnumOptions;
Max_Tx_PowerEnumOptions.append("1");
Max_Tx_PowerEnumOptions.append("2");
Max_Tx_PowerEnumOptions.append("5");
Max_Tx_PowerEnumOptions.append("8");
Max_Tx_PowerEnumOptions.append("11");
Max_Tx_PowerEnumOptions.append("14");
Max_Tx_PowerEnumOptions.append("17");
Max_Tx_PowerEnumOptions.append("20");
fields.append( new UAVObjectField(QString("Max_Tx_Power"), QString("dBm"), UAVObjectField::ENUM, Max_Tx_PowerElemNames, Max_Tx_PowerEnumOptions) );
QStringList AES_EncryptionElemNames;
AES_EncryptionElemNames.append("0");
QStringList AES_EncryptionEnumOptions;
AES_EncryptionEnumOptions.append("False");
AES_EncryptionEnumOptions.append("True");
fields.append( new UAVObjectField(QString("AES_Encryption"), QString(""), UAVObjectField::ENUM, AES_EncryptionElemNames, AES_EncryptionEnumOptions) );
QStringList AES_EncryptionKeyElemNames;
AES_EncryptionKeyElemNames.append("0");
AES_EncryptionKeyElemNames.append("1");
AES_EncryptionKeyElemNames.append("2");
AES_EncryptionKeyElemNames.append("3");
AES_EncryptionKeyElemNames.append("4");
AES_EncryptionKeyElemNames.append("5");
AES_EncryptionKeyElemNames.append("6");
AES_EncryptionKeyElemNames.append("7");
AES_EncryptionKeyElemNames.append("8");
AES_EncryptionKeyElemNames.append("9");
AES_EncryptionKeyElemNames.append("10");
AES_EncryptionKeyElemNames.append("11");
AES_EncryptionKeyElemNames.append("12");
AES_EncryptionKeyElemNames.append("13");
AES_EncryptionKeyElemNames.append("14");
AES_EncryptionKeyElemNames.append("15");
fields.append( new UAVObjectField(QString("AES_EncryptionKey"), QString(""), UAVObjectField::UINT8, AES_EncryptionKeyElemNames, QStringList()) );
QStringList Paired_Serial_Number_CRCElemNames;
Paired_Serial_Number_CRCElemNames.append("0");
fields.append( new UAVObjectField(QString("Paired_Serial_Number_CRC"), QString(""), UAVObjectField::UINT32, Paired_Serial_Number_CRCElemNames, QStringList()) );
// Initialize object
initializeFields(fields, (quint8*)&data, NUMBYTES);
@ -143,30 +143,30 @@ UAVObject::Metadata PipXtremeModemSettings::getDefaultMetadata()
*/
void PipXtremeModemSettings::setDefaultFieldValues()
{
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;
}

View File

@ -43,40 +43,40 @@ class UAVOBJECTS_EXPORT PipXtremeModemSettings: public UAVDataObject
public:
// Field structure
typedef struct {
quint8 Frequency calibration;
quint32 Frequency min;
quint32 Frequency max;
quint8 Frequency_Calibration;
quint32 Frequency_Min;
quint32 Frequency_Max;
quint32 Frequency;
quint8 RF bandwidth;
quint8 Max Tx power;
quint8 AESEncryption;
quint8 AESEncryptionKey[16];
quint32 PairedSerialNumberCRC;
quint8 RF_Bandwidth;
quint8 Max_Tx_Power;
quint8 AES_Encryption;
quint8 AES_EncryptionKey[16];
quint32 Paired_Serial_Number_CRC;
} __attribute__((packed)) DataFields;
// 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 { RF BANDWIDTH_500=0, RF BANDWIDTH_1000=1, RF BANDWIDTH_2000=2, RF BANDWIDTH_4000=3, RF BANDWIDTH_8000=4, RF BANDWIDTH_9600=5, RF BANDWIDTH_16000=6, RF BANDWIDTH_19200=7, RF BANDWIDTH_24000=8, RF BANDWIDTH_32000=9, RF BANDWIDTH_64000=10, RF BANDWIDTH_128000=11, RF BANDWIDTH_192000=12 } RF bandwidthOptions;
// Field Max Tx power information
/* Enumeration options for field Max Tx power */
typedef enum { MAX TX POWER_1=0, MAX TX POWER_2=1, MAX TX POWER_5=2, MAX TX POWER_8=3, MAX TX POWER_11=4, MAX TX POWER_14=5, MAX TX POWER_17=6, MAX TX POWER_20=7 } Max Tx powerOptions;
// Field AESEncryption information
/* Enumeration options for field AESEncryption */
typedef enum { AESENCRYPTION_FALSE=0, AESENCRYPTION_TRUE=1 } AESEncryptionOptions;
// Field AESEncryptionKey information
/* Number of elements for field AESEncryptionKey */
static const quint32 AESENCRYPTIONKEY_NUMELEM = 16;
// Field PairedSerialNumberCRC information
// Field RF_Bandwidth information
/* Enumeration options for field RF_Bandwidth */
typedef enum { RF_BANDWIDTH_500=0, RF_BANDWIDTH_1000=1, RF_BANDWIDTH_2000=2, RF_BANDWIDTH_4000=3, RF_BANDWIDTH_8000=4, RF_BANDWIDTH_9600=5, RF_BANDWIDTH_16000=6, RF_BANDWIDTH_19200=7, RF_BANDWIDTH_24000=8, RF_BANDWIDTH_32000=9, RF_BANDWIDTH_64000=10, RF_BANDWIDTH_128000=11, RF_BANDWIDTH_192000=12 } RF_BandwidthOptions;
// Field Max_Tx_Power information
/* Enumeration options for field Max_Tx_Power */
typedef enum { MAX_TX_POWER_1=0, MAX_TX_POWER_2=1, MAX_TX_POWER_5=2, MAX_TX_POWER_8=3, MAX_TX_POWER_11=4, MAX_TX_POWER_14=5, MAX_TX_POWER_17=6, MAX_TX_POWER_20=7 } Max_Tx_PowerOptions;
// Field AES_Encryption information
/* Enumeration options for field AES_Encryption */
typedef enum { AES_ENCRYPTION_FALSE=0, AES_ENCRYPTION_TRUE=1 } AES_EncryptionOptions;
// Field AES_EncryptionKey information
/* Number of elements for field AES_EncryptionKey */
static const quint32 AES_ENCRYPTIONKEY_NUMELEM = 16;
// Field Paired_Serial_Number_CRC information
// Constants
static const quint32 OBJID = 3841416984U;
static const quint32 OBJID = 2660664364U;
static const QString NAME;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;

View File

@ -38,7 +38,7 @@ from collections import namedtuple
# This is a list of instances of the data fields contained in this object
_fields = [ \
uavobject.UAVObjectField(
'Frequency calibration',
'Frequency_Calibration',
'B',
1,
[
@ -48,7 +48,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'Frequency min',
'Frequency_Min',
'I',
1,
[
@ -58,7 +58,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'Frequency max',
'Frequency_Max',
'I',
1,
[
@ -78,7 +78,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'RF bandwidth',
'RF_Bandwidth',
'b',
1,
[
@ -101,7 +101,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'Max Tx power',
'Max_Tx_Power',
'b',
1,
[
@ -119,7 +119,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'AESEncryption',
'AES_Encryption',
'b',
1,
[
@ -131,7 +131,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'AESEncryptionKey',
'AES_EncryptionKey',
'B',
16,
[
@ -156,7 +156,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'PairedSerialNumberCRC',
'Paired_Serial_Number_CRC',
'I',
1,
[
@ -170,7 +170,7 @@ _fields = [ \
class PipXtremeModemSettings(uavobject.UAVObject):
## Object constants
OBJID = 3841416984
OBJID = 2660664364
NAME = "PipXtremeModemSettings"
METANAME = "PipXtremeModemSettingsMeta"
ISSINGLEINST = 1

View File

@ -42,47 +42,47 @@ PipXtremeModemStatus::PipXtremeModemStatus(): UAVDataObject(OBJID, ISSINGLEINST,
{
// Create fields
QList<UAVObjectField*> fields;
QStringList SerialNumberElemNames;
SerialNumberElemNames.append("0");
SerialNumberElemNames.append("1");
SerialNumberElemNames.append("2");
SerialNumberElemNames.append("3");
SerialNumberElemNames.append("4");
SerialNumberElemNames.append("5");
SerialNumberElemNames.append("6");
SerialNumberElemNames.append("7");
SerialNumberElemNames.append("8");
SerialNumberElemNames.append("9");
SerialNumberElemNames.append("10");
SerialNumberElemNames.append("11");
SerialNumberElemNames.append("12");
SerialNumberElemNames.append("13");
SerialNumberElemNames.append("14");
SerialNumberElemNames.append("15");
SerialNumberElemNames.append("16");
SerialNumberElemNames.append("17");
SerialNumberElemNames.append("18");
SerialNumberElemNames.append("19");
SerialNumberElemNames.append("20");
SerialNumberElemNames.append("21");
SerialNumberElemNames.append("22");
SerialNumberElemNames.append("23");
fields.append( new UAVObjectField(QString("SerialNumber"), QString(""), UAVObjectField::UINT8, SerialNumberElemNames, QStringList()) );
QStringList SerialNumberCRCElemNames;
SerialNumberCRCElemNames.append("0");
fields.append( new UAVObjectField(QString("SerialNumberCRC"), QString(""), UAVObjectField::UINT32, SerialNumberCRCElemNames, QStringList()) );
QStringList UpTimeElemNames;
UpTimeElemNames.append("0");
fields.append( new UAVObjectField(QString("UpTime"), QString("ms"), UAVObjectField::UINT32, UpTimeElemNames, QStringList()) );
QStringList Serial_NumberElemNames;
Serial_NumberElemNames.append("0");
Serial_NumberElemNames.append("1");
Serial_NumberElemNames.append("2");
Serial_NumberElemNames.append("3");
Serial_NumberElemNames.append("4");
Serial_NumberElemNames.append("5");
Serial_NumberElemNames.append("6");
Serial_NumberElemNames.append("7");
Serial_NumberElemNames.append("8");
Serial_NumberElemNames.append("9");
Serial_NumberElemNames.append("10");
Serial_NumberElemNames.append("11");
Serial_NumberElemNames.append("12");
Serial_NumberElemNames.append("13");
Serial_NumberElemNames.append("14");
Serial_NumberElemNames.append("15");
Serial_NumberElemNames.append("16");
Serial_NumberElemNames.append("17");
Serial_NumberElemNames.append("18");
Serial_NumberElemNames.append("19");
Serial_NumberElemNames.append("20");
Serial_NumberElemNames.append("21");
Serial_NumberElemNames.append("22");
Serial_NumberElemNames.append("23");
fields.append( new UAVObjectField(QString("Serial_Number"), QString(""), UAVObjectField::UINT8, Serial_NumberElemNames, QStringList()) );
QStringList Serial_Number_CRCElemNames;
Serial_Number_CRCElemNames.append("0");
fields.append( new UAVObjectField(QString("Serial_Number_CRC"), QString(""), UAVObjectField::UINT32, Serial_Number_CRCElemNames, QStringList()) );
QStringList Up_TimeElemNames;
Up_TimeElemNames.append("0");
fields.append( new UAVObjectField(QString("Up_Time"), QString("ms"), UAVObjectField::UINT32, Up_TimeElemNames, QStringList()) );
QStringList FrequencyElemNames;
FrequencyElemNames.append("0");
fields.append( new UAVObjectField(QString("Frequency"), QString("Hz"), UAVObjectField::UINT32, FrequencyElemNames, QStringList()) );
QStringList RFBandwidthElemNames;
RFBandwidthElemNames.append("0");
fields.append( new UAVObjectField(QString("RFBandwidth"), QString("Hz"), UAVObjectField::UINT32, RFBandwidthElemNames, QStringList()) );
QStringList TxPowerElemNames;
TxPowerElemNames.append("0");
fields.append( new UAVObjectField(QString("TxPower"), QString("dBm"), UAVObjectField::INT8, TxPowerElemNames, QStringList()) );
QStringList RF_BandwidthElemNames;
RF_BandwidthElemNames.append("0");
fields.append( new UAVObjectField(QString("RF_Bandwidth"), QString("Hz"), UAVObjectField::UINT32, RF_BandwidthElemNames, QStringList()) );
QStringList Tx_PowerElemNames;
Tx_PowerElemNames.append("0");
fields.append( new UAVObjectField(QString("Tx_Power"), QString("dBm"), UAVObjectField::INT8, Tx_PowerElemNames, QStringList()) );
QStringList StateElemNames;
StateElemNames.append("0");
QStringList StateEnumOptions;
@ -91,15 +91,15 @@ PipXtremeModemStatus::PipXtremeModemStatus(): UAVDataObject(OBJID, ISSINGLEINST,
StateEnumOptions.append("Connected");
StateEnumOptions.append("NotReady");
fields.append( new UAVObjectField(QString("State"), QString(""), UAVObjectField::ENUM, StateElemNames, StateEnumOptions) );
QStringList TxRetryElemNames;
TxRetryElemNames.append("0");
fields.append( new UAVObjectField(QString("TxRetry"), QString(""), UAVObjectField::UINT16, TxRetryElemNames, QStringList()) );
QStringList TxDataRateElemNames;
TxDataRateElemNames.append("0");
fields.append( new UAVObjectField(QString("TxDataRate"), QString("bytes/sec"), UAVObjectField::UINT32, TxDataRateElemNames, QStringList()) );
QStringList RxDataRateElemNames;
RxDataRateElemNames.append("0");
fields.append( new UAVObjectField(QString("RxDataRate"), QString("bytes/sec"), UAVObjectField::UINT32, RxDataRateElemNames, QStringList()) );
QStringList Tx_RetryElemNames;
Tx_RetryElemNames.append("0");
fields.append( new UAVObjectField(QString("Tx_Retry"), QString(""), UAVObjectField::UINT16, Tx_RetryElemNames, QStringList()) );
QStringList Tx_Data_RateElemNames;
Tx_Data_RateElemNames.append("0");
fields.append( new UAVObjectField(QString("Tx_Data_Rate"), QString("bytes/sec"), UAVObjectField::UINT32, Tx_Data_RateElemNames, QStringList()) );
QStringList Rx_Data_RateElemNames;
Rx_Data_RateElemNames.append("0");
fields.append( new UAVObjectField(QString("Rx_Data_Rate"), QString("bytes/sec"), UAVObjectField::UINT32, Rx_Data_RateElemNames, QStringList()) );
// Initialize object
initializeFields(fields, (quint8*)&data, NUMBYTES);
@ -133,31 +133,31 @@ UAVObject::Metadata PipXtremeModemStatus::getDefaultMetadata()
*/
void PipXtremeModemStatus::setDefaultFieldValues()
{
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;
}

View File

@ -43,38 +43,38 @@ class UAVOBJECTS_EXPORT PipXtremeModemStatus: public UAVDataObject
public:
// Field structure
typedef struct {
quint8 SerialNumber[24];
quint32 SerialNumberCRC;
quint32 UpTime;
quint8 Serial_Number[24];
quint32 Serial_Number_CRC;
quint32 Up_Time;
quint32 Frequency;
quint32 RFBandwidth;
qint8 TxPower;
quint32 RF_Bandwidth;
qint8 Tx_Power;
quint8 State;
quint16 TxRetry;
quint32 TxDataRate;
quint32 RxDataRate;
quint16 Tx_Retry;
quint32 Tx_Data_Rate;
quint32 Rx_Data_Rate;
} __attribute__((packed)) DataFields;
// Field information
// Field SerialNumber information
/* Number of elements for field SerialNumber */
static const quint32 SERIALNUMBER_NUMELEM = 24;
// Field SerialNumberCRC information
// Field UpTime information
// Field Serial_Number information
/* Number of elements for field Serial_Number */
static const quint32 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 { STATE_DISCONNECTED=0, STATE_CONNECTING=1, STATE_CONNECTED=2, STATE_NOTREADY=3 } StateOptions;
// Field TxRetry information
// Field TxDataRate information
// Field RxDataRate information
// Field Tx_Retry information
// Field Tx_Data_Rate information
// Field Rx_Data_Rate information
// Constants
static const quint32 OBJID = 2584820952U;
static const quint32 OBJID = 3920019084U;
static const QString NAME;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;

View File

@ -38,7 +38,7 @@ from collections import namedtuple
# This is a list of instances of the data fields contained in this object
_fields = [ \
uavobject.UAVObjectField(
'SerialNumber',
'Serial_Number',
'B',
24,
[
@ -71,7 +71,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'SerialNumberCRC',
'Serial_Number_CRC',
'I',
1,
[
@ -81,7 +81,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'UpTime',
'Up_Time',
'I',
1,
[
@ -101,7 +101,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'RFBandwidth',
'RF_Bandwidth',
'I',
1,
[
@ -111,7 +111,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'TxPower',
'Tx_Power',
'b',
1,
[
@ -135,7 +135,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'TxRetry',
'Tx_Retry',
'H',
1,
[
@ -145,7 +145,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'TxDataRate',
'Tx_Data_Rate',
'I',
1,
[
@ -155,7 +155,7 @@ _fields = [ \
}
),
uavobject.UAVObjectField(
'RxDataRate',
'Rx_Data_Rate',
'I',
1,
[
@ -169,7 +169,7 @@ _fields = [ \
class PipXtremeModemStatus(uavobject.UAVObject):
## Object constants
OBJID = 2584820952
OBJID = 3920019084
NAME = "PipXtremeModemStatus"
METANAME = "PipXtremeModemStatusMeta"
ISSINGLEINST = 1