diff --git a/.github/workflows/win-cpn-32.yml b/.github/workflows/win-cpn-32.yml
index a84903fac07..5a853ab7778 100644
--- a/.github/workflows/win-cpn-32.yml
+++ b/.github/workflows/win-cpn-32.yml
@@ -65,10 +65,18 @@ jobs:
                                 mingw-w64-i686-clang \
                                 mingw-w64-i686-nsis
           pip install Pillow clang
-          
+
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1  # not v2!
+        with:
+          path: ../Qt
+          key: win32-QtCache
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
           version: ${{ env.QT_VERSION }}
           arch: ${{ env.MINGW_VERSION }}
 
diff --git a/.github/workflows/win_cpn.yml b/.github/workflows/win_cpn.yml
index 7c579b3c070..68806737dac 100644
--- a/.github/workflows/win_cpn.yml
+++ b/.github/workflows/win_cpn.yml
@@ -68,10 +68,18 @@ jobs:
                                 mingw-w64-x86_64-clang \
                                 mingw-w64-x86_64-nsis
           pip install Pillow clang
-          
+
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1  # not v2!
+        with:
+          path: ../Qt
+          key: win64-QtCache
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
           version: ${{ env.QT_VERSION }}
           arch: ${{ env.MINGW_VERSION }}
 
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index 6d36d908862..fe984588b37 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -1057,56 +1057,6 @@ void printInterrupts()
 }
 #endif //#if defined(DEBUG_INTERRUPTS)
 
-#if defined(DEBUG_TASKS)
-void printTaskSwitchLog()
-{
-  serialPrint("Tasks legend [<task_id>, <task name>]:");
-  for(int n = 0; n <= CFG_MAX_USER_TASKS+1; n++) {
-    if (0 == n) {
-      serialPrint("%d: Idle", n);
-    }
-    if (cliTaskId == n) {
-      serialPrint("%d: CLI", n);
-    }
-    else if (menusTaskId == n) {
-      serialPrint("%d: menus", n);
-    }
-    else if (mixerTaskId == n) {
-      serialPrint("%d: mixer", n);
-    }
-    else if (audioTaskId == n) {
-      serialPrint("%d: audio", n);
-    }
-  }
-  serialCrlf();
-
-  serialPrint("Tasks switch log at %u [<time>, <task_id>]:", get_tmr10ms());
-  uint32_t lastSwitchTime = 0;
-  uint32_t * tsl = new uint32_t[DEBUG_TASKS_LOG_SIZE];
-  if (!tsl) {
-    serialPrint("Not enough memory");
-    return;
-  }
-  memcpy(tsl, taskSwitchLog, sizeof(taskSwitchLog));
-  uint32_t * p = tsl + taskSwitchLogPos;
-  uint32_t * end = tsl + DEBUG_TASKS_LOG_SIZE;
-  for(int n = 0; n < DEBUG_TASKS_LOG_SIZE; n++) {
-    uint32_t taskId = *p >> 24;
-    uint32_t switchTime = *p & 0xFFFFFF;
-    if (lastSwitchTime != switchTime) {
-      serialPrintf("\r\n%06x: ", switchTime);
-      lastSwitchTime = switchTime;
-    }
-    serialPrintf("%u ", taskId);
-    if ( ++p >= end ) {
-      p = tsl;
-    }
-  }
-  delete[] tsl;
-  serialCrlf();
-}
-#endif // #if defined(DEBUG_TASKS)
-
 #if defined(DEBUG_TIMERS)
 void printDebugTime(uint32_t time)
 {
@@ -1277,11 +1227,6 @@ int cliDisplay(const char ** argv)
     printInterrupts();
   }
 #endif
-#if defined(DEBUG_TASKS)
-  else if (!strcmp(argv[1], "tsl")) {
-    printTaskSwitchLog();
-  }
-#endif
 #if defined(DEBUG_TIMERS)
   else if (!strcmp(argv[1], "dt")) {
     printDebugTimers();
diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp
index 6c1d29bbcc3..0b27ca32585 100644
--- a/radio/src/debug.cpp
+++ b/radio/src/debug.cpp
@@ -177,32 +177,6 @@ void dumpTraceBuffer()
 struct InterruptCounters interruptCounters;
 #endif //#if defined(DEBUG_INTERRUPTS)
 
-#if defined(DEBUG_TASKS)
-
-uint32_t taskSwitchLog[DEBUG_TASKS_LOG_SIZE] __SDRAM;
-uint16_t taskSwitchLogPos;
-
-/**
- *******************************************************************************
- * @brief      Hook for task switch logging
- * @param[in]  taskID Task which is now in RUNNING state
- * @retval     None
- *
- * @par Description
- * @details    This function logs the time when a task entered the RUNNING state.
- *******************************************************************************
- */
-void CoTaskSwitchHook(uint8_t taskID)
-{
-  /* Log task switch here */
-  taskSwitchLog[taskSwitchLogPos] = (taskID << 24) + ((uint32_t)CoGetOSTime() & 0xFFFFFF);
-  if(++taskSwitchLogPos >= DEBUG_TASKS_LOG_SIZE) {
-    taskSwitchLogPos = 0;
-  }
-}
-
-#endif // #if defined(DEBUG_TASKS)
-
 #if defined(DEBUG_TIMERS)
 
 void DebugTimer::start()
diff --git a/radio/src/debug.h b/radio/src/debug.h
index cd3bd06b657..c696e3755a7 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -322,25 +322,6 @@ extern struct InterruptCounters interruptCounters;
 
 #endif //#if defined(DEBUG_INTERRUPTS)
 
-#if defined(DEBUG_TASKS)
-
-#define DEBUG_TASKS_LOG_SIZE    512
-
-// each 32bit is used as:
-//    top 8 bits: task id
-//    botom 24 bits: system tick counter
-extern uint32_t taskSwitchLog[DEBUG_TASKS_LOG_SIZE];
-extern uint16_t taskSwitchLogPos;
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern void CoTaskSwitchHook(uint8_t taskID);
-#if defined(__cplusplus)
-}
-#endif
-
-#endif // #if defined(DEBUG_TASKS)
 
 
 #if defined(DEBUG_TIMERS)
diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp
index a7c054df227..b6d86fc2973 100644
--- a/radio/src/gui/128x64/radio_diaganas.cpp
+++ b/radio/src/gui/128x64/radio_diaganas.cpp
@@ -20,9 +20,24 @@
  */
 
 #include "opentx.h"
+#include "../../hal/adc_driver.h"
+
+#define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */
 
 void menuRadioDiagAnalogs(event_t event)
 {
+    static int8_t entryCount = 0;
+    static uint16_t lastShownAnalogValue[NUM_STICKS+NUM_POTS+NUM_SLIDERS];
+
+    enum ANAVIEWS{
+       ANAVIEW_FIRST,
+       ANAVIEW_CALIB=ANAVIEW_FIRST,
+       ANAVIEW_RAWLOWFPS,
+       ANAVIEW_LAST=ANAVIEW_RAWLOWFPS
+    };
+
+    static int viewpage = ANAVIEW_FIRST;
+
 // TODO enum
 #if defined(TX_CAPACITY_MEASUREMENT)
   #define ANAS_ITEMS_COUNT 3
@@ -32,25 +47,87 @@ void menuRadioDiagAnalogs(event_t event)
   #define ANAS_ITEMS_COUNT 1
 #endif
 
-  SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, HEADER_LINE+ANAS_ITEMS_COUNT);
+  switch (event) {
+    case EVT_KEY_FIRST(KEY_UP):
+#if defined(KEYS_GPIO_REG_PAGEDN)
+    case EVT_KEY_BREAK(KEY_PAGEDN):
+#elif defined(NAVIGATION_X7)
+    case EVT_KEY_BREAK(KEY_PAGE):
+#endif
+    {
+     if (viewpage == ANAVIEW_LAST)
+       viewpage = ANAVIEW_FIRST;
+     else
+       viewpage++;
+     if (viewpage == ANAVIEW_RAWLOWFPS) entryCount = 0;
+     break;
+    }
+
+    case EVT_KEY_FIRST(KEY_DOWN):
+#if defined(KEYS_GPIO_REG_PAGEUP)
+    case EVT_KEY_BREAK(KEY_PAGEUP):
+#elif defined(NAVIGATION_X7)
+    case EVT_KEY_LONG(KEY_PAGE):
+#endif
+    {
+     if (viewpage == ANAVIEW_FIRST)
+       viewpage = ANAVIEW_LAST;
+     else
+       viewpage--;
+     if (viewpage == ANAVIEW_RAWLOWFPS) entryCount = 0;
+      break;
+    }
+  }
+
+  switch (viewpage) {
+    case (ANAVIEW_CALIB):
+      SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS_CALIB,
+                     HEADER_LINE+ANAS_ITEMS_COUNT);
+      break;
+    case (ANAVIEW_RAWLOWFPS):
+      SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS_RAWLOWFPS,
+                     HEADER_LINE+ANAS_ITEMS_COUNT);
+      break;
+  }
 
   coord_t y = MENU_HEADER_HEIGHT + 1;
 
-  lcdDrawTextAlignedLeft(y, STICKS_PWM_ENABLED() ? STR_PWM_STICKS_POTS_SLIDERS : STR_STICKS_POTS_SLIDERS);
+  lcdDrawTextAlignedLeft(y, STICKS_PWM_ENABLED() ? STR_PWM_STICKS_POTS_SLIDERS
+                                                 : STR_STICKS_POTS_SLIDERS);
 
-  for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
+  for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
     uint8_t x;
     if (i & 1) {
-      x = LCD_W/2 + INDENT_WIDTH;
-    }
-    else {
+      x = LCD_W / 2 + INDENT_WIDTH;
+    } else {
       x = INDENT_WIDTH;
       y += FH;
     }
-    drawStringWithIndex(x, y, "A", i+1);
+    drawStringWithIndex(x, y, "A", i + 1);
     lcdDrawChar(lcdNextPos, y, ':');
