MenuModel split - 8th part

companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp

@@ -85,6 +85,7 @@ namespace Open9xGruvin9x {
 #include "radio/src/gui/menu_model_curves.cpp"
 #include "radio/src/gui/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_telemetry.cpp"
+#include "radio/src/gui/menu_model_templates.cpp"
 #include "radio/src/gui/menu_general.cpp"
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"

companion/src/firmwares/opentx/opentxM128simulator.cpp

@@ -86,6 +86,7 @@ namespace OpenTxM128 {
 #include "radio/src/gui/menu_model_custom_functions.cpp"
 #include "radio/src/gui/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_telemetry.cpp"
+#include "radio/src/gui/menu_model_templates.cpp"
 #include "radio/src/gui/menu_general.cpp"
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"

companion/src/firmwares/opentx/opentxM64simulator.cpp

@@ -91,6 +91,7 @@ namespace OpenTxM64 {
 #include "radio/src/gui/menu_model_custom_functions.cpp"
 #include "radio/src/gui/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_telemetry.cpp"
+#include "radio/src/gui/menu_model_templates.cpp"
 #include "radio/src/gui/menu_general.cpp"
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"

companion/src/firmwares/opentx/opentxSky9xsimulator.cpp

@@ -100,6 +100,7 @@ namespace Open9xSky9x {
 #include "radio/src/gui/menu_model_custom_functions.cpp"
 #include "radio/src/gui/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_telemetry.cpp"
+#include "radio/src/gui/menu_model_templates.cpp"
 #include "radio/src/gui/menu_general.cpp"
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"

radio/src/Makefile

@@ -1174,6 +1174,7 @@ ifeq ($(TEMPLATES), YES)
   ifneq ($(PCB), $(filter $(PCB), TARANIS)) 
     CPPDEFS += -DTEMPLATES
     CPPSRC += templates.cpp
+    GUIMODELSRC += gui/menu_model_templates.cpp 
   endif
 endif
 

radio/src/gui/menu_model.cpp

@@ -264,33 +264,4 @@ void editSingleName(coord_t x, coord_t y, const pm_char *label, char *name, uint
 
 static uint8_t s_currIdx;
 
-#if defined(TEMPLATES)
-void menuModelTemplates(uint8_t event)
-{
-  SIMPLE_MENU(STR_MENUTEMPLATES, menuTabModel, e_Templates, 1+TMPL_COUNT);
-
-  uint8_t sub = m_posVert - 1;
-
-  if (sub < TMPL_COUNT) {
-    if (s_warning_result) {
-      s_warning_result = 0;
-      applyTemplate(sub);
-      AUDIO_WARNING2();
-    }
-    if (event==EVT_KEY_BREAK(KEY_ENTER)) {
-      POPUP_CONFIRMATION(STR_VTEMPLATES+1 + (sub * LEN2_VTEMPLATES));
-      s_editMode = 0;
-    }
-  }
-
-  coord_t y = MENU_TITLE_HEIGHT + 1;
-  uint8_t k = 0;
-  for (uint8_t i=0; i<LCD_LINES-1 && k<TMPL_COUNT; i++) {
-    k = i+s_pgOfs;
-    lcd_outdezNAtt(3*FW, y, k, (sub==k ? INVERS : 0)|LEADING0, 2);
-    lcd_putsiAtt(4*FW, y, STR_VTEMPLATES, k, (sub==k ? INVERS  : 0));
-    y+=FH;
-  }
-}
-#endif
 

radio/src/gui/menu_model_templates.cpp

@@ -0,0 +1,65 @@
+/*
+ * Authors (alphabetical order)
+ * - Andre Bernet <bernet.andre@gmail.com>
+ * - Andreas Weitl
+ * - Bertrand Songis <bsongis@gmail.com>
+ * - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
+ * - Cameron Weeks <th9xer@gmail.com>
+ * - Erez Raviv
+ * - Gabriel Birkus
+ * - Jean-Pierre Parisy
+ * - Karl Szmutny
+ * - Michael Blandford
+ * - Michal Hlavinka
+ * - Pat Mackenzie
+ * - Philip Moss
+ * - Rob Thomson
+ * - Romolo Manfredini <romolo.manfredini@gmail.com>
+ * - Thomas Husterer
+ *
+ * opentx is based on code named
+ * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
+ * er9x by Erez Raviv: http://code.google.com/p/er9x/,
+ * and the original (and ongoing) project by
+ * Thomas Husterer, th9x: http://code.google.com/p/th9x/
+ *
+ * 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"
+
+void menuModelTemplates(uint8_t event)
+{
+  SIMPLE_MENU(STR_MENUTEMPLATES, menuTabModel, e_Templates, 1+TMPL_COUNT);
+
+  uint8_t sub = m_posVert - 1;
+
+  if (sub < TMPL_COUNT) {
+    if (s_warning_result) {
+      s_warning_result = 0;
+      applyTemplate(sub);
+      AUDIO_WARNING2();
+    }
+    if (event==EVT_KEY_BREAK(KEY_ENTER)) {
+      POPUP_CONFIRMATION(STR_VTEMPLATES+1 + (sub * LEN2_VTEMPLATES));
+      s_editMode = 0;
+    }
+  }
+
+  coord_t y = MENU_TITLE_HEIGHT + 1;
+  uint8_t k = 0;
+  for (uint8_t i=0; i<LCD_LINES-1 && k<TMPL_COUNT; i++) {
+    k = i+s_pgOfs;
+    lcd_outdezNAtt(3*FW, y, k, (sub==k ? INVERS : 0)|LEADING0, 2);
+    lcd_putsiAtt(4*FW, y, STR_VTEMPLATES, k, (sub==k ? INVERS  : 0));
+    y+=FH;
+  }
+}