rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Updated UAVObjects

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2224 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-12-12 18:16:24 +00:00 committed by pip
parent 6a44b0544b
commit d5f6504aa2
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flight/OpenPilot/UAVObjects/inc/pipxtrememodemsettings.h
View File

@ -41,7 +41,7 @@
#define PIPXTREMEMODEMSETTINGS_H
// Object constants
#define PIPXTREMEMODEMSETTINGS_OBJID 1441129524U
#define PIPXTREMEMODEMSETTINGS_OBJID 3841416984U
#define PIPXTREMEMODEMSETTINGS_NAME "PipXtremeModemSettings"
#define PIPXTREMEMODEMSETTINGS_METANAME "PipXtremeModemSettingsMeta"
#define PIPXTREMEMODEMSETTINGS_ISSINGLEINST 1
@ -71,9 +71,12 @@
// Object data
typedef struct {
uint8_t Frequency calibration;
uint32_t Frequency min;
uint32_t Frequency max;
uint32_t Frequency;
uint8_t RFBandwidth;
uint8_t MaxTxPower;
uint8_t RF bandwidth;
uint8_t Max Tx power;
uint8_t AESEncryption;
uint8_t AESEncryptionKey[16];
uint32_t PairedSerialNumberCRC;
@ -81,13 +84,16 @@ typedef struct {
} __attribute__((packed)) PipXtremeModemSettingsData;
// Field information
// Field Frequency calibration information
// Field Frequency min information
// Field Frequency max information
// Field Frequency information
// Field RFBandwidth information
/* Enumeration options for field RFBandwidth */
typedef enum { PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_500=0, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_1000=1, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_2000=2, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_4000=3, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_8000=4, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_9600=5, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_16000=6, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_19200=7, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_24000=8, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_32000=9, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_64000=10, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_128000=11, PIPXTREMEMODEMSETTINGS_RFBANDWIDTH_192000=12 } PipXtremeModemSettingsRFBandwidthOptions;
// Field MaxTxPower information
/* Enumeration options for field MaxTxPower */
typedef enum { PIPXTREMEMODEMSETTINGS_MAXTXPOWER_1=0, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_2=1, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_5=2, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_8=3, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_11=4, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_14=5, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_17=6, PIPXTREMEMODEMSETTINGS_MAXTXPOWER_20=7 } PipXtremeModemSettingsMaxTxPowerOptions;
// 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;

4
flight/OpenPilot/UAVObjects/inc/pipxtrememodemstatus.h
View File

@ -41,7 +41,7 @@
#define PIPXTREMEMODEMSTATUS_H
// Object constants
#define PIPXTREMEMODEMSTATUS_OBJID 1854119896U
#define PIPXTREMEMODEMSTATUS_OBJID 2584820952U
#define PIPXTREMEMODEMSTATUS_NAME "PipXtremeModemStatus"
#define PIPXTREMEMODEMSTATUS_METANAME "PipXtremeModemStatusMeta"
#define PIPXTREMEMODEMSTATUS_ISSINGLEINST 1
@ -78,6 +78,7 @@ typedef struct {
uint32_t RFBandwidth;
int8_t TxPower;
uint8_t State;
uint16_t TxRetry;
uint32_t TxDataRate;
uint32_t RxDataRate;
@ -95,6 +96,7 @@ typedef struct {
// 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

9
flight/OpenPilot/UAVObjects/pipxtrememodemsettings.c
View File

@ -80,9 +80,12 @@ 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 = 433920000;
data.RFBandwidth = 11;
data.MaxTxPower = 4;
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;

2
flight/OpenPilot/UAVObjects/pipxtrememodemstatus.c
View File

@ -113,7 +113,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
metadata.gcsAccess = ACCESS_READWRITE;
metadata.telemetryAcked = 0;
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
metadata.telemetryUpdatePeriod = 2000;
metadata.telemetryUpdatePeriod = 5000;
metadata.gcsTelemetryAcked = 0;
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
metadata.gcsTelemetryUpdatePeriod = 0;