Taranis 212x64

radio/src/gui/common/stdlcd/model_curves.cpp

@@ -104,6 +104,8 @@ void menuModelCurvesAll(event_t event)
   }
 }
 
+static const char* _curve_types[] = {"Diff","Expo","Func","Cstm"};
+
 void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags)
 {
   coord_t x1 = x;
@@ -125,7 +127,7 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlag
     flags1 = 0;
   }
 
-  lcdDrawTextAtIndex(x1, y, "\004DiffExpoFuncCstm", curve.type, flags1);
+  lcdDrawTextAtIndex(x1, y, _curve_types, curve.type, flags1);
 
   if (active && menuHorizontalPosition==0) {
     CHECK_INCDEC_MODELVAR_ZERO(event, curve.type, CURVE_REF_CUSTOM);

radio/src/gui/common/stdlcd/model_inputs.cpp

@@ -177,7 +177,7 @@ void displayExpoLine(coord_t y, ExpoData * ed)
   drawSource(EXPO_LINE_SRC_POS, y, ed->srcRaw, 0);
 
   if (ed->carryTrim != TRIM_ON) {
-    lcdDrawChar(EXPO_LINE_TRIM_POS, y, ed->carryTrim > 0 ? '-' : STR_RETA123[-ed->carryTrim]);
+    lcdDrawChar(EXPO_LINE_TRIM_POS, y, ed->carryTrim > 0 ? '-' : STR_RETA123[-ed->carryTrim][0]);
   }
 
   if (!ed->flightModes || ((ed->curve.value || ed->swtch) && ((get_tmr10ms() / 200) & 1)))

radio/src/gui/common/stdlcd/radio_version.cpp

@@ -25,6 +25,8 @@
   #include "mixer_scheduler.h"
 #endif
 
+#include "fw_version.h"
+
 // TODO duplicated code
 #if defined(ROTARY_ENCODER_NAVIGATION)
 #define EVT_KEY_NEXT_LINE              EVT_ROTARY_RIGHT