From c3ddf660580b04ce7e35fb6f850ae623deea23f7 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 18 Apr 2012 06:00:03 +0000
Subject: [PATCH] Small flash saving in General Menus (60bytes) Backlight
 brightness now supported on ARM SD card archive function continued Simu
 backlight support for v4

---
 src/eeprom_avr.cpp    |  22 +++++++++++++++-----
 src/general_menus.cpp |  47 ++++++++++++++++++------------------------
 src/gruvin9x/logs.cpp |   6 +++---
 src/model_menus.cpp   |  12 ++++++++---
 src/o9xstrings.cpp    |   1 +
 src/o9xstrings.h      |   1 +
 src/open9x.h          |   6 +++---
 src/simu.cpp          |   5 +++++
 src/snapshot_01.png   | Bin 0 -> 1485 bytes
 src/snapshot_02.png   | Bin 0 -> 1460 bytes
 src/translations/en.h |  15 +++++++-------
 src/translations/fr.h |  19 +++++++++--------
 src/translations/se.h |   9 ++++----
 13 files changed, 82 insertions(+), 61 deletions(-)
 create mode 100644 src/snapshot_01.png
 create mode 100644 src/snapshot_02.png

diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index 5dbbe1787..e98b6dc75 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -529,18 +529,30 @@ bool RlcFile::copy(uint8_t i_fileDst, uint8_t i_fileSrc)
 #ifdef SDCARD
 const pm_char * eeArchiveModel(uint8_t i_fileSrc)
 {
-  char buf[15];
+  char *buf = reusableBuffer.model_name;
   FIL archiveFile;
 
-  eeLoadModelName(i_fileSrc, buf);
+  FRESULT result = f_mount(0, &g_FATFS_Obj);
+  if (result != FR_OK) {
+    return PSTR("SDCARD F/S ERROR"); // TODO ...
+  }
 
-  FRESULT result = f_open(&archiveFile, buf, FA_OPEN_ALWAYS | FA_WRITE);
+  strcpy_P(buf, PSTR(LOG_PATH "/Twister.bin")); // TODO Not PSTR everywhere ...
+/*  eeLoadModelName(i_fileSrc, &buf[sizeof(LOG_PATH)+1]);
+  uint8_t i = sizeof(LOG_PATH)+1;
+  while (i<sizeof(LOG_PATH)+11 && buf[i]) {
+    buf[i] = idx2char(buf[i]);
+    i++;
+  }
+  strcpy_P(&buf[i], PSTR(".bin")); // TODO Not PSTR everywhere ...
+*/
+  result = f_open(&archiveFile, buf, FA_OPEN_ALWAYS | FA_WRITE);
   if (result != FR_OK) {
     return SDCARD_ERROR(result);
   }
 
   EFile theFile2;
-  theFile2.openRd(i_fileSrc);
+  theFile2.openRd(FILE_MODEL(i_fileSrc));
 
   uint8_t len;
   while ((len=theFile2.read((uint8_t *)buf, 15)))
@@ -549,7 +561,7 @@ const pm_char * eeArchiveModel(uint8_t i_fileSrc)
       f_putc(buf[i], &g_oLogFile);
   }
 
-  f_close(&g_oLogFile);
+  f_close(&archiveFile);
   return NULL;
 }
 #endif
diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index 5e8b007e1..669c03ea1 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -71,13 +71,18 @@ const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
   menuProcDiagCalib
 };
 
