mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
Flight/UAVObjects Modify update rate and acked flag of periodic objects, added new gpsobject fields
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@684 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
30a127ebad
commit
c22804e90a
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
|
@ -84,7 +84,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
metadata.telemetryUpdatePeriod = 0;
|
metadata.telemetryUpdatePeriod = 0;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 1;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 200;
|
metadata.gcsTelemetryUpdatePeriod = 500;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
metadata.loggingUpdatePeriod = 0;
|
metadata.loggingUpdatePeriod = 0;
|
||||||
UAVObjSetMetadata(obj, &metadata);
|
UAVObjSetMetadata(obj, &metadata);
|
||||||
|
@ -81,7 +81,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 1;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 100;
|
metadata.telemetryUpdatePeriod = 500;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 1;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_ONCHANGE;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_ONCHANGE;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.loggingUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#define GPSOBJECT_H
|
#define GPSOBJECT_H
|
||||||
|
|
||||||
// Object constants
|
// Object constants
|
||||||
#define GPSOBJECT_OBJID 2363300180U
|
#define GPSOBJECT_OBJID 3887395742U
|
||||||
#define GPSOBJECT_NAME "GpsObject"
|
#define GPSOBJECT_NAME "GpsObject"
|
||||||
#define GPSOBJECT_METANAME "GpsObjectMeta"
|
#define GPSOBJECT_METANAME "GpsObjectMeta"
|
||||||
#define GPSOBJECT_ISSINGLEINST 1
|
#define GPSOBJECT_ISSINGLEINST 1
|
||||||
@ -60,6 +60,8 @@ typedef struct {
|
|||||||
float Latitude;
|
float Latitude;
|
||||||
float Longitude;
|
float Longitude;
|
||||||
float Altitude;
|
float Altitude;
|
||||||
|
float Heading;
|
||||||
|
float GroundSpeed;
|
||||||
int8_t Satellites;
|
int8_t Satellites;
|
||||||
uint16_t Updates;
|
uint16_t Updates;
|
||||||
uint16_t Failures;
|
uint16_t Failures;
|
||||||
@ -73,6 +75,8 @@ typedef struct {
|
|||||||
// Field Latitude information
|
// Field Latitude information
|
||||||
// Field Longitude information
|
// Field Longitude information
|
||||||
// Field Altitude information
|
// Field Altitude information
|
||||||
|
// Field Heading information
|
||||||
|
// Field GroundSpeed information
|
||||||
// Field Satellites information
|
// Field Satellites information
|
||||||
// Field Updates information
|
// Field Updates information
|
||||||
// Field Failures information
|
// Field Failures information
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 3000;
|
metadata.telemetryUpdatePeriod = 2000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
metadata.loggingUpdateMode = UPDATEMODE_NEVER;
|
||||||
|
@ -79,10 +79,10 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
|
|||||||
// Initialize object metadata to their default values
|
// Initialize object metadata to their default values
|
||||||
metadata.access = ACCESS_READWRITE;
|
metadata.access = ACCESS_READWRITE;
|
||||||
metadata.gcsAccess = ACCESS_READWRITE;
|
metadata.gcsAccess = ACCESS_READWRITE;
|
||||||
metadata.telemetryAcked = 1;
|
metadata.telemetryAcked = 0;
|
||||||
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.telemetryUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
metadata.telemetryUpdatePeriod = 1000;
|
metadata.telemetryUpdatePeriod = 1000;
|
||||||
metadata.gcsTelemetryAcked = 1;
|
metadata.gcsTelemetryAcked = 0;
|
||||||
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
metadata.gcsTelemetryUpdateMode = UPDATEMODE_MANUAL;
|
||||||
metadata.gcsTelemetryUpdatePeriod = 0;
|
metadata.gcsTelemetryUpdatePeriod = 0;
|
||||||
metadata.loggingUpdateMode = UPDATEMODE_PERIODIC;
|
metadata.loggingUpdateMode = UPDATEMODE_PERIODIC;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user