From 20af91b9e19f70f4072dd7ace9d8a042f5766979 Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 20 May 2013 10:01:45 +0000
Subject: [PATCH] [Taranis] NCH < 8 for PXX Shift in strings Cosmetics

---
 src/gui/menu_model.cpp    |  2 +-
 src/protocols/pxx_arm.cpp |  7 +++++--
 src/translations.h        | 17 ++++++++++-------
 src/translations/fr.h     |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp
index 42c82c54c..a1a0bfe6b 100644
--- a/src/gui/menu_model.cpp
+++ b/src/gui/menu_model.cpp
@@ -1316,7 +1316,7 @@ void menuModelSetup(uint8_t event)
         lcd_putsLeft(y, TR_FAILSAFE);
         if (IS_MODULE_XJT(moduleIdx)) {
           lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_VFAILSAFE, moduleData.failsafeMode, m_posHorz==0 ? attr : 0);
-          if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 9*FW, y, STR_SET, m_posHorz==1 ? attr : 0);
+          if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 10*FW, y, STR_SET, m_posHorz==1 ? attr : 0);
           if (attr) {
             if (moduleData.failsafeMode != FAILSAFE_CUSTOM)
               m_posHorz = 0;
diff --git a/src/protocols/pxx_arm.cpp b/src/protocols/pxx_arm.cpp
index b093ea4a7..df754dbe7 100644
--- a/src/protocols/pxx_arm.cpp
+++ b/src/protocols/pxx_arm.cpp
@@ -200,7 +200,7 @@ void setupPulsesPXX(unsigned int port)
       }
       else {
         if (i < sendUpperChannels) {
-          chan =  limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (g_model.moduleData[port].failsafeChannels[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
+          chan = limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (g_model.moduleData[port].failsafeChannels[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
           if (chan == 3072) chan = 3073;
         }
         else {
@@ -213,7 +213,10 @@ void setupPulsesPXX(unsigned int port)
       if (i < sendUpperChannels)
         chan =  limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
       else
-        chan = limit(0, PPM_CH_CENTER(g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[g_model.moduleData[port].channelsStart+i] * 512 / 682) + 1024, 2047);
+        if(i >= NUM_CHANNELS(port))
+          chan = 1024;
+        else
+          chan = limit(0, PPM_CH_CENTER(g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[g_model.moduleData[port].channelsStart+i] * 512 / 682) + 1024, 2047);
     }
 
     if (i & 1) {
diff --git a/src/translations.h b/src/translations.h
index 14826b8c7..bc7ce35db 100644
--- a/src/translations.h
+++ b/src/translations.h
@@ -145,20 +145,23 @@ extern const pm_char STR_OPEN9X[];
 #define OFS_DATETIME           (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
 #if defined(PCBGRUVIN9X) || defined(CPUARM)
   #define OFS_VLCD             (OFS_DATETIME + sizeof(TR_DATETIME))
+#else
+  #define OFS_VLCD             (OFS_DATETIME)
+#endif
+#if defined(CPUARM)
   #define OFS_VUNITSSYSTEM     (OFS_VLCD + sizeof(TR_VLCD))
 #else
-  #define OFS_VUNITSSYSTEM     (OFS_DATETIME)
+  #define OFS_VUNITSSYSTEM     (OFS_VLCD)
 #endif
 #if defined(CPUARM)
   #define OFS_COUNTRYCODES     (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM))
+#else
+  #define OFS_COUNTRYCODES     (OFS_VUNITSSYSTEM)
+#endif
+#if defined(PXX)
   #define OFS_VFAILSAFE        (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
 #else
-  #if defined (PXX)
-    #define OFS_COUNTRYCODES     (OFS_VUNITSSYSTEM)
-    #define OFS_VFAILSAFE        (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
-  #else
-    #define OFS_VFAILSAFE        (OFS_VUNITSSYSTEM)
-  #endif
+  #define OFS_VFAILSAFE        (OFS_COUNTRYCODES)
 #endif
 #if defined(PXX)
   #define OFS_VTRAINERMODES    (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 6028e2e6e..8812dbcb7 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -632,7 +632,7 @@
 #define TR_MODULE_BIND         "[Bind]"
 #define TR_MODULE_RANGE        "[Port.]"
 #define TR_RESET               "[RAZ]"
-#define TR_SET                 "[D\200fin.]"
+#define TR_SET                 "[D\200f.]"
 #define TR_TRAINER             "Ecolage"
 #define TR_ANTENNAPROBLEM      CENTER "Antenne radio d\200fectueuse!"
 #define TR_MODELIDUSED         TR("ID d\200j\202 affect\200","No de modèle d\200j\202 utilis\200")