Basic touch test screen holders

radio/src/gui/480x272/menus.h

@@ -185,6 +185,7 @@ bool menuModelModuleOptions(event_t event);
 bool menuModelReceiverOptions(event_t event);
 bool menuRadioDiagKeys(event_t event);
 bool menuRadioDiagAnalogs(event_t event);
+bool menuRadioDiagTouch(event_t event);
 
 extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT];
 

radio/src/gui/480x272/radio_diagtouch.cpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "opentx.h"
+#include "ft5x06.h"
+
+bool menuRadioDiagTouch(event_t event)
+{
+  SIMPLE_SUBMENU(STR_MENU_RADIO_TOUCH, ICON_MODEL_SETUP, 1);
+
+  if (touchInit()) {
+    lcdDrawText(LCD_W / 2, LCD_H / 2, STR_TOUCH_EXIT, CENTERED);
+  }
+  else {
+    lcdDrawText(LCD_W / 2, LCD_H / 2, STR_TOUCH_NOTFOUND, CENTERED);
+  }
+
+  return true;
+}

radio/src/gui/480x272/radio_hardware.cpp

@@ -418,13 +418,20 @@ bool menuRadioHardware(event_t event)
         lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0);
         lcdDrawText(lcdNextPos + 10, y, STR_KEYS_BTN, menuHorizontalPosition == 1 ? attr : 0);
 #if defined(HARDWARE_TOUCH)
-        lcdDrawText(lcdNextPos + 10, y, STR_KEYS_BTN, menuHorizontalPosition == 2 ? attr : 0);
+        lcdDrawText(lcdNextPos + 10, y, STR_TOUCH_BTN, menuHorizontalPosition == 2 ? attr : 0);
 #endif
         if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
-          if (menuHorizontalPosition == 0)
-            pushMenu(menuRadioDiagAnalogs);
-          else
-            pushMenu(menuRadioDiagKeys);
+          switch (menuHorizontalPosition) {
+            case 0:
+              pushMenu(menuRadioDiagAnalogs);
+              break;
+            case 1:
+              pushMenu(menuRadioDiagKeys);
+              break;
+            case 2:
+              pushMenu(menuRadioDiagTouch);
+              break;
+          }
         }
         break;
     }