uint8_t again but 5+3 and 8

This commit is contained in:
bsongis
2012-05-03 15:05:28 +00:00
parent 9d2e875501
commit 8188c48d5b
2 changed files with 7 additions and 5 deletions
+4 -2
View File
@@ -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)) {
+3 -3
View File
@@ -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;