-#define GENERAL_PARAM_OFS   17*FW
-uint8_t onoffMenuItem( uint8_t value, uint8_t y, const pm_char *s, uint8_t condition, uint8_t event )
+#define GENERAL_PARAM_OFS   (2+16*FW)
+NOINLINE int8_t selectMenuItem(uint8_t y, const pm_char *label, const pm_char *values, int8_t value, int8_t min, int8_t max, uint8_t condition, uint8_t event)
 {
-  lcd_putsLeft(y, s);
-  menu_lcd_onoff( GENERAL_PARAM_OFS, y, value, condition ) ;
-  if (condition) CHECK_INCDEC_GENVAR(event, value, 0, 1);
-  return value ;
+  lcd_putsLeft(y, label);
+  lcd_putsiAtt(GENERAL_PARAM_OFS, y, values, value-min, condition ? INVERS:0) ;
+  if (condition) CHECK_INCDEC_GENVAR(event, value, min, max);
+  return value;
+}
+
+NOINLINE uint8_t onoffMenuItem(uint8_t value, uint8_t y, const pm_char *label, uint8_t condition, uint8_t event )
+{
+  return selectMenuItem(y, label, STR_OFFON, value, 0, 1, condition, event);
 }
 
 enum menuProcSetupItems {
@@ -141,14 +146,10 @@ void menuProcSetup(uint8_t event)
 
   uint8_t subN = 1;
   if(s_pgOfs<subN) {
-    lcd_putsLeft( y, STR_BEEPERMODE);
-    lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.beeperMode, (sub==subN ? INVERS:0));
-    if(sub==subN) {
-      CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperMode, -2, 1);
+    g_eeGeneral.beeperMode = selectMenuItem(y, STR_BEEPERMODE, STR_VBEEPMODE, g_eeGeneral.beeperMode, -2, 1, sub==subN, event);
 #if defined(FRSKY)
-      if (checkIncDec_Ret) FRSKY_setModelAlarms();
+    if (sub==subN && checkIncDec_Ret) FRSKY_setModelAlarms();
 #endif
-    }
     if((y+=FH)>7*FH) return;
   }subN++;
 
@@ -168,9 +169,7 @@ void menuProcSetup(uint8_t event)
 #endif
 
   if(s_pgOfs<subN) {
-    lcd_putsLeft( y, STR_BEEPERLEN);
-    lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPLEN, 2+g_eeGeneral.beeperLength, (sub==subN ? INVERS:0));
-    if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperLength, -2, 2);
+    g_eeGeneral.beeperLength = selectMenuItem(y, STR_BEEPERLEN, STR_VBEEPLEN, g_eeGeneral.beeperLength, -2, 2, sub==subN, event);
     if((y+=FH)>7*FH) return;
   }subN++;
 
@@ -187,9 +186,7 @@ void menuProcSetup(uint8_t event)
 
 #ifdef HAPTIC
   if(s_pgOfs<subN) {
-    lcd_putsLeft( y, STR_HAPTICMODE);
-    lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.hapticMode, (sub==subN ? INVERS:0));
-    if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticMode, -2, 1);
+    g_eeGeneral.hapticMode = selectMenuItem(y, STR_HAPTICMODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, sub==subN, event);
     if((y+=FH)>7*FH) return;
   }subN++;
 
@@ -204,7 +201,7 @@ void menuProcSetup(uint8_t event)
   
   if(s_pgOfs<subN) {
     lcd_putsLeft( y, STR_HAPTICLENGTH);
-    lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPLEN, 2+g_eeGeneral.hapticLength, (sub==subN ? INVERS:0));
+    lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_VBEEPLEN, 2+g_eeGeneral.hapticLength, (sub==subN ? INVERS:0));
     if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticLength, -2, 2);
     if((y+=FH)>7*FH) return;
   }subN++;  
@@ -257,9 +254,7 @@ void menuProcSetup(uint8_t event)
   }subN++;
 
   if(s_pgOfs<subN) {
-    lcd_putsLeft( y,STR_FILTERADC);
-    lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_ADCFILTER, g_eeGeneral.filterInput, (sub==subN ? INVERS:0));
-    if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.filterInput, 0, 2);
+    g_eeGeneral.filterInput = selectMenuItem(y, STR_FILTERADC, STR_ADCFILTER, g_eeGeneral.filterInput, 0, 2, sub==subN, event);
     if((y+=FH)>7*FH) return;
   }subN++;
 
