2018 revision to classic DataBus AVC code.
Dependencies: LSM303DLM Servo SerialGraphicLCD L3G4200D IncrementalEncoder SimpleShell
Diff: SystemState.h
- Revision:
- 24:a7f92dfc5310
- Parent:
- 9:fc3575d2cbbf
- Child:
- 29:cb2f55fbfe9c
diff -r 5e61cf4a8c34 -r a7f92dfc5310 SystemState.h --- a/SystemState.h Tue Dec 18 17:09:38 2018 +0000 +++ b/SystemState.h Fri Dec 21 20:04:09 2018 +0000 @@ -1,8 +1,6 @@ #ifndef _SYSTEMSTATE_H #define _SYSTEMSTATE_H -#define SSBUF 32 // must be 2^n - /** System State is the main mechanism for communicating current realtime system state to * the rest of the system for logging, data display, etc. */ @@ -53,42 +51,17 @@ * throttle raw servo setting(units?) * steering raw servo setting(units?) */ + typedef struct { - unsigned int millis; - float current, voltage; - int g[3]; - float gyro[3]; - int gTemp; - int a[3]; - int m[3]; - float gHeading; - float cHeading; - //float roll, pitch, yaw; - double gpsLatitude; - double gpsLongitude; - float gpsCourse_deg; - float gpsSpeed_mps; - float gpsHDOP; - int gpsSats; - float lrEncDistance, rrEncDistance; - float lrEncSpeed, rrEncSpeed; - float encHeading; - float estHeading; - float estLagHeading; - double estLatitude, estLongitude; - //double estNorthing, estEasting; - float estX, estY; - unsigned short nextWaypoint; - float bearing; - float distance; - float gbias; - float errHeading; - float steerAngle; - float LABrg; - float LAx; - float LAy; -} SystemState; + double latitude; + double longitude; + float course; + float speed; + float hdop; + int svcount; +} GpsData; +#if 0 == 1 void state_clear( SystemState *s ); bool fifo_init(void); void fifo_reset(void); @@ -99,5 +72,6 @@ SystemState *fifo_pull(void); int fifo_getInState(void); int fifo_getOutState(void); +#endif #endif