From 8188c48d5be474f3c7db7afb08e03963df6a67d0 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 3 May 2012 15:05:28 +0000 Subject: [PATCH] uint8_t again but 5+3 and 8 --- src/model_menus.cpp | 6 ++++-- src/myeeprom.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/model_menus.cpp b/src/model_menus.cpp index f2167b42b..2393203a9 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -2331,8 +2331,10 @@ void menuProcTelemetry(uint8_t event) case ITEM_TELEMETRY_VARIO_SPEED: lcd_puts(4, y, STR_LIMIT); - if(!g_model.varioSpeedDownMin) lcd_putsAtt(TELEM_COL2, y, STR_OFF, ((attr && m_posHorz==0) ? blink : 0)); - else lcd_outdezAtt(TELEM_COL2, y, -VARIO_SPEED_LIMIT_MUL*(VARIO_SPEED_LIMIT_DOWN_OFF - g_model.varioSpeedDownMin), ((attr && m_posHorz==0) ? blink : 0)|PREC2|LEFT); + if (!g_model.varioSpeedDownMin) + lcd_putsAtt(TELEM_COL2, y, STR_OFF, ((attr && m_posHorz==0) ? blink : 0)); + else + lcd_outdezAtt(TELEM_COL2, y, -VARIO_SPEED_LIMIT_MUL*(VARIO_SPEED_LIMIT_DOWN_OFF - g_model.varioSpeedDownMin), ((attr && m_posHorz==0) ? blink : 0)|PREC2|LEFT); lcd_outdezAtt(TELEM_COL2+6*FW, y, VARIO_SPEED_LIMIT_MUL*g_model.varioSpeedUpMin, ((attr && m_posHorz==1) ? blink : 0)|PREC2|LEFT); if (attr && (s_editMode>0 || p1valdiff)) { diff --git a/src/myeeprom.h b/src/myeeprom.h index 1047eccff..0877e3e93 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -568,9 +568,9 @@ PACK(typedef struct t_ModelData { int8_t servoCenter[NUM_CHNOUT]; // TODO:temporary place, need to move to frskydata - uint16_t varioSource:4; - uint16_t varioSpeedUpMin:5; // if increment in 0.2m/s = 3.0m/s max - uint16_t varioSpeedDownMin:7; + uint8_t varioSource:3; + uint8_t varioSpeedUpMin:5; // if increment in 0.2m/s = 3.0m/s max + uint8_t varioSpeedDownMin; }) ModelData; extern EEGeneral g_eeGeneral;