@@ -318,10 +313,8 @@ void menuProcSetup(uint8_t event)
   }subN++;
 
   if(s_pgOfs<subN) {
-      lcd_putsLeft( y, STR_SWITCHWARNING);
-      lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_WARNSW, 1+g_eeGeneral.switchWarning, (sub==subN ? INVERS:0));
-      if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchWarning, -1, 1);
-      if((y+=FH)>7*FH) return;
+    g_eeGeneral.switchWarning = selectMenuItem(y, STR_SWITCHWARNING, STR_WARNSW, g_eeGeneral.switchWarning, -1, 1, sub==subN, event);
+    if((y+=FH)>7*FH) return;
   }subN++;
 
   if(s_pgOfs<subN) {
@@ -363,7 +356,7 @@ void menuProcSetup(uint8_t event)
       uint8_t attr = sub==subN?INVERS:0;
       lcd_putsLeft( y,STR_RXCHANNELORD);//   RAET->AETR
       for (uint8_t i=1; i<=4; i++)
-        putsChnLetter((16+i)*FW, y, channel_order(i), attr);
+        putsChnLetter(GENERAL_PARAM_OFS - FW + i*FW, y, channel_order(i), attr);
       if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23);
       if((y+=FH)>7*FH) return;
   }subN++;
diff --git a/src/gruvin9x/logs.cpp b/src/gruvin9x/logs.cpp
index 0ec1960c9..f7804d1a2 100644
--- a/src/gruvin9x/logs.cpp
+++ b/src/gruvin9x/logs.cpp
@@ -49,11 +49,11 @@ void initLogs()
   if (g_oLogFile.fs) f_close(&g_oLogFile);
   g_logState = 0;
 
-  strcpy_P(g_logFilename, PSTR(LOG_PATH "M00_000.CSV"));
+  strcpy_P(g_logFilename, PSTR(LOG_PATH "/M00_000.CSV"));
 
   // Set log file model number
   uint8_t num = g_eeGeneral.currModel + 1;
-  char *n = &g_logFilename[11]; // TODO constant
+  char *n = &g_logFilename[sizeof(LOG_PATH) + 3];
   *n = (char)((num % 10) + '0');
   *(--n) = (char)((num / 10) + '0');
 
@@ -74,7 +74,7 @@ void initLogs()
       f_close(&g_oLogFile);
 
       // bump log file counter (file extension)