-    lcdDrawHexNumber(x+3*FW-1, y, anaIn(i));
-    lcdDrawNumber(x+10*FW-1, y, (int16_t)calibratedAnalogs[CONVERT_MODE(i)]*25/256, RIGHT);
+    switch (viewpage) {
+      case (ANAVIEW_RAWLOWFPS):
+        if (entryCount == 0) {
+          lastShownAnalogValue[i] = getAnalogValue(i); // Update value
+        }
+        lcdDrawNumber(x+3*FW-1, y, lastShownAnalogValue[i],
+                      LEADING0|LEFT, 4);
+        break;
+      case (ANAVIEW_CALIB):
+      default:
+        lcdDrawNumber(x+3*FW-1, y, anaIn(i), LEADING0|LEFT, 4);
+        break;
+    }
+    lcdDrawNumber(x+10*FW-1, y,
+                  (int16_t)calibratedAnalogs[CONVERT_MODE(i)]*25/256,
+                  RIGHT);
+  }
+
+  if (viewpage == ANAVIEW_RAWLOWFPS) {
+    if (entryCount > HOLDANAVALUEFRAMES)
+      entryCount = 0;
+    else
+      entryCount++;
   }
 
 #if defined(GYRO)
diff --git a/radio/src/gui/212x64/radio_diaganas.cpp b/radio/src/gui/212x64/radio_diaganas.cpp
index 1b368ed84d6..141c57cd088 100644
--- a/radio/src/gui/212x64/radio_diaganas.cpp
+++ b/radio/src/gui/212x64/radio_diaganas.cpp
@@ -20,17 +20,58 @@
  */
 
 #include "opentx.h"
+#include "../../hal/adc_driver.h"
+
+#define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */
 
 void menuRadioDiagAnalogs(event_t event)
 {
-  SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, 0);
+    static int8_t entryCount = 0;
+    static uint16_t lastShownAnalogValue[NUM_STICKS+NUM_POTS+NUM_SLIDERS];
+
+    enum ANAVIEWS{
+       ANAVIEW_FIRST,
+       ANAVIEW_CALIB=ANAVIEW_FIRST,
+       ANAVIEW_RAWLOWFPS,
+       ANAVIEW_LAST=ANAVIEW_RAWLOWFPS
+    };
+
+    static int viewpage = ANAVIEW_FIRST;
+
+  if (event == EVT_KEY_BREAK(KEY_PAGE)) {
+      if (viewpage == ANAVIEW_LAST)
+        viewpage = ANAVIEW_FIRST;
+      else
+          viewpage++;
+      if (viewpage == ANAVIEW_RAWLOWFPS)
+        entryCount = 0;
+  }
+
+  switch (viewpage)
+  {
+    case (ANAVIEW_CALIB): SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS_CALIB, 0); break;
+    case (ANAVIEW_RAWLOWFPS): SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS_RAWLOWFPS, 0); break;
+  }
 
   for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
     uint8_t x = i&1 ? LCD_W/2 + FW : 0;
     lcdDrawNumber(x, y, i+1, LEADING0|LEFT, 2);
     lcdDrawChar(x+2*FW-2, y, ':');
-    lcdDrawHexNumber(x+3*FW-1, y, anaIn(i));
+    
+    switch (viewpage)
+    {
+      case (ANAVIEW_RAWLOWFPS):
+        if (entryCount == 0)
+        {
+          lastShownAnalogValue[i] = getAnalogValue(i); // Update value
+        }
+        lcdDrawNumber(x+3*FW-1, y, lastShownAnalogValue[i], LEADING0|LEFT, 4);
+        break;
+      case (ANAVIEW_CALIB):
+      default:
+        lcdDrawNumber(x+3*FW-1, y, anaIn(i), LEADING0|LEFT, 4); break;
+    }
 #if defined(JITTER_MEASURE)
     lcdDrawNumber(x+10*FW-1, y, rawJitter[i].get(), RIGHT);
     lcdDrawNumber(x+13*FW-1, y, avgJitter[i].get(), RIGHT);
@@ -39,4 +80,12 @@ void menuRadioDiagAnalogs(event_t event)
     lcdDrawNumber(x+10*FW-1, y, (int16_t)calibratedAnalogs[CONVERT_MODE(i)]*25/256, RIGHT);
 #endif
   }
+
+  if (viewpage == ANAVIEW_RAWLOWFPS)
+  {
+    if (entryCount > HOLDANAVALUEFRAMES)
+      entryCount = 0;
+    else
+      entryCount++;
+  }
 }
diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio_diaganas.cpp
index 37758d878e5..2571293fc2a 100644
--- a/radio/src/gui/colorlcd/radio_diaganas.cpp
+++ b/radio/src/gui/colorlcd/radio_diaganas.cpp
@@ -22,6 +22,7 @@
 #include "opentx.h"
 #include "radio_diaganas.h"
 #include "libopenui.h"
+#include "../../hal/adc_driver.h"
 
 #if defined(IMU_LSM6DS33)
 #include "imu_lsm6ds33.h"
@@ -31,11 +32,26 @@
 #include "../../targets/horus/flyskyHallStick_driver.h"
 #endif
 
-constexpr coord_t ANA_OFFSET = 150;
+#define STATSDEPTH 8 // ideally a value of power of 2
 
-class RadioAnalogsDiagsWindow: public Window {
+constexpr coord_t CA_X_OFFSET = 70;
+constexpr coord_t VALUE_X_OFFSET = 120;
+constexpr coord_t DEV_X_OFFSET = 125;
+constexpr coord_t MIN_X_OFFSET = 115;
+constexpr coord_t MAX_X_OFFSET = 165;
+constexpr coord_t RANGE_X_OFFSET = 170;
+
+RadioAnalogsDiagsViewPageGroup::RadioAnalogsDiagsViewPageGroup() : TabsGroup(ICON_STATS)
+{
+  addTab(new AnaCalibratedViewPage());
+  addTab(new AnaFilteredDevViewPage());
+  addTab(new AnaUnfilteredRawViewPage());
+  addTab(new AnaMinMaxViewPage());
+}
+
+class AnaCalibratedViewWindow: public Window {
   public:
-    RadioAnalogsDiagsWindow(Window * parent, const rect_t & rect):
+    AnaCalibratedViewWindow(Window * parent, const rect_t & rect):
       Window(parent, rect)
     {
     }
@@ -52,31 +68,31 @@ class RadioAnalogsDiagsWindow: public Window {
         if (globalData.flyskygimbals)
         {
             for (uint8_t i = 0; i < FLYSKY_HALL_CHANNEL_COUNT; i++) {
-  #if LCD_W > LCD_H
-                coord_t y = 1 + (i / 2) * FH;
-                uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
-  #else
-                coord_t y = 1 + i * FH;
-                uint8_t x = 10;
-  #endif
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
                 dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
                 dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + 3 * 15 - 1, y, hall_raw_values[i], LEFT | COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, hall_raw_values[i], RIGHT | COLOR_THEME_PRIMARY1);
             }
 
             for (uint8_t i = FLYSKY_HALL_CHANNEL_COUNT; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
-  #if LCD_W > LCD_H
-                coord_t y = 1 + (i / 2) * FH;
-                uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
-  #else
-                coord_t y = 1 + i * FH;
-                uint8_t x = 10;
-  #endif
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
                 dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
                 dc->drawText(x + 2 * 15 - 2, y, ":",  COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + 3 * 15 -1, y, anaIn(i), LEFT | COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, anaIn(i), RIGHT | COLOR_THEME_PRIMARY1);
             }
         }
 #endif
@@ -84,17 +100,17 @@ class RadioAnalogsDiagsWindow: public Window {
         if (!globalData.flyskygimbals) // Also Simulator
         {
             for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
-#if LCD_W > LCD_H
-                coord_t y = 1 + (i / 2) * FH;
-                uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
-#else
-                coord_t y = 1 + i * FH;
-                uint8_t x = 10;
-#endif
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
                 dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
                 dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + 3 * 15 -1, y, anaIn(i), LEFT | COLOR_THEME_PRIMARY1);
-                dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, anaIn(i), RIGHT | COLOR_THEME_PRIMARY1);
             }
         }
 
