release 2231

Taranis simu now uses up/down keys

src/beeper.h

@@ -111,7 +111,7 @@ void beep(uint8_t val);
 #endif
 
 #if !defined(CPUARM)
-inline void BEEPER_HEARTBEAT()
+inline void BUZZER_HEARTBEAT()
 {
     if(g_beepCnt) {
         if(!beepAgainOrig) {

src/lcd.cpp

@@ -730,11 +730,12 @@ void putsTime(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2
 
   qr = div(tme, 60);
 
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
   if (att & MIDSIZE) {
     div_t qr2 = div(qr.quot, 60);
     LCD_2DOTS(x+2*8-6, y, att);
     lcd_outdezNAtt(x, y, qr2.quot, att|LEADING0|LEFT, 2);
+    qr.quot = qr2.rem;
     x += 2*8+1;
   }
 #define separator ':'

src/logs.cpp

@@ -104,12 +104,12 @@ const pm_char * openLogs()
 #endif
 
 #if defined(FRSKY_HUB)
-    if (g_model.frsky.usrProto == USR_PROTO_FRSKY)
+    if (IS_USR_PROTO_FRSKY_HUB())
       f_puts("GPS Date,GPS Time,Long,Lat,Course,GPS Speed,GPS Alt,Baro Alt,Temp1,Temp2,RPM,Fuel,Volts,AccelX,AccelY,AccelZ,", &g_oLogFile);
 #endif
 
 #if defined(WS_HOW_HIGH)
-    if (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)
+    if (IS_USR_PROTO_WS_HOW_HIGH())
       f_puts("WSHH Alt,", &g_oLogFile);
 #endif
 
@@ -173,7 +173,7 @@ void writeLogs()
 #endif
 
 #if defined(FRSKY_HUB)
-      if (g_model.frsky.usrProto == USR_PROTO_FRSKY) {
+      if (IS_USR_PROTO_FRSKY_HUB()) {
         f_printf(&g_oLogFile, "%4d-%02d-%02d,", frskyData.hub.year+2000, frskyData.hub.month, frskyData.hub.day);
         f_printf(&g_oLogFile, "%02d:%02d:%02d,", frskyData.hub.hour, frskyData.hub.min, frskyData.hub.sec);
         f_printf(&g_oLogFile, "%03d.%04d%c,", frskyData.hub.gpsLongitude_bp, frskyData.hub.gpsLongitude_ap,
@@ -193,7 +193,7 @@ void writeLogs()
 #endif
 
 #if defined(WS_HOW_HIGH)
-      if (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH) {
+      if (IS_USR_PROTO_WS_HOW_HIGH()) {
         f_printf(&g_oLogFile, "%d,", TELEMETRY_GPS_ALT_BP);
       }
 #endif

src/menu_model.cpp

@@ -1717,8 +1717,7 @@ void menuModelHeli(uint8_t event)
 
   for (uint8_t i=0; i<6; i++) {
     uint8_t y = 1 + 1*FH + i*FH;
-    uint8_t attr = (sub == i ? INVERS : 0);
-
+    uint8_t attr = (sub == i ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
     switch(i) {
       case ITEM_HELI_SWASHTYPE:
         g_model.swashR.type = selectMenuItem(HELI_PARAM_OFS, y, STR_SWASHTYPE, STR_VSWASHTYPE, g_model.swashR.type, 0, SWASH_TYPE_NUM, attr, event);
@@ -3808,7 +3807,9 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_RSSI_ALARM2,
 #if defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
   ITEM_TELEMETRY_USR_LABEL,
+#if !defined(PCBTARANIS)
   ITEM_TELEMETRY_USR_PROTO,
+#endif
   ITEM_TELEMETRY_USR_BLADES,
 #endif
   ITEM_TELEMETRY_USR_VOLTAGE_SOURCE,
@@ -3836,10 +3837,12 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_MAX
 };
 
-#if defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
-#define USRDATA_LINES (uint8_t)-1, 0, 0,
+#if defined(PCBTARANIS)
+  #define USRDATA_LINES (uint8_t)-1, 0,
+#elif defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
+  #define USRDATA_LINES (uint8_t)-1, 0, 0,
 #else
-#define USRDATA_LINES
+  #define USRDATA_LINES
 #endif
 
 #if defined(FRSKY)
@@ -3990,11 +3993,13 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_USRDATA);
         break;
 
+#if !defined(PCBTARANIS)
       case ITEM_TELEMETRY_USR_PROTO:
         lcd_putsLeft(y, STR_PROTO);
         lcd_putsiAtt(TELEM_COL2, y, STR_VTELPROTO, g_model.frsky.usrProto, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.frsky.usrProto, USR_PROTO_LAST);
         break;
+#endif
 
       case ITEM_TELEMETRY_USR_BLADES:
         lcd_putsLeft(y, STR_BLADES);

src/opentx.cpp

@@ -361,7 +361,14 @@ void generalDefault()
   g_eeGeneral.version  = EEPROM_VER;
   g_eeGeneral.variant = EEPROM_VARIANT;
   g_eeGeneral.contrast = 25;
+
+#if defined(PCBTARANIS)
+  g_eeGeneral.vBatWarn = 65;
+  g_eeGeneral.vBatMin = -30;
+  g_eeGeneral.vBatMax = -40;
+#else
   g_eeGeneral.vBatWarn = 90;
+#endif
 
   for (int i = 0; i < NUM_STICKS+NUM_POTS; ++i) {
     g_eeGeneral.calibMid[i]     = 0x200;
@@ -414,6 +421,10 @@ void modelDefault(uint8_t id)
   modelIds[id] = g_model.modelId = id+1;
   checkModelIdUnique(id);
 #endif
+
+#if defined(PCBTARANIS)
+  g_model.frsky.channels[0].ratio = 132;
+#endif
 }
 
 int16_t intpol(int16_t x, uint8_t idx) // -100, -75, -50, -25, 0, 25 ,50, 75, 100
@@ -2269,7 +2280,7 @@ PLAY_FUNCTION(playValue, uint8_t idx)
     case MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT-1:
     case MIXSRC_FIRST_TELEM-1+TELEM_MAX_ALT-1:
 #if defined(WS_HOW_HIGH)
-      if (IS_IMPERIAL_ENABLE() && g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)
+      if (IS_IMPERIAL_ENABLE() && IS_USR_PROTO_WS_HOW_HIGH())
         PLAY_NUMBER(val, 1+UNIT_FEET, 0);
       else
 #endif
@@ -3656,7 +3667,7 @@ ISR(TIMER_10MS_VECT, ISR_NOBLOCK)
   AUDIO_HEARTBEAT();
 #endif
 
-#if defined(BUZZER)
+#if defined(BEEPER)
   BUZZER_HEARTBEAT();
 #endif
 

src/opentx.h

@@ -1390,5 +1390,12 @@ void varioWakeup();
   #define IS_IMPERIAL_ENABLE() (0)
 #endif
 
+#if defined(PCBTARANIS)
+  #define IS_USR_PROTO_FRSKY_HUB()   (1)
+  #define IS_USR_PROTO_WS_HOW_HIGH() (0)
+#else
+  #define IS_USR_PROTO_FRSKY_HUB()   (g_model.frsky.usrProto == USR_PROTO_FRSKY)
+  #define IS_USR_PROTO_WS_HOW_HIGH() (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)
 #endif
 
+#endif

src/simu.cpp

@@ -241,8 +241,8 @@ long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
       KEY_Page_Down, KEY_PAGE,
       KEY_Return,    KEY_ENTER,
       KEY_BackSpace, KEY_EXIT,
-      KEY_Right,     KEY_PLUS,
-      KEY_Left,      KEY_MINUS,
+      KEY_Up,     KEY_PLUS,
+      KEY_Down,      KEY_MINUS,
 #else
       KEY_Return,    KEY_MENU,
       KEY_BackSpace, KEY_EXIT,

src/telemetry_frsky.cpp

@@ -319,11 +319,11 @@ void processFrskyPacket(uint8_t *packet)
       uint8_t numBytes = 3 + (packet[1] & 0x07); // sanitize in case of data corruption leading to buffer overflow
       for (uint8_t i=3; i<numBytes; i++) {
 #if defined(FRSKY_HUB)
-        if (g_model.frsky.usrProto == USR_PROTO_FRSKY)
+        if (IS_USR_PROTO_FRSKY_HUB())
           parseTelemHubByte(packet[i]);
 #endif
 #if defined(WS_HOW_HIGH)
-        if (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)
+        if (IS_USR_PROTO_WS_HOW_HIGH())
           parseTelemWSHowHighByte(packet[i]);
 #endif
       }

src/translations/cz.h

@@ -213,16 +213,23 @@
 #define LEN_VTELEMCHNS         "\004"
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time"
 
-#ifdef IMPERIAL_UNITS
-  #define LENGTH_UNIT          "ft\0"
-  #define SPEED_UNIT           "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-  #define LENGTH_UNIT          "m\0 "
-  #define SPEED_UNIT           "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT         "\003"
-#define TR_VTELEMUNIT          "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V                  (STR_VTELEMUNIT+1)
 #define STR_A                  (STR_VTELEMUNIT+4)
 

src/translations/de.h

@@ -215,16 +215,23 @@
 #define LEN_VTELEMCHNS         "\004"
 #define TR_VTELEMCHNS          "---\0""Batt""Uhr1""Uhr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""H\203he""Umdr""Stof""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Besc""Zeit"
 
-#ifdef IMPERIAL_UNITS
-#define LENGTH_UNIT            "ft\0"
-#define SPEED_UNIT             "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-#define LENGTH_UNIT            "m\0 "
-#define SPEED_UNIT             "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT         "\003"
-#define TR_VTELEMUNIT          "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V                  (STR_VTELEMUNIT+1)
 #define STR_A                  (STR_VTELEMUNIT+4)
 

src/translations/en.h

@@ -273,7 +273,7 @@
 #define TR_VTEMPLATES          "Clear Mixes\0\0""Simple 4-CH \0""Sticky-T-Cut\0""V-Tail      \0""Elevon\\Delta\0""eCCPM       \0""Heli Setup  \0""Servo Test  \0"
 
 #define LEN_VSWASHTYPE         "\004"
-#define TR_VSWASHTYPE          "--- ""120 ""120X""140 ""90\0"
+#define TR_VSWASHTYPE          "---\0""120\0""120X""140\0""90\0"
 
 #define LEN_VKEYS              "\005"
 #define TR_VKEYS               TR(" Menu"" Exit"" Down""   Up""Right"" Left", " Menu"" Exit""Enter"" Page"" Plus""Minus")
@@ -354,7 +354,7 @@
 #define TR_LOADINGMODEL        "Loading model..."
 #define TR_NAME                "Name"
 #define TR_MODELNAME           "Model Name"
-#define TR_PHASENAME           "Phase Name"
+#define TR_PHASENAME           "Mode Name"
 #define TR_MIXNAME             "Mix Name"
 #define TR_EXPONAME            "Expo Name"
 #define TR_BITMAP              "Model Image"
@@ -395,7 +395,7 @@
 #define TR_TRIM                "Trim"
 #define TR_DREX                "DRex"
 #define TR_CURVE               "Curve"
-#define TR_FPHASE              TR("Phase","Phases")
+#define TR_FPHASE              TR("Mode","Modes")
 #define TR_MIXWARNING          "Warning"
 #define TR_OFF                 "OFF"
 #define TR_MULTPX              "Multpx"
@@ -420,14 +420,14 @@
 #define TR_HAPTICSTRENGTH      INDENT"Strength"
 #define TR_CONTRAST            "Contrast"
 #define TR_ALARMS_LABEL        "Alarms"
-#define TR_BATTERY_RANGE       "Battery Range"
+#define TR_BATTERY_RANGE       TR("Battery range","Battery meter range")
 #define TR_BATTERYWARNING      INDENT"Battery Low"
 #define TR_INACTIVITYALARM     INDENT"Inactivity"
 #define TR_MEMORYWARNING       INDENT"Memory Low"
 #define TR_ALARMWARNING        INDENT"Sound Off"
 #define TR_RENAVIG             "RotEnc Navig"
 #define TR_THROTTLEREVERSE     TR("Thr reverse","Throttle reverse")
-#define TR_MINUTEBEEP          TR(INDENT"Minute",INDENT"Every minute")
+#define TR_MINUTEBEEP          TR(INDENT"Minute",INDENT"Minute call")
 #define TR_BEEPCOUNTDOWN       INDENT"Countdown"
 #define TR_PERSISTENT          TR(INDENT"Persist.",INDENT"Persistent")
 #define TR_BACKLIGHT_LABEL     "Backlight"
@@ -473,7 +473,7 @@
 #define TR_PPM                 "PPM"
 #define TR_CH                  "CH"
 #define TR_MODEL               "MODEL"
-#define TR_FP                  "FP"
+#define TR_FP                  "FM"
 #define TR_MIX                 "MIX"
 #define TR_EEPROMLOWMEM        "EEPROM low mem"
 #define TR_ALERT               "\016ALERT"
@@ -494,13 +494,13 @@
 #define TR_TRIMS2OFFSETS       "\006Trims => Offsets"
 #define TR_MENUMODELSEL        TR("MODELSEL","MODEL SELECTION")
 #define TR_MENUSETUP           TR("SETUP","MODEL SETUP")
-#define TR_MENUFLIGHTPHASE     "FLIGHT PHASE"
-#define TR_MENUFLIGHTPHASES    "FLIGHT PHASES"
+#define TR_MENUFLIGHTPHASE     "FLIGHT MODE"
+#define TR_MENUFLIGHTPHASES    "FLIGHT MODES"
 #define TR_MENUHELISETUP       "HELI SETUP"
 
 #if defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
   #define TR_MENUDREXPO        "STICKS"
-  #define TR_MENULIMITS        "OUTPUTS"
+  #define TR_MENULIMITS        "SERVOS"
 #else
   #define TR_MENUDREXPO        "DR/EXPO"
   #define TR_MENULIMITS        "LIMITS"

src/translations/es.h

@@ -213,16 +213,23 @@
 #define LEN_VTELEMCHNS   "\004"
 #define TR_VTELEMCHNS    "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Hora"
 
-#ifdef IMPERIAL_UNITS
-  #define LENGTH_UNIT "ft\0"
-  #define SPEED_UNIT  "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-  #define LENGTH_UNIT "m\0 "
-  #define SPEED_UNIT  "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT   "\003"
-#define TR_VTELEMUNIT    "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V            (STR_VTELEMUNIT+1)
 #define STR_A            (STR_VTELEMUNIT+4)
 

src/translations/fr.h

@@ -227,16 +227,23 @@
 #define LEN_VTELEMCHNS   "\004"
 #define TR_VTELEMCHNS    "---\0""Batt""Chr1""Chr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Acc\0""Time"
 
-#ifdef IMPERIAL_UNITS
-#define LENGTH_UNIT "ft\0"
-#define SPEED_UNIT  "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-#define LENGTH_UNIT "m\0 "
-#define SPEED_UNIT  "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT   "\003"
-#define TR_VTELEMUNIT    "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V            (STR_VTELEMUNIT+1)
 #define STR_A            (STR_VTELEMUNIT+4)
 

src/translations/it.h

@@ -212,16 +212,23 @@
 #define LEN_VTELEMCHNS   "\004"
 #define TR_VTELEMCHNS    "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Time"
 
-#ifdef IMPERIAL_UNITS
-#define LENGTH_UNIT "ft\0"
-#define SPEED_UNIT  "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-#define LENGTH_UNIT "m\0 "
-#define SPEED_UNIT  "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT   "\003"
-#define TR_VTELEMUNIT    "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V            (STR_VTELEMUNIT+1)
 #define STR_A            (STR_VTELEMUNIT+4)
 

src/translations/pt.h

@@ -191,16 +191,23 @@
 #define LEN_VTELEMCHNS   "\004"
 #define TR_VTELEMCHNS    "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Hora"
 
-#ifdef IMPERIAL_UNITS
-#define LENGTH_UNIT "ft\0"
-#define SPEED_UNIT  "kts"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-#define LENGTH_UNIT "m\0 "
-#define SPEED_UNIT  "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "ft\0"
+    #define SPEED_UNIT         "kts"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT   "\003"
-#define TR_VTELEMUNIT    "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V            (STR_VTELEMUNIT+1)
 #define STR_A            (STR_VTELEMUNIT+4)
 

src/translations/se.h

@@ -227,16 +227,23 @@
 #define LEN_VTELEMCHNS         "\004"
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""H\202jd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Acc\0""Tid\0"
 
-#ifdef IMPERIAL_UNITS
-  #define LENGTH_UNIT          "fot"
-  #define SPEED_UNIT           "knp"
+#if defined(CPUARM)
+  #define LEN_VTELEMUNIT_NORM  "\003"
+  #define TR_VTELEMUNIT_NORM   "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+  #define LEN_VTELEMUNIT_IMP   "\003"
+  #define TR_VTELEMUNIT_IMP    "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
 #else
-  #define LENGTH_UNIT          "m\0 "
-  #define SPEED_UNIT           "kmh"
+  #if defined(IMPERIAL_UNITS)
+    #define LENGTH_UNIT        "fot"
+    #define SPEED_UNIT         "knp"
+  #else
+    #define LENGTH_UNIT        "m\0 "
+    #define SPEED_UNIT         "kmh"
+  #endif
+  #define LEN_VTELEMUNIT       "\003"
+  #define TR_VTELEMUNIT        "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #endif
 
-#define LEN_VTELEMUNIT         "\003"
-#define TR_VTELEMUNIT          "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 "
 #define STR_V                  (STR_VTELEMUNIT+1)
 #define STR_A                  (STR_VTELEMUNIT+4)
 
@@ -422,7 +429,7 @@
 #define TR_THROTTLEREVERSE     "Reverserad Gas"
 #define TR_MINUTEBEEP          INDENT"Varje Minut"
 #define TR_BEEPCOUNTDOWN       INDENT"R\201kna Ned"
-#define TR_PERSISTENT          TR("J\201mt p\200 ","INDENT"Alltid P\200")
+#define TR_PERSISTENT          TR("J\201mt p\200 ",INDENT"Alltid P\200")
 #define TR_BACKLIGHT_LABEL     "Belysning"
 #define TR_BLDELAY             INDENT"Av efter"
 #define TR_BLONBRIGHTNESS      INDENT"P\200 Ljusstyrka"

src/view_telemetry.cpp

@@ -207,7 +207,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
     case TELEM_ALT-1:
     case TELEM_MIN_ALT-1:
     case TELEM_MAX_ALT-1:
-      if (IS_IMPERIAL_ENABLE() && g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH) {
+      if (IS_IMPERIAL_ENABLE() && IS_USR_PROTO_WS_HOW_HIGH()) {
         putsTelemetryValue(x, y, val, UNIT_FEET, att);
         break;
       }
@@ -560,7 +560,7 @@ void menuTelemetryFrsky(uint8_t event)
 #if defined(FRSKY_HUB)
     else if (s_frsky_view == e_frsky_after_flight) {
       uint8_t line=1*FH+1;
-      if (g_model.frsky.usrProto == USR_PROTO_FRSKY) {
+      if (IS_USR_PROTO_FRSKY_HUB()) {
         // Latitude
         lcd_putsLeft(line, STR_LATITUDE);
         displayGpsCoord(line, frskyData.hub.gpsLatitudeNS, frskyData.hub.gpsLatitude_bp, frskyData.hub.gpsLatitude_ap);

util/tts.py

@@ -26,6 +26,8 @@
 
 import os, sys, shutil, platform, subprocess, wave, zipfile
 
+NO_ALTERNATE = 1024
+
 def generate(str, idx, alternate=0):
     result = None
     if "speak" in sys.argv:
@@ -41,7 +43,7 @@ def generate(str, idx, alternate=0):
         elif board == 'sky9x':
             result = idx + ".wav"
         else:
-            if alternate == 0:
+            if alternate >= NO_ALTERNATE:
                 return []
             result = "%04d.wav" % alternate
             
@@ -197,19 +199,19 @@ if __name__ == "__main__":
                                "point four", "point five", "point six",
                                "point seven", "point eight", "point nine"]):
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+160+i))
-        for s, f, a in [(u"trim center", "midtrim", 244),
-                        (u"maximum trim reached", "endtrim", 0),
-                        (u"transmitter battery low", "lowbatt", 231),
-                        (u"inactivity alarm", "inactiv", 230),
-                        (u"throttle warning", "thralert", 232),
-                        (u"switch warning", "swalert", 233),
-                        (u"Welcome to open nine ex!", "tada", 245),
-                        (u"tick. tock", "timerlt3", 250),
-                        (u"ten. seconds", "timer10", 251),
-                        (u"twenty. seconds", "timer20", 252),
-                        (u"thirty. seconds", "timer30", 253),
+        for s, f, a in [(u"trim center", "midtrim", 494),
+                        (u"maximum trim reached", "endtrim", NO_ALTERNATE),
+                        (u"transmitter battery low", "lowbatt", 481),
+                        (u"inactivity alarm", "inactiv", 480),
+                        (u"throttle warning", "thralert", 482),
+                        (u"switch warning", "swalert", 483),
+                        (u"Welcome to open nine ex!", "tada", 495),
+                        (u"tick. tock", "timerlt3", 500),
+                        (u"ten. seconds", "timer10", 501),
+                        (u"twenty. seconds", "timer20", 502),
+                        (u"thirty. seconds", "timer30", 503),
                        ]:
-            systemSounds.extend(generate(s, f, PROMPT_SYSTEM_BASE+a))
+            systemSounds.extend(generate(s, f, a))
         for i, (s, f) in enumerate([
                      (u"gear!, up!", "gearup"),
                      (u"gear!, down!", "geardn"),
@@ -307,23 +309,23 @@ if __name__ == "__main__":
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+103+i))
         for i, s in enumerate(["volt", "amper", "meetri per secondo", "", "chilomeetri ora", "meetri", "gradi", "percento", "milliamper", "milliamper ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g"]):
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+113+i))            
-        for s, f, a in [(u"radio inattiva controllare", "inactiv", 230),
-                        (u"batteria della radio scarica", "lowbatt", 231),
-                        (u"controllo motore non in posizione, verificare", "thralert", 232),
-                        (u"interruttori non in posizione, verificare", "swalert", 233),
-                        (u"eeprom corrotta", "eebad", 0),
-                        (u"formattazone eeprom in corso", "eeformat", 0),
-                        (u"errore", "error", 0),
-                        (u"trim centrato", "midtrim", 244),
-                        (u"tada", "tada", 245),
-                        (u"potenziometro centrato", "midpot", 246),
-                        (u"massimo trim raggiunto", "endtrim", 0),
-                        (u"3 secondi al termine", "timerlt3", 250),
-                        (u"dieci secondi", "timer10", 251),
-                        (u"venti secondi", "timer20", 252),
-                        (u"trenta secondi", "timer30", 253),
+        for s, f, a in [(u"radio inattiva controllare", "inactiv", 480),
+                        (u"batteria della radio scarica", "lowbatt", 481),
+                        (u"controllo motore non in posizione, verificare", "thralert", 482),
+                        (u"interruttori non in posizione, verificare", "swalert", 483),
+                        (u"eeprom corrotta", "eebad", NO_ALTERNATE),
+                        (u"formattazone eeprom in corso", "eeformat", NO_ALTERNATE),
+                        (u"errore", "error", NO_ALTERNATE),
+                        (u"trim centrato", "midtrim", 494),
+                        (u"tada", "tada", 495),
+                        (u"potenziometro centrato", "midpot", 496),
+                        (u"massimo trim raggiunto", "endtrim", NO_ALTERNATE),
+                        (u"3 secondi al termine", "timerlt3", 500),
+                        (u"dieci secondi", "timer10", 501),
+                        (u"venti secondi", "timer20", 502),
+                        (u"trenta secondi", "timer30", 503),
                      ]:
-            systemSounds.extend(generate(s, f, PROMPT_SYSTEM_BASE+a))
+            systemSounds.extend(generate(s, f, a))
         for i, s in enumerate(["timer", "timer",  "trasmissione", "ricezione", "A1", "A2", "altitudine", "motore",
                                "carburante", "temperatura", "temperatura", "velocita'", "distanza", "altitudine", "cella lipo",
                                "totale lipo", "tensione", "corrente", "consumo", "potenza", "accelerazione X", "accellerazione Y", "accelerazione Z",
@@ -376,23 +378,23 @@ if __name__ == "__main__":
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+102+i))
         for i, s in enumerate(["Volt", "Ampere", "Meter pro sekunde", "", "kilometer pro stunde", "Meter", "Grad", "Prozent", "Milliampere", "Milliampere pro stunde", "Watt", "db", "Fuesse", "Knoten", "Uhr", "Minuten", "Secunden", "R P M", "g"]):
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+110+i))            
-        for s, f, a in [(u"Sender ist inaktiv,bitte Ueberpruefen Sie", "inactiv", 230),
-                        (u"Senderakku niedrig", "lowbatt", 231),
-                        (u"Gaskanal nicht Null, bitte pruefen", "thralert", 232),
-                        (u"Schalten fehlpositioniert, bitte pruefen", "swalert", 233),
-                        (u"Das EEPROM ist fehlerhaft", "eebad", 0),
-                        (u"Das EEPROM ist immer formatiert", "eeformat", 0),
-                        (u"fehler", "error", 0),
-                        (u"Trim zentriert", "midtrim", 244),
-                        (u"tada", "tada", 245),
-                        (u"Poti zentriert", "midpot", 246),
-                        (u"Maximale trimmung erreicht", "endtrim", 0),
-                        (u"Noch drei sekunden", "timerlt3", 250),
-                        (u"10 sekunden", "timer10", 251),
-                        (u"20 sekunden", "timer20", 252),
-                        (u"30 sekunden", "timer30", 253),
+        for s, f, a in [(u"Sender ist inaktiv,bitte Ueberpruefen Sie", "inactiv", 480),
+                        (u"Senderakku niedrig", "lowbatt", 481),
+                        (u"Gaskanal nicht Null, bitte pruefen", "thralert", 482),
+                        (u"Schalten fehlpositioniert, bitte pruefen", "swalert", 483),
+                        (u"Das EEPROM ist fehlerhaft", "eebad", NO_ALTERNATE),
+                        (u"Das EEPROM ist immer formatiert", "eeformat", NO_ALTERNATE),
+                        (u"fehler", "error", NO_ALTERNATE),
+                        (u"Trim zentriert", "midtrim", 494),
+                        (u"tada", "tada", 495),
+                        (u"Poti zentriert", "midpot", 496),
+                        (u"Maximale trimmung erreicht", "endtrim", NO_ALTERNATE),
+                        (u"Noch drei sekunden", "timerlt3", 500),
+                        (u"10 sekunden", "timer10", 501),
+                        (u"20 sekunden", "timer20", 502),
+                        (u"30 sekunden", "timer30", 503),
                      ]:
-            systemSounds.extend(generate(s, f, PROMPT_SYSTEM_BASE+a))
+            systemSounds.extend(generate(s, f, a))
         for i, s in enumerate(["Timer", "Timer",  "Sendung", "Empfang", "A1", "A2", "Hoehe", "Motor",
                                "Treibstoff", "Temperatur", "Temperatur", "Geschwindigkeit", "Ferne", "Hoehe", "Lipo-Zelle",
                                "Zellen gesamt", "Spannung", "Strom", "Verbrauch", "Power", "Beschleunigung X", "Beschleunigung Y", "Beschleunigung Z",
@@ -454,23 +456,23 @@ if __name__ == "__main__":
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+111+i))
         for i, s in enumerate([u"Volt", u"ampére", u"metros por segundo", u"", u"quilômetros por hora", u"metros", u"graus", u"cento", u"miliamperes", u"miliamperes por hora", u"watt", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g"]):
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+122+i))            
-        for s, f, a in [(u"atenção, o rádio foi esquecido ligado, por favor desligue-o", "inactiv", 230),
-                        (u"bateria do rádio fraca", "lowbatt", 231),
-                        (u"atenção,acelerador não está no mínimo", "thralert", 232),
-                        (u"atenção, certifique-se que os interruptores estão na posição certa", "swalert", 233),
-                        (u"eeprom corrompida", "eebad", 0),
-                        (u"formatação da eeprom em curso", "eeformat", 0),
-                        (u"erro", "error", 0),
-                        (u"trim centrado", "midtrim", 244),
-                        (u"tada", "tada", 245),
-                        (u"potenciómetro centrado", "midpot", 246),
-                        (u"trim no máximo", "endtrim", 0),
-                        (u"3 segundos", "timerlt3", 250),
-                        (u"10 segundos", "timer10", 251),
-                        (u"20 segundos", "timer20", 252),
-                        (u"30 segundos", "timer30", 253),
+        for s, f, a in [(u"atenção, o rádio foi esquecido ligado, por favor desligue-o", "inactiv", 480),
+                        (u"bateria do rádio fraca", "lowbatt", 481),
+                        (u"atenção,acelerador não está no mínimo", "thralert", 482),
+                        (u"atenção, certifique-se que os interruptores estão na posição certa", "swalert", 483),
+                        (u"eeprom corrompida", "eebad", NO_ALTERNATE),
+                        (u"formatação da eeprom em curso", "eeformat", NO_ALTERNATE),
+                        (u"erro", "error", NO_ALTERNATE),
+                        (u"trim centrado", "midtrim", 494),
+                        (u"tada", "tada", 495),
+                        (u"potenciómetro centrado", "midpot", 496),
+                        (u"trim no máximo", "endtrim", NO_ALTERNATE),
+                        (u"3 segundos", "timerlt3", 500),
+                        (u"10 segundos", "timer10", 501),
+                        (u"20 segundos", "timer20", 502),
+                        (u"30 segundos", "timer30", 503),
                      ]:
-            systemSounds.extend(generate(s, f, PROMPT_SYSTEM_BASE+a))
+            systemSounds.extend(generate(s, f, a))
         for i, s in enumerate([u"cronómetro", u"cronómetro", u"transmissão", u"recepção", u"A1", u"A2", u"altitude", u"motor",
                                 u"combustível", u"temperatura", u"temperatura", u"velocidade", u"distância", u"altitude", u"célula lipo"
                                 u"Total lipo", u"tensão", u"corrente", u"consumo", u"potência", u"aceleração X", u"aceleração Y", u"aceleração Z"
@@ -547,19 +549,19 @@ if __name__ == "__main__":
         					   u"gé", u"gé", u"gé", u"gé"]):
             systemSounds.extend(generate(s, PROMPT_SYSTEM_BASE+118+i))
             
-        for s, f, a in [(u"střed trimu", "midtrim", 244),
-                        (u"maximum trimu", "endtrim", 0),
-                        (u"baterie rádia je vybitá", "lowbatt", 231),
-                        (u"zapoměl jsi na mě!", "inactiv", 230),
-                        (u"plyn není na nule", "thralert", 232),
-                        (u"přepínače nejsou ve výchozí poloze", "swalert", 233),
-                        (u"tadá", "tada", 245),
-                        (u"ťik ťak", "timerlt3", 250),
-                        (u"deset sekund", "timer10", 251),
-                        (u"dvacet sekund", "timer20", 252),
-                        (u"třicet sekund", "timer30", 253),
+        for s, f, a in [(u"střed trimu", "midtrim", 494),
+                        (u"maximum trimu", "endtrim", NO_ALTERNATE),
+                        (u"baterie rádia je vybitá", "lowbatt", 481),
+                        (u"zapoměl jsi na mě!", "inactiv", 480),
+                        (u"plyn není na nule", "thralert", 482),
+                        (u"přepínače nejsou ve výchozí poloze", "swalert", 483),
+                        (u"tadá", "tada", 495),
+                        (u"ťik ťak", "timerlt3", 500),
+                        (u"deset sekund", "timer10", 501),
+                        (u"dvacet sekund", "timer20", 502),
+                        (u"třicet sekund", "timer30", 503),
                        ]:
-            systemSounds.extend(generate(s, f, PROMPT_SYSTEM_BASE+a))
+            systemSounds.extend(generate(s, f, a))
         for i, (s, f) in enumerate([
                      (u"podvozek je zasunut", "gearup"),
                      (u"podvozek je vysunut", "geardn"),
@@ -599,13 +601,13 @@ if __name__ == "__main__":
         for f, s in systemSounds:
             l = u""
             if board == "sky9x":
-                l += u"9XSOUNDS/SYSTEM;"
+                l += u"SOUNDS/SYSTEM;"
             l += f + u";" + s + u"\n"
             csvFile.write(l.encode("latin-1"))
         for f, s in sounds:
             l = u""
             if board == "sky9x":
-                l += u"9XSOUNDS;"
+                l += u"SOUNDS;"
             l += f + u";" + s + u"\n"
             csvFile.write(l.encode("latin-1"))
         csvFile.close()
@@ -615,13 +617,13 @@ if __name__ == "__main__":
         zip = zipfile.ZipFile(zip_name, "w", zipfile.ZIP_DEFLATED)
         for f, s in systemSounds:
             if board == "sky9x":
-                zip.write(f, "9XSOUNDS/SYSTEM/" + f)
+                zip.write(f, "SOUNDS/SYSTEM/" + f)
             else:
                 zip.write(f, f)
             os.remove(f)
         for f, s in sounds:
             if board == "sky9x":
-                zip.write(f, "9XSOUNDS/" + f)
+                zip.write(f, "SOUNDS/" + f)
             else:
                 zip.write(f, f)
             os.remove(f)