From 79fd273755e556f27f872d7301bb6592f58ec29d Mon Sep 17 00:00:00 2001
From: "mhotar@gmail.com"
 <mhotar@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 2 Jul 2012 20:41:01 +0000
Subject: [PATCH] constant changed to X*FW

---
 src/model_menus.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 967d570d7..c51a540a8 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -821,9 +821,9 @@ static uint8_t s_currIdx;
 #ifdef FLIGHT_PHASES
 
 #if defined(TRANSLATIONS_CZ)
-#define PHASES_EDIT_2ND_COLUMN 12
+#define PHASES_EDIT_2ND_COLUMN 12*FW
 #else
-#define PHASES_EDIT_2ND_COLUMN 10
+#define PHASES_EDIT_2ND_COLUMN 10*FW
 #endif
 
 void menuProcPhaseOne(uint8_t event)
@@ -843,17 +843,17 @@ void menuProcPhaseOne(uint8_t event)
     switch(i) {
       case 0:
         lcd_putsLeft( y, STR_NAME);
-        EditName(PHASES_EDIT_2ND_COLUMN*FW, y, phase->name, sizeof(phase->name), event, attr, m_posHorz);
+        EditName(PHASES_EDIT_2ND_COLUMN, y, phase->name, sizeof(phase->name), event, attr, m_posHorz);
         break;
       case 1:
         lcd_putsLeft( y, STR_SWITCH);
-        putsSwitches(PHASES_EDIT_2ND_COLUMN*FW,  y, phase->swtch, attr);
+        putsSwitches(PHASES_EDIT_2ND_COLUMN,  y, phase->swtch, attr);
         if (attr) CHECK_INCDEC_MODELSWITCH(event, phase->swtch, -MAX_DRSWITCH, MAX_DRSWITCH);
         break;
       case 2:
         lcd_putsLeft( y, STR_TRIMS);
         for (uint8_t t=0; t<NUM_STICKS; t++) {
-          putsTrimMode((PHASES_EDIT_2ND_COLUMN+t)*FW, y, s_currIdx, t, (attr && m_posHorz==t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
+          putsTrimMode(PHASES_EDIT_2ND_COLUMN+(t*FW), y, s_currIdx, t, (attr && m_posHorz==t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
           if (attr && m_posHorz==t && ((s_editMode>0) || p1valdiff)) {
             int16_t v = getRawTrimValue(s_currIdx, t);
             if (v < TRIM_EXTENDED_MAX) v = TRIM_EXTENDED_MAX;
@@ -866,7 +866,7 @@ void menuProcPhaseOne(uint8_t event)
         }
 #if defined(PCBV4)
         for (uint8_t t=0; t<NUM_ROTARY_ENCODERS; t++) {
-          putsRotaryEncoderMode((PHASES_EDIT_2ND_COLUMN+4+t)*FW+2, y, s_currIdx, t, (attr && m_posHorz==4+t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
+          putsRotaryEncoderMode(PHASES_EDIT_2ND_COLUMN+((4+t)*FW)+2, y, s_currIdx, t, (attr && m_posHorz==4+t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
           if (attr && m_posHorz==4+t && ((s_editMode>0) || p1valdiff)) {
 #if defined(EXTRA_ROTARY_ENCODERS)
             int16_t v;
@@ -896,12 +896,12 @@ void menuProcPhaseOne(uint8_t event)
         break;
       case 3:
         lcd_putsLeft( y, STR_FADEIN);
-        lcd_outdezAtt((PHASES_EDIT_2ND_COLUMN*FW), y, phase->fadeIn*5, attr|PREC1|LEFT);
+        lcd_outdezAtt(PHASES_EDIT_2ND_COLUMN, y, phase->fadeIn*5, attr|PREC1|LEFT);
         if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeIn, 0, 15);
         break;
       case 4:
         lcd_putsLeft( y, STR_FADEOUT);
-        lcd_outdezAtt((PHASES_EDIT_2ND_COLUMN*FW), y, phase->fadeOut*5, attr|PREC1|LEFT);
+        lcd_outdezAtt(PHASES_EDIT_2ND_COLUMN, y, phase->fadeOut*5, attr|PREC1|LEFT);
         if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeOut, 0, 15);
         break;
     }