@@ -114,7 +130,7 @@ class RadioAnalogsDiagsWindow: public Window {
 
 #if defined(HARDWARE_TOUCH)
       TouchState rawTouchState = getInternalTouchState();
-      constexpr coord_t y = MENU_CONTENT_TOP + 5 * FH;
+      constexpr coord_t y = MENU_CONTENT_TOP + 4 * FH;
 
       if (rawTouchState.event != TE_NONE && rawTouchState.event != TE_SLIDE_END) {
         coord_t x = dc->drawText(MENUS_MARGIN_LEFT, y, STR_TOUCH_PANEL);
@@ -124,34 +140,403 @@ class RadioAnalogsDiagsWindow: public Window {
         dc->drawLine(rawTouchState.x - 10, rawTouchState.y - 8 - parent->top(), rawTouchState.x + 10, rawTouchState.y + 8 - parent->top(), SOLID, 0);
         dc->drawLine(rawTouchState.x - 10, rawTouchState.y + 8 - parent->top(), rawTouchState.x + 10, rawTouchState.y - 8- parent->top(), SOLID, 0);
       }
-#if !defined(SIMU) && !defined(PCBNV14)
-      constexpr coord_t y1 = MENU_CONTENT_TOP + 6 * FH;
-      coord_t x1 = MENUS_MARGIN_LEFT;
-      x1 = dc->drawText(x1, y1, "Touch GT911 FW ver:") + 8;
-      x1 = dc->drawNumber(x1, y1, touchGT911fwver, LEFT, 4) + 16;
-      x1 = dc->drawText(x1, y1, "TSI2CEvents:") + 4;
-      dc->drawNumber(x1, y1, touchGT911hiccups, LEFT, 5);
+      #if !defined(SIMU) && !defined(PCBNV14)
+        constexpr coord_t y1 = MENU_CONTENT_TOP + 5 * FH;
+        coord_t x1 = MENUS_MARGIN_LEFT;
+        x1 = dc->drawText(x1, y1, "Touch GT911 FW ver:") + 8;
+        x1 = dc->drawNumber(x1, y1, touchGT911fwver, LEFT, 4) + 16;
+        x1 = dc->drawText(x1, y1, "TSI2CEvents:") + 4;
+        dc->drawNumber(x1, y1, touchGT911hiccups, LEFT, 5);
+      #endif
 #endif
+    };
+
+  protected:
+};
+
+class AnaFilteredDevViewWindow: public Window {
+  protected:
+    class Stats {
+      protected:
+        int16_t buffer[STATSDEPTH] = {0};
+        uint8_t writePos = 0;
+        uint8_t filledElems = 0;
+
+        int16_t intSqrt(int16_t val)
+        {
+          if (val < 0)
+              return 0;
+          if (val <= 1)
+              return val;
+
+          // Try iteratively until i^2 >= val
+          int i = 1, retval = 1;
+          while (retval <= val)
+          {
+            i++;
+            retval = i * i;
+          }
+          return i - 1;
+        }
+        int16_t meanVal()
+        {
+          if (filledElems)
+          {
+              int sum = 0;
+              for (uint8_t i=0; i<filledElems; i++)
+                  sum += buffer[i];
+              return (int16_t)(sum/filledElems);
+          } else
+              return 0;
+        }
+
+      public:
+        Stats() {}
+
+        void clear()
+        {
+          writePos = 0;
+          filledElems = 0;
+        }
+
+        // Always accept new data, discard old
+        void write(int16_t value)
+        {
+          buffer[writePos] = value;
+          writePos = (writePos + 1) % STATSDEPTH;
+          if (filledElems < STATSDEPTH)
+            filledElems++;
+        }
+
+        uint16_t maxDev()
+        {
+          if (filledElems)
+          {
+              uint16_t ret = 0;
+              for (uint8_t i=0; i<filledElems; i++)
+                  ret = max<uint16_t>(ret, abs(buffer[i] - meanVal()));
+              return ret;
+          } else
+              return 0;
+        }
+
+        int16_t stdDev()
+        {
+          if (filledElems)
+          {
+              int16_t mean=meanVal();
+              int calc = 0;
+              for (uint8_t i=0; i<filledElems; i++)
+                  calc += (buffer[i] - mean)*(buffer[i] - mean);
+              calc = intSqrt((int16_t)(calc/filledElems));
+              return (int16_t)calc;
+          } else
+              return 0;
+        }
+    };
+    bool ClearStats = true;
+
+  public:
+    AnaFilteredDevViewWindow(Window * parent, const rect_t & rect):
+      Window(parent, rect) {}
+
+    void checkEvents() override
+    {
+      // will always force a full monitor window refresh
+      invalidate();
+    }
+
+    void paint(BitmapBuffer * dc) override
+    {
+        static Stats stats[NUM_STICKS+NUM_POTS+NUM_SLIDERS];
+
+        if (ClearStats)
+        {
+            for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                stats[i].clear();
+            }
+            ClearStats = false;
+        }
+
+#if !defined(SIMU) && (defined(RADIO_FAMILY_T16) || defined(PCBNV14))
+          if (globalData.flyskygimbals)
+          {
+              for (uint8_t i = 0; i < FLYSKY_HALL_CHANNEL_COUNT; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + i * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  stats[i].write(hall_raw_values[i]);
+                  dc->drawNumber(x + VALUE_X_OFFSET, y, hall_raw_values[i], RIGHT | COLOR_THEME_PRIMARY1); // no need to use calculated mean for FlySky - the output is stable enough to display directly
+                  dc->drawNumber(dc->drawText(x + DEV_X_OFFSET, y, " +/- ", COLOR_THEME_PRIMARY1), y, stats[i].maxDev(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+
+              for (uint8_t i = FLYSKY_HALL_CHANNEL_COUNT; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + i * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":",  COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  stats[i].write(getAnalogValue(i));
+                  extern uint32_t s_anaFilt[NUM_ANALOGS];
+                  dc->drawNumber(x + VALUE_X_OFFSET, y, s_anaFilt[i]/JITTER_ALPHA, RIGHT | COLOR_THEME_PRIMARY1); // use integrated filter
+                  dc->drawNumber(dc->drawText(x + DEV_X_OFFSET, y, " +/- ", COLOR_THEME_PRIMARY1), y, stats[i].maxDev(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+          }
+#endif
+
+          if (!globalData.flyskygimbals) // Also Simulator
+          {
+              for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + i * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  stats[i].write(getAnalogValue(i));
+                  #if !defined(SIMU)
+                    extern uint32_t s_anaFilt[NUM_ANALOGS];
+                    dc->drawNumber(x + VALUE_X_OFFSET, y, s_anaFilt[i]/JITTER_ALPHA, RIGHT | COLOR_THEME_PRIMARY1); // use integrated filter
+                  #else
+                    dc->drawNumber(x + VALUE_X_OFFSET, y, anaIn(i), RIGHT | COLOR_THEME_PRIMARY1); // for simu, can use directly the input values without filtering
+                  #endif
+                  dc->drawNumber(dc->drawText(x + DEV_X_OFFSET, y, " +/- ", COLOR_THEME_PRIMARY1), y, stats[i].maxDev(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+          }
+    };
+};
+
+class AnaUnfilteredRawViewWindow: public Window {
+  public:
+    AnaUnfilteredRawViewWindow(Window * parent, const rect_t & rect):
+      Window(parent, rect)
+    {
+    }
+
+    void checkEvents() override
+    {
+      // will always force a full monitor window refresh
+      invalidate();
+    }
+
+    void paint(BitmapBuffer * dc) override
+    {
+#if !defined(SIMU) && (defined(RADIO_FAMILY_T16) || defined(PCBNV14))
+        if (globalData.flyskygimbals)
+        {
+            for (uint8_t i = 0; i < FLYSKY_HALL_CHANNEL_COUNT; i++) {
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
+                dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, hall_raw_values[i], RIGHT | COLOR_THEME_PRIMARY1);
+            }
+
+            for (uint8_t i = FLYSKY_HALL_CHANNEL_COUNT; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
+                dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                dc->drawText(x + 2 * 15 - 2, y, ":",  COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, getAnalogValue(i), RIGHT | COLOR_THEME_PRIMARY1);
+            }
+        }
 #endif
+
+        if (!globalData.flyskygimbals) // Also Simulator
+        {
+            for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                #if LCD_W > LCD_H
+                  coord_t y = 1 + (i / 2) * FH;
+                  uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                #else
+                  coord_t y = 1 + i * FH;
+                  uint8_t x = 10;
+                #endif
+                dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                dc->drawNumber(x + VALUE_X_OFFSET, y, getAnalogValue(i), RIGHT | COLOR_THEME_PRIMARY1);
+            }
+        }
     };
 
   protected:
 };
 
-void RadioAnalogsDiagsPage::buildHeader(Window * window)
+class AnaMinMaxViewWindow: public Window {
+  protected:
+    class MinMax {
+      protected:
+        bool noElements = true;
+        int16_t minvalue = INT16_MAX;
+        int16_t maxvalue = INT16_MIN;
+
+      public:
+        MinMax() {}
+
+        void clear()
+        {
+          minvalue = INT16_MAX;
+          maxvalue = INT16_MIN;
+        }
+
+        // Always accept new data, discard old
+        void write(int16_t value)
+        {
+          if (value < minvalue)
+              minvalue = value;
+          if (value > maxvalue)
+              maxvalue = value;
+        }
+
+        int16_t MinVal()
+        {
+            return minvalue;
+        }
+
+        int16_t MaxVal()
+        {
+            return maxvalue;
+        }
+
+        uint16_t Range()
+        {
+            if (maxvalue > minvalue)
+                return (uint16_t)(maxvalue - minvalue);
+            else
+                return 0;
+        }
+    };
+    bool ClearStats = true;
+
+  public:
+    AnaMinMaxViewWindow(Window * parent, const rect_t & rect):
+      Window(parent, rect) {}
+
+    void checkEvents() override
+    {
+      // will always force a full monitor window refresh
+      invalidate();
+    }
+
+    void paint(BitmapBuffer * dc) override
+    {
+        static MinMax minmax[NUM_STICKS+NUM_POTS+NUM_SLIDERS];
+
+        if (ClearStats)
+        {
+            for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                minmax[i].clear();
+            }
+            ClearStats = false;
+        }
+        dc->drawText(10, 1, STR_ANADIAGS_MOVE, COLOR_THEME_PRIMARY1);
+
+#if !defined(SIMU) && (defined(RADIO_FAMILY_T16) || defined(PCBNV14))
+          if (globalData.flyskygimbals)
+          {
+              for (uint8_t i = 0; i < FLYSKY_HALL_CHANNEL_COUNT; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2 + 1) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + (i + 1) * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  minmax[i].write(hall_raw_values[i]);
+                  dc->drawNumber(x + MIN_X_OFFSET, y, minmax[i].MinVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + MAX_X_OFFSET, y, minmax[i].MaxVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + RANGE_X_OFFSET, y, minmax[i].Range(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+
+              for (uint8_t i = FLYSKY_HALL_CHANNEL_COUNT; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2 + 1) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + (i + 1) * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":",  COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  minmax[i].write(getAnalogValue(i));
+                  dc->drawNumber(x + MIN_X_OFFSET, y, minmax[i].MinVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + MAX_X_OFFSET, y, minmax[i].MaxVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + RANGE_X_OFFSET, y, minmax[i].Range(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+          }
+#endif
+
+          if (!globalData.flyskygimbals) // Also Simulator
+          {
+              for (uint8_t i = 0; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) {
+                  #if LCD_W > LCD_H
+                    coord_t y = 1 + (i / 2 + 1) * FH;
+                    uint8_t x = i & 1 ? LCD_W / 2 + 10 : 10;
+                  #else
+                    coord_t y = 1 + (i + 1) * FH;
+                    uint8_t x = 10;
+                  #endif
+                  dc->drawNumber(x, y, i + 1, LEADING0 | LEFT | COLOR_THEME_PRIMARY1, 2);
+                  dc->drawText(x + 2 * 15 - 2, y, ":", COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + CA_X_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT | COLOR_THEME_PRIMARY1);
+                  minmax[i].write(getAnalogValue(i));
+                  dc->drawNumber(x + MIN_X_OFFSET, y, minmax[i].MinVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + MAX_X_OFFSET, y, minmax[i].MaxVal(), RIGHT | COLOR_THEME_PRIMARY1);
+                  dc->drawNumber(x + RANGE_X_OFFSET, y, minmax[i].Range(), LEFT | COLOR_THEME_PRIMARY1);
+              }
+          }
+    };
+};
+
+void AnaCalibratedViewPage::build(FormWindow *window)
+{
+    new AnaCalibratedViewWindow(window, {10, 10, window->width() - 10, window->height() - 10});
+}
+
+void AnaFilteredDevViewPage::build(FormWindow *window)
 {
-  new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_ANALOGS, 0, COLOR_THEME_PRIMARY2);
+    new AnaFilteredDevViewWindow(window, {10, 10, window->width() - 10, window->height() - 10});
 }
 
-void RadioAnalogsDiagsPage::buildBody(Window * window)
+void AnaUnfilteredRawViewPage::build(FormWindow *window)
 {
-  new RadioAnalogsDiagsWindow(window, {10, 10, window->width() - 10, window->height() - 10});
+    new AnaUnfilteredRawViewWindow(window, {10, 10, window->width() - 10, window->height() - 10});
 }
 
-RadioAnalogsDiagsPage::RadioAnalogsDiagsPage():
-  Page(ICON_MODEL_SETUP)
+void AnaMinMaxViewPage::build(FormWindow *window)
 {
-  buildHeader(&header);
-  buildBody(&body);
-  setFocus(SET_FOCUS_DEFAULT);
+    new AnaMinMaxViewWindow(window, {10, 10, window->width() - 10, window->height() - 10});
 }
diff --git a/radio/src/gui/colorlcd/radio_diaganas.h b/radio/src/gui/colorlcd/radio_diaganas.h
index a29e229e736..a772c86d72c 100644
--- a/radio/src/gui/colorlcd/radio_diaganas.h
+++ b/radio/src/gui/colorlcd/radio_diaganas.h
@@ -19,14 +19,52 @@
  * GNU General Public License for more details.
  */
 
-#include "page.h"
+#pragma once
 
-class RadioAnalogsDiagsPage: public Page {
-  public:
-    explicit RadioAnalogsDiagsPage();
+#include "font.h"
+#include "opentx.h"
+#include "static.h"
+#include "tabsgroup.h"
+#include "window.h"
 
-  protected:
-    void buildHeader(Window * window);
-    void buildBody(Window * window);
+class RadioAnalogsDiagsViewPageGroup : public TabsGroup
+{
+ public:
+  RadioAnalogsDiagsViewPageGroup();
 };
 
+class AnaCalibratedViewPage : public PageTab
+{
+ public:
+  AnaCalibratedViewPage() : PageTab(STR_ANADIAGS_CALIB, ICON_STATS_ANALOGS) {}
+
+ protected:
+  void build(FormWindow* window) override;
+};
+
+class AnaFilteredDevViewPage : public PageTab
+{
+ public:
+  AnaFilteredDevViewPage() : PageTab(STR_ANADIAGS_FILTRAWDEV, ICON_STATS_THROTTLE_GRAPH) {}
+
+ protected:
+  void build(FormWindow* window) override;
+};
+
+class AnaUnfilteredRawViewPage : public PageTab
+{
+ public:
+  AnaUnfilteredRawViewPage() : PageTab(STR_ANADIAGS_UNFILTRAW, ICON_RADIO_HARDWARE) {}
+
+ protected:
+  void build(FormWindow* window) override;
+};
+
+class AnaMinMaxViewPage : public PageTab
+{
+ public:
+  AnaMinMaxViewPage() : PageTab(STR_ANADIAGS_MINMAX, ICON_RADIO_CALIBRATION) {}
+
+ protected:
+  void build(FormWindow* window) override;
+};
diff --git a/radio/src/gui/colorlcd/radio_ghost_module_config.cpp b/radio/src/gui/colorlcd/radio_ghost_module_config.cpp
index 0fc09516031..2bd04dee28e 100644
--- a/radio/src/gui/colorlcd/radio_ghost_module_config.cpp
+++ b/radio/src/gui/colorlcd/radio_ghost_module_config.cpp
@@ -34,8 +34,13 @@ class GhostModuleConfigWindow: public Window
 
     void paint(BitmapBuffer * dc) override
     {
+#if LCD_H > LCD_W
+      constexpr coord_t xOffset = 20;
+      constexpr coord_t xOffset2 = 140;
+#else
       constexpr coord_t xOffset = 140;
       constexpr coord_t xOffset2 = 260;
+#endif
       constexpr coord_t yOffset = 20;
       constexpr coord_t lineSpacing = 25;
 
@@ -84,6 +89,9 @@ RadioGhostModuleConfig::RadioGhostModuleConfig(uint8_t moduleIdx) :
   buildHeader(&header);
   buildBody(&body);
   setFocus(SET_FOCUS_DEFAULT);
+#if defined(TRIMS_EMULATE_BUTTONS)
+  setTrimsAsButtons(true);  // Use trim joysticks to operate menu (e.g. on NV14)
+#endif
 }
 
 void RadioGhostModuleConfig::buildHeader(Window * window)
@@ -102,19 +110,23 @@ void RadioGhostModuleConfig::onEvent(event_t event)
   switch (event) {
 #if defined(ROTARY_ENCODER_NAVIGATION)
     case EVT_ROTARY_LEFT:
+#else
+    case EVT_KEY_BREAK(KEY_UP):
+#endif
       reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYUP;
       reusableBuffer.ghostMenu.menuAction = GHST_MENU_CTRL_NONE;
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
       break;
-#endif
 
 #if defined(ROTARY_ENCODER_NAVIGATION)
     case EVT_ROTARY_RIGHT:
+#else
+    case EVT_KEY_BREAK(KEY_DOWN):
+#endif
       reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYDOWN;
       reusableBuffer.ghostMenu.menuAction = GHST_MENU_CTRL_NONE;
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
       break;
-#endif
 
     case EVT_KEY_FIRST(KEY_ENTER):
       reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYPRESS;
@@ -135,6 +147,9 @@ void RadioGhostModuleConfig::onEvent(event_t event)
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
       RTOS_WAIT_MS(10);
       Page::onEvent(event);
+#if defined(TRIMS_EMULATE_BUTTONS)
+      setTrimsAsButtons(false);  // switch trims back to normal
+#endif
       break;
   }
 }
@@ -151,6 +166,9 @@ void RadioGhostModuleConfig::checkEvents()
   else if (reusableBuffer.ghostMenu.menuStatus == GHST_MENU_STATUS_CLOSING) {
     RTOS_WAIT_MS(10);
     deleteLater();
+#if defined(TRIMS_EMULATE_BUTTONS)
+    setTrimsAsButtons(false);  // switch trims back to normal
+#endif
   }
 }
 #endif
diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp
index 2abd4122645..72e217bc4eb 100644
--- a/radio/src/gui/colorlcd/radio_hardware.cpp
+++ b/radio/src/gui/colorlcd/radio_hardware.cpp
@@ -414,7 +414,7 @@ void RadioHardwarePage::build(FormWindow * window)
   new StaticText(window, grid.getLabelSlot(), STR_DEBUG, 0, COLOR_THEME_PRIMARY1 | FONT(BOLD));
   auto debugAnas = new TextButton(window, grid.getFieldSlot(2, 0), STR_ANALOGS_BTN);
   debugAnas->setPressHandler([=]() -> uint8_t {
-      auto debugAnalogsPage = new RadioAnalogsDiagsPage();
+      auto debugAnalogsPage = new RadioAnalogsDiagsViewPageGroup();
       debugAnalogsPage->setCloseHandler([=]() {
           calib->setFocus(SET_FOCUS_DEFAULT);
       });
diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/view_text.cpp
index de7f2cc6fbc..e7fb6067351 100644
--- a/radio/src/gui/colorlcd/view_text.cpp
+++ b/radio/src/gui/colorlcd/view_text.cpp
@@ -26,17 +26,17 @@
 #include "sdcard.h"
 
 #define CASE_EVT_KEY_NEXT_LINE \
-  case EVT_ROTARY_RIGHT: \
+  case EVT_ROTARY_RIGHT:       \
   case EVT_KEY_BREAK(KEY_PGDN)
 //  case EVT_KEY_BREAK(KEY_DOWN)
 
 #define CASE_EVT_KEY_PREVIOUS_LINE \
-  case EVT_ROTARY_LEFT: \
-  case EVT_KEY_BREAK(KEY_PGUP): \
+  case EVT_ROTARY_LEFT:            \
+  case EVT_KEY_BREAK(KEY_PGUP):    \
   case EVT_KEY_BREAK(KEY_UP)
 
-#define CASE_EVT_START \
-  case EVT_ENTRY: \
+#define CASE_EVT_START           \
+  case EVT_ENTRY:                \
   case EVT_KEY_BREAK(KEY_ENTER): \
   case EVT_KEY_BREAK(KEY_TELEM)
 
@@ -54,138 +54,6 @@ void ViewTextWindow::extractNameSansExt()
   name.substr(nameLength);
 }
 
-#if READ_FILE_BY_LINE
-void ViewTextWindow::buildBody(Window *window)
-{
-  GridLayout grid(window);
-  grid.spacer();
-  int i;
-
-  // assume average characte is 10 pixels wide, round the string length to tens.
-  // Font is not fixed width, so this is for the worst case...
-  const int maxLineLength = static_cast<int>(window->width() / 10 / 10) * 10 - 2;
-  window->setFocus();
-
-  FIL file;
-  if (FR_OK !=
-      f_open(&file, (TCHAR *)fullPath.c_str(), FA_OPEN_EXISTING | FA_READ)) {
-    return;
-  }
-  readCount = 0;
-  longestLine = 0;
-  lastLine = false;
-  for (i = 0; i < TEXT_FILE_MAXSIZE && !lastLine; i++) {
-    lastLine =
-        sdReadTextLine(&file, reusableBuffer.viewText.lines[0], maxLineLength);
-
-    new StaticText(window, grid.getSlot(), reusableBuffer.viewText.lines[0]);
-    grid.nextLine();
-  }
-
-  f_close(&file);
-
-  window->setInnerWidth((longestLine + 4) * 10);
-  window->setInnerHeight(grid.getWindowHeight());
-}
-
-void ViewTextWindow::checkEvents()
-{
-  if (&body == Window::focusWindow) {
-    const int step = PAGE_LINE_HEIGHT + PAGE_LINE_SPACING;
-    coord_t currentPos = body.getScrollPositionY();
-    coord_t deltaY;
-    event_t event = getWindowEvent();
-
-#if defined(ROTARY_ENCODER_NAVIGATION)		
-    if (event == EVT_ROTARY_LEFT || event == EVT_ROTARY_RIGHT) {
-      deltaY = ROTARY_ENCODER_SPEED() * step;
-    } else {
-      deltaY = step;
-    }
-#else
-      deltaY = step;
-#endif
-    switch (event) {
-    CASE_EVT_KEY_NEXT_LINE:
-      currentPos += deltaY;
-      break;
-
-    CASE_EVT_KEY_PREVIOUS_LINE:
-      currentPos -= deltaY;
-      break;
-
-      default:
-        Page::onEvent(event);
-        return;
-    }
-    body.setScrollPositionY(currentPos);
-  }
-  Page::checkEvents();
-}
-
-bool ViewTextWindow::sdReadTextLine(FIL *file, char line[],
-                                    const uint8_t maxLineLength)
-{
-  char c;
-  unsigned int sz;
-  uint8_t line_length = 0;
-  uint8_t escape = 0;
-  char escape_chars[4] = {0};
-  int current_line = 0;
-
-  memclear(line, maxLineLength + 1);
-  line[line_length++] = 0x20;
-
-  for (uint8_t i = 0; i < maxLineLength && readCount < (int)TEXT_FILE_MAXSIZE;
-       ++i) {
-    if ((f_read(file, &c, 1, &sz) != FR_OK || !sz) &&
-        line_length < maxLineLength) {
-      return true;
-    }
-    readCount++;
-
-    if (c == '\n') {
-      ++current_line;
-      escape = 0;
-      return false;
-    } else if (c != '\r') {
-      if (c == '\\' && escape == 0) {
-        escape = 1;
-        continue;
-      } else if (c != '\\' && escape > 0 && escape < sizeof(escape_chars)) {
-        escape_chars[escape - 1] = c;
-        if (escape == 2 && !strncmp(escape_chars, "up", 2)) {
-          c = CHAR_UP;
-        } else if (escape == 2 && !strncmp(escape_chars, "dn", 2)) {
-          c = CHAR_DOWN;
-        } else if (escape == 3) {
-          int val = atoi(escape_chars);
-          if (val >= 200 && val < 225) {
-            c = '\200' + val - 200;
-          }
-        } else {
-          escape++;
-          continue;
-        }
-      } else if (c == '~') {
-        c = 'z' + 1;
-      } else if (c == '\t') {
-        c = 0x1D;  // tab
-      }
-      escape = 0;
-      line[line_length++] = c;
-      if (longestLine < line_length) longestLine = line_length;
-    }
-  }
-  if (c != '\n') {
-    current_line += 1;
-    return false;
-  }
-
-  return false;
-}
-#else
-
 void ViewTextWindow::buildBody(Window *window)
 {
   GridLayout grid(window);
@@ -199,27 +67,25 @@ void ViewTextWindow::buildBody(Window *window)
   window->setFocus();
   readLinesCount = 0;
   lastLoadedLine = 0;
-  
-  lines = new char*[maxScreenLines];
-  for(i = 0 ; i < maxScreenLines; i++)
-  {
+
+  lines = new char *[maxScreenLines];
+  for (i = 0; i < maxScreenLines; i++) {
     lines[i] = new char[maxLineLength + 1];
     memclear(lines[i], maxLineLength + 1);
-  } 
- 
+  }
+
   longestLine = 0;
   loadFirstScreen();
-  
-  if(isInSetup == true)
-  {
+
+  if (isInSetup == true) {
     textBottom = false;
-    while(!textBottom)
-    {
+    while (!textBottom) {
       sdReadTextFileBlock(fullPath.c_str(), readLinesCount);
       textVerticalOffset += 10;
     }
-    maxPos = (maxLines - maxScreenLines) * (PAGE_LINE_HEIGHT + PAGE_LINE_SPACING);
-    if(maxPos < body.getRect().h)     maxPos = body.getRect().h;
+    maxPos =
+        (maxLines - maxScreenLines) * (PAGE_LINE_HEIGHT + PAGE_LINE_SPACING);
+    if (maxPos < body.getRect().h) maxPos = body.getRect().h;
   }
 
   isInSetup = false;
@@ -227,7 +93,8 @@ void ViewTextWindow::buildBody(Window *window)
 
   for (i = 0; i < maxScreenLines; i++) {
     new DynamicText(window, grid.getSlot(), [=]() {
-      std::string str = (lines[i][0]) ? std::string(lines[i]) : std::string(" ");
+      std::string str =
+          (lines[i][0]) ? std::string(lines[i]) : std::string(" ");
       return std::string(str);
     });
     grid.nextLine();
@@ -247,8 +114,8 @@ bool ViewTextWindow::onTouchSlide(coord_t x, coord_t y, coord_t startX,
     textVerticalOffset += lineStep;
     if (textVerticalOffset < 0) textVerticalOffset = 0;
 
-  //  if (textBottom && lineStep > 0) textVerticalOffset -= lineStep;
-    if(textVerticalOffset > maxLines) textVerticalOffset = maxLines;  
+    //  if (textBottom && lineStep > 0) textVerticalOffset -= lineStep;
+    if (textVerticalOffset > maxLines) textVerticalOffset = maxLines;
     sdReadTextFileBlock(fullPath.c_str(), readLinesCount);
   }
   return Page::onTouchSlide(x, y, startX, startY, slideX, slideY);
@@ -262,27 +129,19 @@ void ViewTextWindow::checkEvents()
     coord_t deltaY;
     event_t event = getWindowEvent();
 
-#if defined(ROTARY_ENCODER_NAVIGATION)		
+#if defined(ROTARY_ENCODER_NAVIGATION)
     if (event == EVT_ROTARY_LEFT || event == EVT_ROTARY_RIGHT) {
       deltaY = ROTARY_ENCODER_SPEED() * step;
     } else {
       deltaY = step;
     }
 #else
-      deltaY = step;
+    deltaY = step;
 #endif
-			
+
     int lineStep = deltaY / step;
-    if(lineStep > (maxScreenLines >> 1)) lineStep = maxScreenLines >> 1;
-/*
-    if(event) {
-      sprintf(lines[0], "Received event %d", event);
-      if(!readLinesCount)
-        readLinesCount = 1;
-      Page::onEvent(event);
-      return;
-    }
-*/
+    if (lineStep > (maxScreenLines >> 1)) lineStep = maxScreenLines >> 1;
+
     switch (event) {
     CASE_EVT_START:
       textVerticalOffset = 0;
@@ -291,11 +150,11 @@ void ViewTextWindow::checkEvents()
       break;
 
     CASE_EVT_KEY_NEXT_LINE:
-      if(textBottom && textVerticalOffset)  //(textVerticalOffset + maxScreenLines - 1 >= readLinesCount)
+      if (textBottom && textVerticalOffset)
         break;
       else {
         textVerticalOffset += lineStep;
-        if(textVerticalOffset > maxLines) textVerticalOffset = maxLines;
+        if (textVerticalOffset > maxLines) textVerticalOffset = maxLines;
       }
       sdReadTextFileBlock(fullPath.c_str(), readLinesCount);
       break;
@@ -305,7 +164,7 @@ void ViewTextWindow::checkEvents()
         break;
       else {
         textVerticalOffset -= lineStep;
-        if(textVerticalOffset < 0)  textVerticalOffset = 0;
+        if (textVerticalOffset < 0) textVerticalOffset = 0;
       }
 
       sdReadTextFileBlock(fullPath.c_str(), readLinesCount);
@@ -338,7 +197,7 @@ void ViewTextWindow::sdReadTextFileBlock(const char *filename, int &lines_count)
   int current_line = 0;
   textBottom = false;
 
-  for(int i = 0; i < maxScreenLines; i++) {
+  for (int i = 0; i < maxScreenLines; i++) {
     memclear(lines[i], maxLineLength + 1);
     lines[i][0] = ' ';
   }
@@ -354,10 +213,10 @@ void ViewTextWindow::sdReadTextFileBlock(const char *filename, int &lines_count)
         ++current_line;
         line_length = 1;
         escape = 0;
-      } 
+      }
       if (c != '\r' && c != '\n' && current_line >= textVerticalOffset &&
-                 current_line - textVerticalOffset < maxScreenLines &&
-                 line_length < maxLineLength) {
+          current_line - textVerticalOffset < maxScreenLines &&
+          line_length < maxLineLength) {
         if (c == '\\' && escape == 0) {
           escape = 1;
           continue;
@@ -376,17 +235,16 @@ void ViewTextWindow::sdReadTextFileBlock(const char *filename, int &lines_count)
             escape++;
             continue;
           }
-        }
-        else if (c == '~') {
+        } else if (c == '~') {
           c = 'z' + 1;
         } else if (c == '\t') {
           c = 0x1D;  // tab
         }
         escape = 0;
-        
+
         lines[current_line - textVerticalOffset][line_length++] = c;
         if (longestLine < line_length) longestLine = line_length;
-      } else if(current_line < textVerticalOffset) {
+      } else if (current_line < textVerticalOffset) {
         ++line_length;
       }
     }
@@ -402,8 +260,7 @@ void ViewTextWindow::sdReadTextFileBlock(const char *filename, int &lines_count)
     f_close(&file);
   }
 
-  if(lastLoadedLine < textVerticalOffset)
-    lastLoadedLine = textVerticalOffset;
+  if (lastLoadedLine < textVerticalOffset) lastLoadedLine = textVerticalOffset;
 
   if (lines_count == 0) {
     lines_count = current_line;
@@ -414,7 +271,7 @@ void ViewTextWindow::drawVerticalScrollbar(BitmapBuffer *dc)
 {
   int readPos = textVerticalOffset * (PAGE_LINE_HEIGHT + PAGE_LINE_SPACING);
 
-  if(readPos < header.getRect().h << 1)  readPos = header.getRect().h << 1;
+  if (readPos < header.getRect().h << 1) readPos = header.getRect().h << 1;
 
   coord_t yofs = divRoundClosest(body.getRect().h * readPos, maxPos);
   coord_t yhgt = divRoundClosest(body.getRect().h * body.getRect().h, maxPos);
@@ -424,34 +281,31 @@ void ViewTextWindow::drawVerticalScrollbar(BitmapBuffer *dc)
                           SCROLLBAR_WIDTH, yhgt, COLOR_THEME_PRIMARY3);
 }
 
-#endif
-
 #include "datastructs.h"
 
-static void replaceSpaceWithUnderscore(std::string& name)
+static void replaceSpaceWithUnderscore(std::string &name)
 {
   size_t index;
   do {
     index = name.find(' ');
-    if(index != std::string::npos)
-      name[index] = '_';
+    if (index != std::string::npos) name[index] = '_';
   } while (index != std::string::npos);
 }
 
 #if defined(SDCARD_YAML)
-#define MODEL_FILE_EXT  YAML_EXT
+#define MODEL_FILE_EXT YAML_EXT
 #else
-#define MODEL_FILE_EXT  MODELS_EXT
+#define MODEL_FILE_EXT MODELS_EXT
 #endif
 
 bool openNotes(const char buf[], std::string modelNotesName)
 {
-  if(isFileAvailable(modelNotesName.c_str())) { 
-    new ViewTextWindow(std::string(buf), modelNotesName, ICON_MODEL);  
+  if (isFileAvailable(modelNotesName.c_str())) {
+    new ViewTextWindow(std::string(buf), modelNotesName, ICON_MODEL);
     return true;
-   } else {
-     return false;
-   }  
+  } else {
+    return false;
+  }
 }
 void readModelNotes()
 {
@@ -461,25 +315,24 @@ void readModelNotes()
   std::string modelNotesName(g_model.header.name);
   modelNotesName.append(TEXT_EXT);
   const char buf[] = {MODELS_PATH};
-  f_chdir((TCHAR*)buf);
+  f_chdir((TCHAR *)buf);
 
   notesFound = openNotes(buf, modelNotesName);
-  if(!notesFound) {
+  if (!notesFound) {
     replaceSpaceWithUnderscore(modelNotesName);
     notesFound = openNotes(buf, modelNotesName);
   }
 
-#if !defined(EEPROM) 
-  if(!notesFound) {   
+#if !defined(EEPROM)
+  if (!notesFound) {
     modelNotesName.assign(g_eeGeneral.currModelFilename);
     size_t index = modelNotesName.find(MODEL_FILE_EXT);
-    if(index != std::string::npos)
-    {
+    if (index != std::string::npos) {
       modelNotesName.erase(index);
       modelNotesName.append(TEXT_EXT);
       notesFound = openNotes(buf, modelNotesName);
     }
-    if(!notesFound) {
+    if (!notesFound) {
       replaceSpaceWithUnderscore(modelNotesName);
       notesFound = openNotes(buf, modelNotesName);
     }
diff --git a/radio/src/gui/colorlcd/view_text.h b/radio/src/gui/colorlcd/view_text.h
index 99617019f4e..ee6754b7f88 100644
--- a/radio/src/gui/colorlcd/view_text.h
+++ b/radio/src/gui/colorlcd/view_text.h
@@ -20,24 +20,20 @@
 
 #pragma once
 
-#include "page.h"
-#include "static.h"
+#include "ff.h"
 #include "lcd.h"
 #include "menus.h"
-#include "ff.h"
-
-#define READ_FILE_BY_LINE 0
+#include "page.h"
+#include "static.h"
 
 constexpr uint16_t TEXT_FILE_MAXSIZE = 20480;
 
 class ViewTextWindow : public Page
 {
  public:
-  ViewTextWindow(const std::string iPath, const std::string iName, unsigned int icon = ICON_RADIO_SD_MANAGER) :
-      Page(icon),
-      path(std::move(iPath)),
-      name(std::move(iName)),
-      icon(icon)
+  ViewTextWindow(const std::string iPath, const std::string iName,
+                 unsigned int icon = ICON_RADIO_SD_MANAGER) :
+      Page(icon), path(std::move(iPath)), name(std::move(iName)), icon(icon)
   {
     fullPath = path + std::string("/") + name;
     extractNameSansExt();
@@ -46,41 +42,35 @@ class ViewTextWindow : public Page
     maxPos = 0;
     maxLines = 0;
     isInSetup = true;
-    //body.setWindowFlags(FORWARD_SCROLL);
     header.setWindowFlags(NO_SCROLLBAR);
-    
+
     buildHeader(&header);
     buildBody(&body);
   };
 
-#if READ_FILE_BY_LINE
-  bool sdReadTextLine(FIL* file, char lines[],
-                      const uint8_t lineLength = LCD_COLS); 
-#else
-  void sdReadTextFileBlock(const char * filename, int& lines_count); 
+  void sdReadTextFileBlock(const char* filename, int& lines_count);
   void loadFirstScreen(void);
- #if defined(HARDWARE_TOUCH)
-    bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY) override;
-#endif 
-  void drawVerticalScrollbar(BitmapBuffer * dc);
+#if defined(HARDWARE_TOUCH)
+  bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
+                    coord_t slideX, coord_t slideY) override;
+#endif
+  void drawVerticalScrollbar(BitmapBuffer* dc);
 
   ~ViewTextWindow()
   {
-    if(lines != nullptr) {
-      for(int i = 0; i < maxScreenLines; i++)
-      {
+    if (lines != nullptr) {
+      for (int i = 0; i < maxScreenLines; i++) {
         delete[] lines[i];
       }
       delete[] lines;
     }
-  }  
+  }
 
   void paint(BitmapBuffer* dc) override
   {
     Page::paint(dc);
     drawVerticalScrollbar(dc);
-  }        
-#endif                           
+  }
   void checkEvents() override;
 
 #if defined(DEBUG_WINDOWS)
@@ -98,23 +88,20 @@ class ViewTextWindow : public Page
   uint16_t readCount;
   int longestLine;
 
-#if !READ_FILE_BY_LINE
-char** lines = nullptr;
-//char lines[15][80];
-int maxScreenLines;
-int maxLineLength;
-int textVerticalOffset;
-int readLinesCount;
-int lastLoadedLine;
-int maxPos;
-int maxLines;
-bool textBottom;
-bool isInSetup;
-#endif
+  char** lines = nullptr;
+  int maxScreenLines;
+  int maxLineLength;
+  int textVerticalOffset;
+  int readLinesCount;
+  int lastLoadedLine;
+  int maxPos;
+  int maxLines;
+  bool textBottom;
+  bool isInSetup;
 
   void extractNameSansExt(void);
-  void buildBody(Window *window);
-  void buildHeader(Window *window)
+  void buildBody(Window* window);
+  void buildHeader(Window* window)
   {
     new StaticText(window,
                    {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10,
diff --git a/radio/src/hal/adc_driver.cpp b/radio/src/hal/adc_driver.cpp
index a02c3a78bca..4ffcfe784c5 100644
--- a/radio/src/hal/adc_driver.cpp
+++ b/radio/src/hal/adc_driver.cpp
@@ -197,7 +197,7 @@ uint16_t getAnalogValue(uint8_t index)
   index = adcMapping[index];
 #endif
   if (adcDirection[index] < 0)
-    return 4095 - adcValues[index];
+    return ADCMAXVALUE - adcValues[index];
   else
     return adcValues[index];
 }
diff --git a/radio/src/hal/adc_driver.h b/radio/src/hal/adc_driver.h
index 51edf676946..8c67af9245b 100644
--- a/radio/src/hal/adc_driver.h
+++ b/radio/src/hal/adc_driver.h
@@ -39,6 +39,8 @@
   #define NUM_ANALOGS_ADC              NUM_ANALOGS
 #endif
 
+#define ADCMAXVALUE                    4095
+
 // TODO: get rid of this special case
 #if defined(PCBX10) || defined(PCBX12S)
 extern uint16_t rtcBatteryVoltage;
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 0e3d1eb261c..51ea419fa82 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1063,15 +1063,7 @@ JitterMeter<uint16_t> avgJitter[NUM_ANALOGS];
 tmr10ms_t jitterResetTime = 0;
 #endif
 
-#define JITTER_FILTER_STRENGTH  4         // tune this value, bigger value - more filtering (range: 1-5) (see explanation below)
-#define ANALOG_SCALE            1         // tune this value, bigger value - more filtering (range: 0-1) (see explanation below)
-
-#define JITTER_ALPHA            (1<<JITTER_FILTER_STRENGTH)
-#define ANALOG_MULTIPLIER       (1<<ANALOG_SCALE)
 #define ANA_FILT(chan)          (s_anaFilt[chan] / (JITTER_ALPHA * ANALOG_MULTIPLIER))
-#if (JITTER_ALPHA * ANALOG_MULTIPLIER > 32)
-  #error "JITTER_FILTER_STRENGTH and ANALOG_SCALE are too big, their summ should be <= 5 !!!"
-#endif
 
 #if !defined(SIMU)
 uint16_t anaIn(uint8_t chan)
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 2cb7132f9a0..f79fd1b2bb8 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1262,6 +1262,15 @@ extern Clipboard clipboard;
 extern uint32_t s_anaFilt[NUM_ANALOGS];
 #endif
 
+#define JITTER_FILTER_STRENGTH  4         // tune this value, bigger value - more filtering (range: 1-5) (see explanation below)
+#define ANALOG_SCALE            1         // tune this value, bigger value - more filtering (range: 0-1) (see explanation below)
+
+#define JITTER_ALPHA            (1<<JITTER_FILTER_STRENGTH)
+#define ANALOG_MULTIPLIER       (1<<ANALOG_SCALE)
+#if (JITTER_ALPHA * ANALOG_MULTIPLIER > 32)
+  #error "JITTER_FILTER_STRENGTH and ANALOG_SCALE are too big, their summ should be <= 5 !!!"
+#endif
+
 #if defined(JITTER_MEASURE)
 extern JitterMeter<uint16_t> rawJitter[NUM_ANALOGS];
 extern JitterMeter<uint16_t> avgJitter[NUM_ANALOGS];
diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt
index 535ad60eff8..93e233d1f41 100644
--- a/radio/src/targets/common/arm/CMakeLists.txt
+++ b/radio/src/targets/common/arm/CMakeLists.txt
@@ -21,7 +21,6 @@ option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger
 option(DEBUG_INTERRUPTS "Count interrupts" OFF)
 option(DEBUG_LATENCY "Debug latency" OFF)
 option(DEBUG_USB_INTERRUPTS "Count individual USB interrupts" OFF)
-option(DEBUG_TASKS "Task switching statistics" OFF)
 option(DEBUG_TIMERS "Time critical parts of the code" OFF)
 option(DEBUG_BLUETOOTH "Debug Bluetooth" OFF)
 
@@ -117,11 +116,6 @@ if(DEBUG_INTERRUPTS)
   endif()
 endif()
 
-if(DEBUG_TASKS)
-  add_definitions(-DDEBUG_TASKS)
-  set(DEBUG ON)
-endif()
-
 if(DEBUG_TIMERS)
   add_definitions(-DDEBUG_TIMERS)
   set(DEBUG ON)
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index 4090164c1ba..6de0eaf0399 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -244,6 +244,9 @@ uint8_t keyState(uint8_t index);
 uint32_t switchState(uint8_t index);
 uint32_t readKeys();
 uint32_t readTrims();
+void setTrimsAsButtons(bool);
+bool getTrimsAsButtons();
+#define TRIMS_EMULATE_BUTTONS
 #define NUM_TRIMS                       NUM_STICKS
 #define NUM_TRIMS_KEYS                  (NUM_TRIMS * 2)
 #define TRIMS_PRESSED()                 (readTrims())
diff --git a/radio/src/targets/nv14/keys_driver.cpp b/radio/src/targets/nv14/keys_driver.cpp
index ca2766dacda..ee06ade8734 100644
--- a/radio/src/targets/nv14/keys_driver.cpp
+++ b/radio/src/targets/nv14/keys_driver.cpp
@@ -22,17 +22,24 @@
 #include "opentx.h"
 #include "hal/adc_driver.h"
 
-uint32_t readKeys()
+bool trimsAsButtons = false;
+
+void setTrimsAsButtons(bool val) { trimsAsButtons = val; }
+
+bool getTrimsAsButtons()
 {
-  uint32_t result = 0;
-  bool getKeys = true;
+  bool lua = false;
 #if defined(LUA)
-  if (!isLuaStandaloneRunning()) {
-    getKeys = false;
-  }
+  lua = isLuaStandaloneRunning();
 #endif
+  return (trimsAsButtons || lua);
+}
 
-  if (getKeys) {
+uint32_t readKeys()
+{
+  uint32_t result = 0;
+
+  if (getTrimsAsButtons()) {
     if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
        result |= 1 << KEY_RADIO;
      if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
@@ -64,13 +71,7 @@ uint32_t readTrims()
 {
   uint32_t result = 0;
 
-  bool getTrim = true;
-#if defined(LUA)
-  if (isLuaStandaloneRunning()) {
-    getTrim = false;
-  }
-#endif
-  if(!getTrim) return result;
+  if(getTrimsAsButtons()) return result;
   if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
     result |= 1 << (TRM_LH_DWN - TRM_BASE);
   if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
@@ -178,4 +179,5 @@ void keysInit()
 
   GPIO_InitStructure.GPIO_Pin = KEYS_GPIOJ_PINS;
   GPIO_Init(GPIOJ, &GPIO_InitStructure);
+  setTrimsAsButtons(false);
 }
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index dbd5462de36..caac3382674 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -560,6 +560,21 @@ bool trimDown(uint8_t idx)
   return readTrims() & (1 << idx);
 }
 
+#if defined(TRIMS_EMULATE_BUTTONS)
+bool trimsAsButtons = false;
+
+void setTrimsAsButtons(bool val) { trimsAsButtons = val; }
+
+bool getTrimsAsButtons()
+{
+  bool lua = false;
+#if defined(LUA)
+  lua = isLuaStandaloneRunning();
+#endif
+  return (trimsAsButtons || lua);
+}
+#endif
+
 uint32_t readKeys()
 {
   uint32_t result = 0;
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 976549a107b..06b7e640c3f 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -250,6 +250,8 @@ const char STR_MENUSPECIALFUNCS[] = TR_MENUSPECIALFUNCS;
 const char STR_MENUVERSION[] = TR_MENUVERSION;
 const char STR_MENU_RADIO_SWITCHES[] = TR_MENU_RADIO_SWITCHES;
 const char STR_MENU_RADIO_ANALOGS[] = TR_MENU_RADIO_ANALOGS;
+const char STR_MENU_RADIO_ANALOGS_CALIB[] = TR_MENU_RADIO_ANALOGS_CALIB;
+const char STR_MENU_RADIO_ANALOGS_RAWLOWFPS[] = TR_MENU_RADIO_ANALOGS_RAWLOWFPS;
 const char STR_MENUCALIBRATION[] = TR_MENUCALIBRATION;
 const char STR_MENUMODELSEL[] = TR_MENUMODELSEL;
 const char STR_MENU_MODEL_SETUP[] = TR_MENU_MODEL_SETUP;
@@ -313,6 +315,11 @@ const char STR_DISABLE_INTERNAL[] = TR_DISABLE_INTERNAL;
 const char STR_AND_SWITCH[] = TR_AND_SWITCH;
 const char STR_SF[] = TR_SF;
 const char STR_GF[] = TR_GF;
+const char STR_ANADIAGS_CALIB[] = TR_ANADIAGS_CALIB;
+const char STR_ANADIAGS_FILTRAWDEV[] = TR_ANADIAGS_FILTRAWDEV;
+const char STR_ANADIAGS_UNFILTRAW[] = TR_ANADIAGS_UNFILTRAW;
+const char STR_ANADIAGS_MINMAX[] = TR_ANADIAGS_MINMAX;
+const char STR_ANADIAGS_MOVE[] = TR_ANADIAGS_MOVE;
 const char STR_BATT_CALIB[] = TR_BATT_CALIB;
 const char STR_VOLTAGE[] = TR_VOLTAGE;
 const char STR_CURRENT_CALIB[] = TR_CURRENT_CALIB;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index f8be81cb5dc..6e06cf1cd47 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -407,6 +407,8 @@ extern const char STR_MENUSPECIALFUNCS[];
 extern const char STR_MENUVERSION[];
 extern const char STR_MENU_RADIO_SWITCHES[];
 extern const char STR_MENU_RADIO_ANALOGS[];
+extern const char STR_MENU_RADIO_ANALOGS_CALIB[];
+extern const char STR_MENU_RADIO_ANALOGS_RAWLOWFPS[];
 extern const char STR_MENUCALIBRATION[];
 extern const char STR_MENUMODELSEL[];
 extern const char STR_MENU_MODEL_SETUP[];
@@ -433,7 +435,11 @@ extern const char STR_MENU_GLOBAL_VARS[];
 extern const char STR_AND_SWITCH[];
 extern const char STR_SF[];
 extern const char STR_GF[];
-
+extern const char STR_ANADIAGS_CALIB[];
+extern const char STR_ANADIAGS_FILTRAWDEV[];
+extern const char STR_ANADIAGS_UNFILTRAW[];
+extern const char STR_ANADIAGS_MINMAX[];
+extern const char STR_ANADIAGS_MOVE[];
 extern const char STR_MULTI_CUSTOM[];
 extern const char STR_MULTI_FIXEDID[];
 extern const char STR_MULTI_OPTION[];
diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt
index fa1c61d6c10..5fd12bafd7a 100644
--- a/radio/src/translations/cn.h.txt
+++ b/radio/src/translations/cn.h.txt
@@ -551,6 +551,8 @@
 #define TR_MENUVERSION                 "版本"
 #define TR_MENU_RADIO_SWITCHES         TR("SWITCHES", "开关及按键测试")
 #define TR_MENU_RADIO_ANALOGS          TR("ANALOGS", "类比输入测试")
+#define TR_MENU_RADIO_ANALOGS_CALIB     "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION             "校准"
 #define TR_TRIMS2OFFSETS               "将当前微调量保存至中点"
 #define TR_CHANNELS2FAILSAFE           "导入当前所有通道值"
@@ -875,6 +877,11 @@
 #define TR_AND_SWITCH                  "与开关"
 #define TR_SF                          "SF"
 #define TR_GF                          "GF"
+#define TR_ANADIAGS_CALIB              "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV         "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW          "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX             "Min., max. and range"
+#define TR_ANADIAGS_MOVE               "Move analogs to their extremes!"
 #define TR_SPEAKER                     INDENT "扬声器"
 #define TR_BUZZER                      INDENT "蜂鸣器"
 #define TR_BYTES                       "bytes"
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 1d65a30554c..0b66a782f5f 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -611,6 +611,8 @@
 #define TR_MENUVERSION                 "VERZE"
 #define TR_MENU_RADIO_SWITCHES         "DIAG"
 #define TR_MENU_RADIO_ANALOGS          "ANALOGY"
+#define TR_MENU_RADIO_ANALOGS_CALIB    "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION             "KALIBRACE"
 #if defined(COLORLCD)
 #define TR_TRIMS2OFFSETS               "Trimy => Subtrimy"
@@ -936,6 +938,11 @@
 #define TR_AND_SWITCH                  "AND Spínač"
 #define TR_SF                          "SF"
 #define TR_GF                          "GF"
+#define TR_ANADIAGS_CALIB              "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV         "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW          "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX             "Min., max. and range"
+#define TR_ANADIAGS_MOVE               "Move analogs to their extremes!"
 #define TR_SPEAKER                     INDENT"Repro"
 #define TR_BUZZER                      INDENT"Pípák"
 #define TR_BYTES                       "[B]"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index ef9caa693b7..1202b2c4b68 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -616,6 +616,8 @@
 #define TR_MENUVERSION                 "VERSION"
 #define TR_MENU_RADIO_SWITCHES         TR("Schalter-Test", "Schalter-Test")
 #define TR_MENU_RADIO_ANALOGS          "Geber-Test"
+#define TR_MENU_RADIO_ANALOGS_CALIB    "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION             TR("KALIB. ANALOG", "KALIBRIERUNG-Analog")
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS             "Trims => Subtrims"
@@ -938,6 +940,11 @@
 #define TR_AND_SWITCH                  "UND Schalt" //UND mit weiterem Schaltern
 #define TR_SF                          "SF" //Spezial Funktionen
 #define TR_GF                          "GF" // Globale Funktionen
+#define TR_ANADIAGS_CALIB              "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV         "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW          "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX             "Min., max. and range"
+#define TR_ANADIAGS_MOVE               "Move analogs to their extremes!"
 #define TR_SPEAKER                     INDENT "Lautspr"
 #define TR_BUZZER                      INDENT "Summer"
 #define TR_BYTES                       "Bytes"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 84c7c52d076..115dfbbb770 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -614,6 +614,8 @@
 #define TR_MENUVERSION                 "VERSION"
 #define TR_MENU_RADIO_SWITCHES         TR("SWITCHES", "SWITCHES TEST")
 #define TR_MENU_RADIO_ANALOGS          TR("ANALOGS", "ANALOGS TEST")
+#define TR_MENU_RADIO_ANALOGS_CALIB    "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION             "CALIBRATION"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS             "Trims => Subtrims"
@@ -943,6 +945,11 @@
 #define TR_AND_SWITCH                  "AND switch"
 #define TR_SF                          "SF"
 #define TR_GF                          "GF"
+#define TR_ANADIAGS_CALIB              "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV         "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW          "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX             "Min., max. and range"
+#define TR_ANADIAGS_MOVE               "Move analogs to their extremes!"
 #define TR_SPEAKER                     INDENT "Speaker"
 #define TR_BUZZER                      INDENT "Buzzer"
 #define TR_BYTES                       "bytes"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index f0a9714b9d1..fe08a0d23ce 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -607,6 +607,8 @@
 #define TR_MENUVERSION         "VERSIÓN"
 #define TR_MENU_RADIO_SWITCHES TR("INTERUPTS", "TEST INTERRUPTORES")
 #define TR_MENU_RADIO_ANALOGS  TR("ANALÓGICOS", "TEST ANALÓGICOS")
+#define TR_MENU_RADIO_ANALOGS_CALIB    "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "CALIBRACIÓN"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS       "Trims => Offsets"
@@ -940,6 +942,11 @@
 #define TR_AND_SWITCH          TR("Inter. AND", "Interruptor AND")
 #define TR_SF                  "CF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT"Altavoz"
 #define TR_BUZZER              INDENT"Zumbador"
 #define TR_BYTES               "bytes"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 59d0ced2b4f..ed5fa90423f 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -622,6 +622,8 @@
 #define TR_MENUVERSION         "VERSION"
 #define TR_MENU_RADIO_SWITCHES            TR("SWITCHES","SWITCH TEST")
 #define TR_MENU_RADIO_ANALOGS             TR("ANAS","ANALOG INPUTS")
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "CALIBRATION"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS             "Trims => Subtrims"
@@ -954,6 +956,11 @@
 #define TR_AND_SWITCH          "AND Switch"
 #define TR_SF                  "CF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT"Speaker"
 #define TR_BUZZER              INDENT"Buzzer"
 #define TR_BYTES               "bytes"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index a99f52f2dc0..cf2a7074505 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -636,6 +636,8 @@
 #define TR_MENUVERSION                 "VERSION"
 #define TR_MENU_RADIO_SWITCHES         TR("INTERS", "TEST INTERRUPTEURS")
 #define TR_MENU_RADIO_ANALOGS          TR("ANAS", "ENTREES ANALOGIQUES")
+#define TR_MENU_RADIO_ANALOGS_CALIB    "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION             "CALIBRATION"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS             "Trims => Subtrims"
@@ -959,6 +961,11 @@
 #define TR_AND_SWITCH                  "ET suppl."
 #define TR_SF                          "FS"
 #define TR_GF                          "FG"
+#define TR_ANADIAGS_CALIB              "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV         "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW          "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX             "Min., max. and range"
+#define TR_ANADIAGS_MOVE               "Move analogs to their extremes!"
 #define TR_SPEAKER                     INDENT "Haut-p."
 #define TR_BUZZER                      INDENT "Bipeur"
 #define TR_BYTES                       "bytes"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 6d2ac331ead..8bb88b88a63 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -636,6 +636,8 @@
 #define TR_MENUVERSION         "VERSIONE"
 #define TR_MENU_RADIO_SWITCHES            "DIAG"
 #define TR_MENU_RADIO_ANALOGS             "ANAS"
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "CALIBRAZIONE"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS     "Trims => Subtrims"
@@ -960,6 +962,11 @@
 #define TR_AND_SWITCH          "Inter. AND"
 #define TR_SF                  "CF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT "Speaker"
 #define TR_BUZZER              INDENT "Buzzer"
 #define TR_BYTES               "Bytes"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 52a87092852..2cbd083f5b3 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -621,6 +621,8 @@
 #define TR_MENUVERSION         "VERSIE"
 #define TR_MENU_RADIO_SWITCHES            TR("Schak.", "Schakelaar-Test")
 #define TR_MENU_RADIO_ANALOGS             "Analoog-Test"
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     TR("CALIB. ANALOOG", "CALIBRERING Sticks+Pots")
 
 #if defined(COLORLCD)
@@ -946,6 +948,11 @@
 #define TR_AND_SWITCH          "AND Switch"
 #define TR_SF                  "SF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT "Speaker"
 #define TR_BUZZER              INDENT "Zoemer"
 #define TR_BYTES               "bytes"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 495af26562a..6290890944c 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -633,6 +633,8 @@
 #define TR_MENUVERSION         "WERSJA"
 #define TR_MENU_RADIO_SWITCHES            TR("PRZEŁ","TEST PRZEŁ")
 #define TR_MENU_RADIO_ANALOGS             TR("WE-ANA","WEJŚCIA ANALOG.")
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "KALIBRACJA"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS     "Trymery => Subtrimy"
@@ -957,6 +959,11 @@
 #define TR_AND_SWITCH          "Przełącznik AND"
 #define TR_SF                  "FS"
 #define TR_GF                  "FG"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT"Głośnik"
 #define TR_BUZZER              INDENT"Brzęczyk"
 #define TR_BYTES               "bajty"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 2fd84249b85..2cfb12b8d52 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -633,6 +633,8 @@
 #define TR_MENUVERSION         "VERSAO"
 #define TR_MENU_RADIO_SWITCHES            "DIAGNOST"
 #define TR_MENU_RADIO_ANALOGS             "ANALOGICOS"
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "CALIBRAGEM"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS     "Trims => Subtrims"
@@ -965,6 +967,11 @@
 #define TR_AND_SWITCH          "AND Switch"
 #define TR_SF                  "CF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT"Speaker"
 #define TR_BUZZER              INDENT"Buzzer"
 #define TR_BYTES               "bytes"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index b537474e61f..eb165405c09 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -640,6 +640,8 @@
 #define TR_MENUVERSION         "VERSION"
 #define TR_MENU_RADIO_SWITCHES            TR("BRYTARE","TEST AV BRYTARE")
 #define TR_MENU_RADIO_ANALOGS             "ANALOGA VÄRDEN"
+#define TR_MENU_RADIO_ANALOGS_CALIB       "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS   "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION     "KALIBRERING"
 #if defined(COLORLCD)
   #define TR_TRIMS2OFFSETS     "[Spara Trimvärden]"
@@ -965,6 +967,11 @@
 #define TR_AND_SWITCH          "OCH Brytare"
 #define TR_SF                  "BF"
 #define TR_GF                  "GF"
+#define TR_ANADIAGS_CALIB      "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW  "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX     "Min., max. and range"
+#define TR_ANADIAGS_MOVE       "Move analogs to their extremes!"
 #define TR_SPEAKER             INDENT"Högtalare"
 #define TR_BUZZER              INDENT"Summer"
 #define TR_BYTES               "byte"
diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt
index f4ec6c45f00..149ee2bfdd4 100644
--- a/radio/src/translations/tw.h.txt
+++ b/radio/src/translations/tw.h.txt
@@ -550,6 +550,8 @@
 #define TR_MENUVERSION                  "版本"
 #define TR_MENU_RADIO_SWITCHES          TR("SWITCHES", "開關及按鍵測試")
 #define TR_MENU_RADIO_ANALOGS           TR("ANALOGS", "類比輸入測試")
+#define TR_MENU_RADIO_ANALOGS_CALIB     "CALIBRATED ANALOGS"
+#define TR_MENU_RADIO_ANALOGS_RAWLOWFPS "RAW ANALOGS (5 Hz)"
 #define TR_MENUCALIBRATION              "校準"
 #define TR_TRIMS2OFFSETS                "將當前微調量保存至中點"
 #define TR_CHANNELS2FAILSAFE            "導入當前所有通道值"
@@ -874,6 +876,11 @@
 #define TR_AND_SWITCH                   "與開關"
 #define TR_SF                           "SF"
 #define TR_GF                           "GF"
+#define TR_ANADIAGS_CALIB               "Calibrated analogs"
+#define TR_ANADIAGS_FILTRAWDEV          "Filtered raw analogs with deviation"
+#define TR_ANADIAGS_UNFILTRAW           "Unfiltered raw analogs"
+#define TR_ANADIAGS_MINMAX              "Min., max. and range"
+#define TR_ANADIAGS_MOVE                "Move analogs to their extremes!"
 #define TR_SPEAKER INDENT               "揚聲器"
 #define TR_BUZZER INDENT                "蜂鳴器"
 #define TR_BYTES                        "bytes"