Revert last 2 commits

This commit is contained in:
bsongis
2012-04-16 18:56:34 +00:00
parent 938e907322
commit a34652e99c
9 changed files with 75 additions and 178 deletions
+10 -10
View File
@@ -105,33 +105,33 @@ PACK(struct FrskyHubData {
int16_t accelZ; // 0x26 1/256th gram (-8g ~ +8g)
uint8_t gpsDistNeeded:1; // 1bits out of 16bits spare reused
int8_t gpsFix:2; // 2bits out of 16bits spare reused: -1=never fixed, 0=not fixed now, 1=fixed
uint8_t spare1:1; //
uint8_t spare1:1; //
uint8_t cellsCount:4; // 4bits out of 16bits spare reused
uint8_t minCellVolts; // 8bits out of 16bits spare reused
uint16_t current; // 0x28 Current
int32_t minAltitude_full; //4 bytes from varioQueue reused
int32_t maxAltitude_full; //4 bytes from varioQueue reused
int8_t dummy1[2];//varioQueue[10]; // circular-buffer 2
uint8_t queuePointer; // circular-buffer pointer 3
int8_t spare2;// 4
int16_t dummy2;//lastBaroAltitude; 6
int8_t varioQueue[10]; // circular-buffer
uint8_t queuePointer; // circular-buffer pointer
int8_t spare2;
int16_t lastBaroAltitude_bp;
int16_t varioSpeed;
/* next fields must keep this order! */
int32_t gpsAltitude_full;//4 bytes fro minAltitude and maxAltitude reused
int16_t minAltitude;
int16_t maxAltitude;
uint16_t maxRpm;
int16_t maxTemperature1;
int16_t maxTemperature2;
uint16_t maxGpsSpeed;
uint16_t maxGpsDistance;
/* end */
int32_t baroAltitude_full;// 4 bytes from varioAcc1 and varioAcc2 reused
int16_t varioAcc1;
int16_t varioAcc2;
uint16_t volts_bp; // 0x3A
uint16_t volts_ap; // 0x3B
// end of FrSky Hub data
uint16_t gpsDistance;
int16_t gpsAltitudeOffset;
uint8_t minCellMinVolts;
int32_t baroAltitudeQueue_full[5];//20
});
#elif defined(WS_HOW_HIGH)