Vario. Port from unstable branch. Part 1.

This commit is contained in:
bsongis
2012-04-27 15:36:17 +00:00
parent d39c35439a
commit a2ade445ac
9 changed files with 134 additions and 41 deletions
+15 -1
View File
@@ -290,7 +290,7 @@ enum Functions {
FUNC_PLAY_SOMO,
#endif
FUNC_RESET,
#if defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
#if defined(FRSKY)
FUNC_VARIO,
#endif
#ifdef SDCARD
@@ -374,6 +374,15 @@ enum TelemetrySource {
TELEM_STATUS_MAX = TELEM_GPS_TIME
};
enum VarioSource {
VARIO_SOURCE_NONE = 0,
VARIO_SOURCE_BARO,
VARIO_SOURCE_GPS,
VARIO_SOURCE_A1,
VARIO_SOURCE_A2,
VARIO_SOURCE_LAST
};
PACK(typedef struct t_FrSkyBarData {
uint16_t source:4;
uint16_t barMin:6; // minimum for bar display
@@ -556,6 +565,11 @@ PACK(typedef struct t_ModelData {
uint8_t frskyLines[4];
uint16_t frskyLinesXtra;
int8_t servoCenter[NUM_CHNOUT];
// TODO:temporary place, need to move to frskydata
uint8_t varioSource:4;
uint8_t varioSpeedUpMin:4; // if increment in 0.2m/s = 3.0m/s max
uint8_t varioSpeedDownMin;
}) ModelData;
extern EEGeneral g_eeGeneral;