From 8a62c195d290f1a1a58a42d0cc8a677d6aa961da Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 21 May 2012 18:46:42 +0000
Subject: [PATCH] In MODEL SETUP screen the 2nd column is shifted to the right
 by one char

---
 src/model_menus.cpp | 18 +++---------------
 src/open9x.h        | 12 ++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index e6eb47686..d35d453b8 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -565,19 +565,7 @@ enum menuProcModelItems {
   ITEM_MODEL_PROTOCOL_PARAMS
 };
 
-#if defined(DSM2)
-#define IS_DSM2_PROTOCOL(protocol) (protocol==PROTO_DSM2)
-#else
-#define IS_DSM2_PROTOCOL(protocol) (0)
-#endif
-
-#if defined(PXX)
-#define IS_PXX_PROTOCOL(protocol) (protocol==PROTO_PXX)
-#else
-#define IS_PXX_PROTOCOL(protocol) (0)
-#endif
-
-#define MODEL_PARAM_OFS (9*FW+2)
+#define MODEL_PARAM_OFS (10*FW+2)
 void menuProcModel(uint8_t event)
 {
   lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
@@ -777,9 +765,9 @@ void menuProcModel(uint8_t event)
           lcd_putsLeft( y, STR_PPMFRAME);
           lcd_puts(MODEL_PARAM_OFS+3*FW, y, STR_MS);
           lcd_outdezAtt(MODEL_PARAM_OFS, y, (int16_t)g_model.ppmFrameLength*5 + 225, ((attr && m_posHorz==0) ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0) | PREC1|LEFT);
-          lcd_puts(MODEL_PARAM_OFS+8*FW+2, y, PSTR("us"));
+          lcd_putc(MODEL_PARAM_OFS+8*FW+2, y, 'u');
           lcd_outdezAtt(MODEL_PARAM_OFS+8*FW+2, y, (g_model.ppmDelay*50)+300, ((attr && m_posHorz==1) ? blink : 0));
-          lcd_putcAtt(MODEL_PARAM_OFS+11*FW, y, g_model.pulsePol ? '-' : '+', (attr && m_posHorz==2) ? INVERS : 0);
+          lcd_putcAtt(MODEL_PARAM_OFS+10*FW, y, g_model.pulsePol ? '-' : '+', (attr && m_posHorz==2) ? INVERS : 0);
 
           if(attr && (s_editMode>0 || p1valdiff)) {
             switch (m_posHorz) {
diff --git a/src/open9x.h b/src/open9x.h
index 44738235c..a4aa51623 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -90,6 +90,18 @@ extern void board_init();
 #include "pulses_avr.h"
 #endif
 
+#if defined(DSM2)
+#define IS_DSM2_PROTOCOL(protocol) (protocol==PROTO_DSM2)
+#else
+#define IS_DSM2_PROTOCOL(protocol) (0)
+#endif
+
+#if defined(PXX)
+#define IS_PXX_PROTOCOL(protocol) (protocol==PROTO_PXX)
+#else
+#define IS_PXX_PROTOCOL(protocol) (0)
+#endif
+
 #include "lcd.h"
 #include "menus.h"
 #ifdef TEMPLATES