-      n = &g_logFilename[15];
+      n = &g_logFilename[sizeof(LOG_PATH) + 7];
       if (++*n > '9')
       {
         *n='0';
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 90b9ccf10..94caf3653 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -242,12 +242,13 @@ void menuProcModelSelect(uint8_t event)
           killEvents(event);
           if (g_eeGeneral.currModel != sub) {
 #if defined(SDCARD)
-            s_menu[s_menu_count++] = STR_LOAD_MODEL;
             if (eeModelExists(sub)) {
+              s_menu[s_menu_count++] = STR_LOAD_MODEL;
               s_menu[s_menu_count++] = STR_ARCHIVE_MODEL;
               s_menu[s_menu_count++] = STR_DELETE_MODEL;;
             }
             else {
+              s_menu[s_menu_count++] = STR_CREATE_MODEL;
               s_menu[s_menu_count++] = STR_RESTORE_MODEL;;
             }
 #else
@@ -364,13 +365,16 @@ void menuProcModelSelect(uint8_t event)
   if (s_sdcard_error) {
     s_warning = s_sdcard_error;
     displayWarning(event);
-    s_warning = NULL;
+    if (s_warning)
+      s_warning = NULL;
+    else
+      s_sdcard_error = NULL;
   }
 
   if (s_menu_count) {
     const pm_char * result = displayMenu(event);
     if (result) {
-      if (result == STR_LOAD_MODEL) {
+      if (result == STR_LOAD_MODEL || result == STR_CREATE_MODEL) {
         displayPopup(STR_LOADINGMODEL);
         eeCheck(true); // force writing of current model data before this is changed
         if (g_eeGeneral.currModel != sub) {
@@ -381,6 +385,8 @@ void menuProcModelSelect(uint8_t event)
       }
       else if (result == STR_ARCHIVE_MODEL) {
         s_sdcard_error = eeArchiveModel(sub);
+        if (!s_sdcard_error)
+          eeDeleteModel(sub); // delete the model, it's archived!
       }
       else if (result == STR_RESTORE_MODEL) {
         // TODO
diff --git a/src/o9xstrings.cpp b/src/o9xstrings.cpp
index a03366e97..a82920cfb 100644
--- a/src/o9xstrings.cpp
+++ b/src/o9xstrings.cpp
@@ -309,6 +309,7 @@ const pm_char STR_CURRENT[] PROGMEM = TR_CURRENT;
 
 #if defined(SDCARD)
 const pm_char STR_LOAD_MODEL[] PROGMEM = TR_LOAD_MODEL;
+const pm_char STR_CREATE_MODEL[] PROGMEM = TR_CREATE_MODEL;
 const pm_char STR_ARCHIVE_MODEL[] PROGMEM = TR_ARCHIVE_MODEL;
 const pm_char STR_DELETE_MODEL[] PROGMEM = TR_DELETE_MODEL;
 const pm_char STR_RESTORE_MODEL[] PROGMEM = TR_RESTORE_MODEL;
diff --git a/src/o9xstrings.h b/src/o9xstrings.h
index cb4679805..04e18ab3e 100644
--- a/src/o9xstrings.h
+++ b/src/o9xstrings.h
@@ -368,6 +368,7 @@ extern const pm_char STR_CURRENT[];
 
 #if defined(SDCARD)
 extern const pm_char STR_LOAD_MODEL[];
+extern const pm_char STR_CREATE_MODEL[];
 extern const pm_char STR_ARCHIVE_MODEL[];
 extern const pm_char STR_DELETE_MODEL[];
 extern const pm_char STR_RESTORE_MODEL[];
diff --git a/src/open9x.h b/src/open9x.h
index c0318fa05..f3f4c8b09 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -583,7 +583,7 @@ extern uint8_t  s_eeDirtyMsk;
 
 #if defined (PCBARM)
 #ifndef SIMU
-#define BACKLIGHT_ON    (PWM->PWM_CH_NUM[0].PWM_CDTY = 0/*TODO g_eeGeneral.bright*/)
+#define BACKLIGHT_ON    (PWM->PWM_CH_NUM[0].PWM_CDTY = g_eeGeneral.backlightBright)
 #define BACKLIGHT_OFF   (PWM->PWM_CH_NUM[0].PWM_CDTY = 100)
 #else
 #define BACKLIGHT_ON
@@ -835,10 +835,10 @@ union ReusableBuffer
 {
 #if !defined(PCBARM)
     uint8_t eefs_buffer[BLOCKS];           // used by EeFsck
-
-    char model_name[sizeof(g_model.name)]; // used by menuProcModelSelect
 #endif
 
+    char model_name[42]; // used by menuProcModelSelect and for SD card archive / restore
+
     struct
     {
         int16_t midVals[7];
diff --git a/src/simu.cpp b/src/simu.cpp
index fc2780549..e0a5d0ede 100644
--- a/src/simu.cpp
+++ b/src/simu.cpp
@@ -247,8 +247,13 @@ void Open9xSim::refreshDiplay()
 {
   if (lcd_refresh) {
     lcd_refresh = false;
+#if defined(PCBV4)
+    if(portc & 1<<OUT_C_LIGHT)  bmf->setOffColor(FXRGB(150,200,152));
+    else                        bmf->setOffColor(FXRGB(200,200,200));
+#else
     if(portb & 1<<OUT_B_LIGHT)  bmf->setOffColor(FXRGB(150,200,152));
     else                        bmf->setOffColor(FXRGB(200,200,200));
+#endif
 
     for(int x=0;x<W;x++){
       for(int y=0;y<H;y++)
diff --git a/src/snapshot_01.png b/src/snapshot_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bd7718c0b807a079db523bfb7ff9ae2218a3875
GIT binary patch
literal 1485
zcmYLJdsLEl82({uW}0c1mWp=DaH(Z>nt35@kwhNT%DYo*TBvy`n_`g3Jja#Iv|=%r
z38kkrLD7+z63DR@nwYtzsm#l~Btsw@7cWTcNByxszVCeB_rAa9dEWPZ-mfJ57}nB!
zi#Y(m5_bf10ssVj1Y|Q)c%N=*g#nYFahQV<`S;|b2{{A%*PFiSvHj^gobB49&D-;S
ze<pgEzRO<s^h`@OU5Rlm+jjNE^7dGHm~$Xse>nhIo}I)$@M(HVxFDn-(61~qhNt3$
z&IP*T+PK%8z<M-qHoIWFPAT7{BVG7@OrqEKYcOe59l2<|N7}~oYw2`-zPznW;nsju
zNR(JYb&axABjHt#bi^}ix#w(B)hRV4zb(w#>XZRmtv89+z$(-|H3r4Hqku<v;f5E^
zGg8uo%rTlmviOd5uBuS8=oVX8epdXamSC65vjMi6wt_AsJDE-$ZXT%Dl=|JROjX<C
zg`LNR3+b+R*yuAH-`fcneGHlLMqS=N#*LP78;wM-`=3PRCia#k)TlIz$Ju{#Wm#7t
zZ)WAHp?&8nGdcSi{m6f$NROU-BIYPsPk}K@6uB-|HCWY7h$5*LC6Q#dy!+7tu6uYY
zzM77bB$!-F^h|9S#C$;b`gQPt;6YfqaB5Z&9Kj)39LY2Y@U34hEy$VclG)4Z3l>=8
zyW3}9d%KH}_&IygZE(M7eip=`FR7g5Qq(im8;oDPaKd8^Fc<S3=B3RaWQvx$wvxe1
zSi*vurr*V#tnWG@3^F2ja!_Qhgm<z}@rOT`)uCRJ8A2K*72Nk);}WA{f5Zk0OKa31
z#=R$TJ;ZaTgQy$b)#=ktPOMpeZAPxecHrg_fG8czau`jzGT6`5rdE-Mx8yc7FUt7p
z!KJoe7&P%sC@{=f&vRO24xqnY9|nm#Z3HK&>d<`bdqDQO>O+QRk@jx=RnidxS+r_L
zL4E5pj%>^dEzKa2-hE^d*G<YU(G>scg?bzaA7UB5A-XrJ7h~AjOTCkga=t$U1XVou
zCHLcJSew*Y9d(4wWm|Mh3Zh+2vyMc80><BivXr?cEWV#q-WP=?sEAl`2Pv|M2P=>@
zA%m#Mz@u-qL(#kq=Uaw-O>;h;b#W1i-x)_7tS#U337x+Vm{E2hRD5exeO}U>HU($O
zW%-17Vh3S$UK@Xy2o@p0X=*PbW%Hru{xNr$uCOt^JA<gX%WMW1j<Sx+i!8c+ppeRQ
zAZ$YfofdBpD3ER=2_sAOEtOteE{Eh}m=_HM_bN#As^ki^KBL-Kn>Q27%QZPG-s>0K
z=Z#V+4DAjzvUlRP5MQxdEJ%I&C+QY<Gs{w*pleEYh}C?5h!R2p)h`wO$&((9cSrfs
zcKodUHCM=)W+T`YUH%n*oO{#r7BfmtB;10HX$=F>1ICUGqP-(Ze5{>wW}igbB~ue?
zXB;6`e3W%pmE9zBnG0>^<pbPAmIhmypC6EEq}TVvzCVx`7{co8;~jxx(HPIa<<2Q&
zON@Zz#!f5r7q$8Oxb({dlmhH5y}&56n9gS<dm2<$f-)v;28q_E&O8`ptMKBQ&OVYs
zk=T`7JHUQU2-H)|16OXq1$r0?xbD*!)(%HGg;hPG9xFC{!~x#iD~9_^5v^k(^zhD=
z72QhM&XsQuL4QRU7deDmo0+v{tP`~Fo<_mydu#-<cvA0HL9Rj8<&6`M2?<GZpCK$v
zr@8`{K&Xi;^92{d&2ordj3SSz3;Ga(D{%j)kB|Zi&AIW*<j9fW^C=DrFhG+bxeelH
zf$$0<yx{BO)u7m5Qw|X{ESOfTC95H2Mm(B47Ku3J1bM`KyNPZjcuIrGnPGr<<ul%2
y|9AM}D!3!jh{W*~<?;m=D|qCj6)-pWxDe5lb0OM9c93rPTjLHN!!&+#s^~v-0o!N*

literal 0
HcmV?d00001

diff --git a/src/snapshot_02.png b/src/snapshot_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..642a195ffff9ee8dc80d18821ea787552132e366
GIT binary patch
literal 1460
zcmX9;X;70_6n$X{pwe1ov7p2j1O|kt46A6+A#7F)lzj_0NF2hV0tQHcuT@*9WpN=0
zieaD@gaVZiP(lD#T18@nB!rmY$P!GTkxe8J>HF-TH+Sy6@1A?kdGm^cj{6yIGT#IM
zFbweb2>}2DLxAXG;W^3ff(2b#fY0I3oSSn}O1i||7#l<`CuRo_&5V-*#9{J*-?T#w
zAN=A(v|qVNBJOdxrYvH9r01^XY-n=4Ec*)9>GY|&3C+Af$z$S5EF%u|E`17FO&MYk
zn!H-%Z5mnQVvDJUYggl@-stP{3Qm!?#qkI~1nRzis9eMiR5xe&-4UF=EjmiAdzG6<
zSqcxHBDI7MOI-{`QrcxcVzmdc@D{lbUoVQGZOqG!fc1we5UnZ-9y;`h*M8K)mo3b?
zJyE7=t|?slXvZli^L;+7rkZ7Q(avZ>QVE~Ttmc!Oqo&@4rQB!~Y$r1>)|Y049knM@
zo=M02!`V`QP(DgBNT?(?il^>T@cpMOj<rO{Pc4aE0x2apfqCyU#aXnc-4zLI>Ey6Y
zRZU&K-Q8Hp?PJL!it3F3E#z_cHt$e}yt(7ju_h^vo`vrhFU<at{rlw1ybFKAAex4$
zqis&%y6`i-1LbaJz%DNriWgz_Ela>dCT%d@C)!v8YC=hAs8Vxqcd*E#dHGyrc%smq
zQ~JQp02pn?>AgI#ph%^B6j=3)y!7#e`6$S+lkWOPV72H=ZX+%)iiRWyIBm=8)GCw8
zCr--k=*|l|r_EZZ3Vu``S-vcaAI}euHRa^X;8h!p&Lv9=(yO(>QH~|ZoZD~a19`l%
zMWT2~!Ia60(umCQ;q=c_B6GCdIiJ?UtX6#^x>_nSvue(>7KIeKJigVu>l?T{K4U}m
z#g<7c7!D_EYt46HK;o}%2#HY8^dixjUs#EnA;#{dREokmCFKfsUObiJkzDDlSm!(V
z&AUK`Yu^EO+?h7>D$$xJ$wErZF{3)Jq~>9ey-!>b+1&-!wWmi`N}rUCZGJx+so^gy
zDKr}~Y*Bqu7efaWYXsP!b_pvotus{F)XeTI8=L1gbN&@h^J8wwqEa|<_`)k-*WI_V
zh%{xreyr5qk1KLsQ@5$<RB=Y)ifTA+^lN>6mZlmB<`r={`hK>>Lf4;F_LAkH6Fb1x
z<Xo+pxJwxyR{fZFqX%{m_R8W}1SVg(b0_IA4z-80?d4AMX+9QQs1jmp$Iadj1`1Jo
zj^VxkX|le2@{n3lQCl}epy}190-?+dTcjb(W$VVf8o|9A90m<lKw^Vgs%9_nX8!Jy
zEi$FV`{(FwvTWnJh!9U&!Bf;sSA&EOtYZy1%khzHrKGd2>k~cOAz!7UI2Jla&7S3s
z*FY)Kt^!|*Ot#2~?~5K$^zd8NUcQp;MZ2Ll5^JP^r5qIv(TorF<ug)wJ>piX2@36m
z@v6Aut#a1P#GV%xsKsepIPAnFMg#SNY-Ty0+b~5%Z5|HSIV->D&id494g6E1Es%oP
zQ6_|p>$G_@<J8^ng;Gx4(XZI2LUh2Li?)cYA|1(w&3ow9yH4X^*;I%PqD|xCOu{9Y
zLG-;;u4rAGPSX}$h4xH2Xf3zC(SCdx#wQJGJEw10gT(+)e%%6CPh&x`BL~xy-(xYQ
zcL^pVbMW5Eg7@6Dr`q%AI;*`Pg&ye##eHbhKeJv)(R=6#0ng>)`_KGYIOm>V35mw^
zTJ~SA#<ilz&$l7*;PVBBE#QK`N+FZ`FrN;U?vVcYLKo3Mn9&X$F#A26>J;-;BXy3D
zhS`f!c8vM5mK_1Eqj(ISZq9x^&}#et&}y6z64>Vk{09wzQKmNX_%-D7J|3AEA`CFK
h*UDj030vWEAMoY5CKJISHdORe4j>-)X+4tg(|<y%z-Ryf

literal 0
HcmV?d00001

diff --git a/src/translations/en.h b/src/translations/en.h
index bba6e9193..2a1d0a0a2 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -8,11 +8,11 @@
 #define LEN_NCHANNELS    "\004"
 #define TR_NCHANNELS     "4CH 6CH 8CH 10CH12CH14CH16CH"
 
-#define LEN_VBEEPMODE    "\006"
-#define TR_VBEEPMODE     "Quiet ""Alarms""NoKey ""All   "
+#define LEN_VBEEPMODE    "\005"
+#define TR_VBEEPMODE     "Quiet""Alarm""NoKey""All  "
 
-#define LEN_VBEEPLEN     "\006"
-#define TR_VBEEPLEN      "xShort""Short ""Normal""Long  ""xLong "
+#define LEN_VBEEPLEN     "\005"
+#define TR_VBEEPLEN      "xShrt""Short""Norml""Long ""xLong"
 
 #define LEN_ADCFILTER    "\004"
 #define TR_ADCFILTER     "SING""OSMP""FILT"
@@ -258,16 +258,16 @@
 #define TR_HAPTICLENGTH "Haptic Length"
 #define TR_CONTRAST     "Contrast"
 #define TR_BATTERYWARNING "Battery Warning"
-#define TR_INACTIVITYALARM "Inactivity alarm"
+#define TR_INACTIVITYALARM "Inactivity alrm"
 #define TR_FILTERADC    "Filter ADC"
-#define TR_THROTTLEREVERSE "Throttle reverse"
+#define TR_THROTTLEREVERSE "Thr reverse"
 #define TR_MINUTEBEEP   "Minute beep"
 #define TR_BEEPCOUNTDOWN "Beep countdown"
 #define TR_FLASHONBEEP  "Flash on beep"
 #define TR_LIGHTSWITCH  "Light switch"
 #define TR_LIGHTOFFAFTER "Light off after"
 #define TR_SPLASHSCREEN  "Splash screen"
-#define TR_THROTTLEWARNING "Throttle Warning"
+#define TR_THROTTLEWARNING "Thr Warning"
 #define TR_SWITCHWARNING "Switch Warning"
 #define TR_MEMORYWARNING "Memory Warning"
 #define TR_ALARMWARNING "Alarm Warning"
@@ -355,6 +355,7 @@
 #define TR_CURRENT_CALIB "Current Calib"
 #define TR_CURRENT       "Current"
 #define TR_LOAD_MODEL    "Load Model"
+#define TR_CREATE_MODEL  "Create Model"
 #define TR_ARCHIVE_MODEL "Archive Model"
 #define TR_DELETE_MODEL  "Delete Model" // TODO merged into DELETEMODEL?
 #define TR_RESTORE_MODEL "Restore Model"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 9f1ce382b..b3ad68e1a 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -8,11 +8,11 @@
 #define LEN_NCHANNELS    "\004"
 #define TR_NCHANNELS     "4CH 6CH 8CH 10CH12CH14CH16CH"
 
-#define LEN_VBEEPMODE    "\006"
-#define TR_VBEEPMODE     "Quiet ""Alarms""NoKey ""Tout  "
+#define LEN_VBEEPMODE    "\005"
+#define TR_VBEEPMODE     "Quiet""Alarm""NoKey""Tout "
 
-#define LEN_VBEEPLEN     "\006"
-#define TR_VBEEPLEN      "xShort""Short ""Normal""Long  ""xLong "
+#define LEN_VBEEPLEN     "\005"
+#define TR_VBEEPLEN      "xShrt""Short""Norml""Long ""xLong"
 
 #define LEN_ADCFILTER    "\004"
 #define TR_ADCFILTER     "SING""OSMP""FILT"
@@ -258,14 +258,14 @@
 #define TR_HAPTICLENGTH "Length Vibreur"
 #define TR_CONTRAST     "Contraste"
 #define TR_BATTERYWARNING "Alarme Batterie"
-#define TR_INACTIVITYALARM "Alarme Inactivite"
+#define TR_INACTIVITYALARM "Alarme Inactiv."
 #define TR_FILTERADC    "Filtre ADC"
 #define TR_THROTTLEREVERSE "Inversion Gaz"
 #define TR_MINUTEBEEP   "Bip t.minutes"
 #define TR_BEEPCOUNTDOWN "Bip a rebours"
 #define TR_FLASHONBEEP  "Flash quand bip"
 #define TR_LIGHTSWITCH  "Inter eclairage"
-#define TR_LIGHTOFFAFTER "Eclair. off apres"
+#define TR_LIGHTOFFAFTER "Duree eclairage"
 #define TR_SPLASHSCREEN  "Ecran d'accueil"
 #define TR_THROTTLEWARNING "Alerte Gaz"
 #define TR_SWITCHWARNING "Alerte Inter"
@@ -306,7 +306,7 @@
 #define TR_MODEL        "MODELE"
 #define TR_FP           "PV"
 #define TR_EEPROMLOWMEM "EEPROM low mem"
-#define TR_ALERT        "ALERTE"
+#define TR_ALERT        "\007ALERTE"
 #define TR_PRESSANYKEYTOSKIP "Touche pour ignorer"
 #define TR_THROTTLENOTIDLE "Gaz pas a zero"
 #define TR_RESETTHROTTLE    "Reinitialisez le"
@@ -352,10 +352,11 @@
 #define TR_LONGITUDE     "Longitude"
 #define TR_GPSCOORD      "Gps Coords"
 #define TR_SHUTDOWN      "ARRET EN COURS"
-#define TR_BATT_CALIB    "Battery Calib"
-#define TR_CURRENT_CALIB "Current Calib"
+#define TR_BATT_CALIB    "Calib. Batterie"
+#define TR_CURRENT_CALIB "Calib. Amperage"
 #define TR_CURRENT       "Courant"
 #define TR_LOAD_MODEL    "Charger Modele"
+#define TR_CREATE_MODEL  "Creer Modele"
 #define TR_ARCHIVE_MODEL "Archiver Modele"
 #define TR_DELETE_MODEL  "Supprimer Modele"
 #define TR_RESTORE_MODEL "Restorer Modele"
diff --git a/src/translations/se.h b/src/translations/se.h
index 4beac9409..ccf4f2cec 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -8,11 +8,11 @@
 #define LEN_NCHANNELS    "\004"
 #define TR_NCHANNELS     "4CH 6KN 8KN 10KN12KN14KN16KN"
 
-#define LEN_VBEEPMODE    "\006"
-#define TR_VBEEPMODE     "Tyst  ""Alarm ""Ej Knp""Alla  "
+#define LEN_VBEEPMODE    "\005"
+#define TR_VBEEPMODE     "Tyst ""Alarm""EjKnp""Alla "
 
-#define LEN_VBEEPLEN     "\006"
-#define TR_VBEEPLEN      "xKort ""Kort  ""Normal""L\200ng  ""xL\200ng "
+#define LEN_VBEEPLEN     "\005"
+#define TR_VBEEPLEN      "xKort""Kort ""Norml""L\200ng ""xL\200ng"
 
 #define LEN_ADCFILTER    "\004"
 #define TR_ADCFILTER     "SING""OSMP""FILT"
@@ -355,6 +355,7 @@
 #define TR_CURRENT_CALIB "Current Calib"
 #define TR_CURRENT       "Sp\201nning"
 #define TR_LOAD_MODEL    "Load Model"
+#define TR_CREATE_MODEL  "Create Model"
 #define TR_ARCHIVE_MODEL "Archive Model"
 #define TR_DELETE_MODEL  "Delete Model"
 #define TR_RESTORE_MODEL "Restore Model"