Move Info Menu to its own file

Marlin/src/lcd/menu/menu.cpp

@@ -255,14 +255,6 @@ void menu_action_setting_edit_callback_bool(PGM_P pstr, bool* ptr, screenFunc_t
   void menu_advanced_filament();
 #endif
 
-#if ENABLED(LCD_INFO_MENU)
-  #if ENABLED(PRINTCOUNTER)
-    void menu_info_stats();
-  #endif
-  void menu_info_thermistors();
-  void menu_info_board();
-#endif
-
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
     void menu_change_filament();
@@ -1767,171 +1759,6 @@ void menu_advanced_settings() {
 
 #endif // SDSUPPORT
 
-#if ENABLED(LCD_INFO_MENU)
-
-  #if ENABLED(PRINTCOUNTER)
-    /**
-     *
-     * About Printer > Statistics submenu
-     *
-     */
-    void menu_info_stats() {
-      if (use_click()) { return lcd_goto_previous_menu(); }
-
-      char buffer[21];
-      printStatistics stats = print_job_timer.getStats();
-
-      START_SCREEN();                                                                                // 12345678901234567890
-      STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints));          // Print Count: 999
-      STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints));   // Completed  : 666
-
-      duration_t elapsed = stats.printTime;
-      elapsed.toString(buffer);
-
-      STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false);                                           // Total print Time:
-      STATIC_ITEM("", false, false, buffer);                                                         // 99y 364d 23h 59m 59s
-
-      elapsed = stats.longestPrint;
-      elapsed.toString(buffer);
-
-      STATIC_ITEM(MSG_INFO_PRINT_LONGEST ": ", false, false);                                        // Longest job time:
-      STATIC_ITEM("", false, false, buffer);                                                         // 99y 364d 23h 59m 59s
-
-      sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
-      STATIC_ITEM(MSG_INFO_PRINT_FILAMENT ": ", false, false);                                       // Extruded total:
-      STATIC_ITEM("", false, false, buffer);                                                         // 125m
-      END_SCREEN();
-    }
-  #endif // PRINTCOUNTER
-
-  /**
-   *
-   * About Printer > Thermistors
-   *
-   */
-  void menu_info_thermistors() {
-    if (use_click()) { return lcd_goto_previous_menu(); }
-    START_SCREEN();
-    #define THERMISTOR_ID TEMP_SENSOR_0
-    #include "../thermistornames.h"
-    STATIC_ITEM("T0: " THERMISTOR_NAME, false, true);
-    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_0_MINTEMP), false);
-    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_0_MAXTEMP), false);
-
-    #if TEMP_SENSOR_1 != 0
-      #undef THERMISTOR_ID
-      #define THERMISTOR_ID TEMP_SENSOR_1
-      #include "../thermistornames.h"
-      STATIC_ITEM("T1: " THERMISTOR_NAME, false, true);
-      STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_1_MINTEMP), false);
-      STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_1_MAXTEMP), false);
-    #endif
-
-    #if TEMP_SENSOR_2 != 0
-      #undef THERMISTOR_ID
-      #define THERMISTOR_ID TEMP_SENSOR_2
-      #include "../thermistornames.h"
-      STATIC_ITEM("T2: " THERMISTOR_NAME, false, true);
-      STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_2_MINTEMP), false);
-      STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_2_MAXTEMP), false);
-    #endif
-
-    #if TEMP_SENSOR_3 != 0
-      #undef THERMISTOR_ID
-      #define THERMISTOR_ID TEMP_SENSOR_3
-      #include "../thermistornames.h"
-      STATIC_ITEM("T3: " THERMISTOR_NAME, false, true);
-      STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_3_MINTEMP), false);
-      STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
-    #endif
-
-    #if TEMP_SENSOR_4 != 0
-      #undef THERMISTOR_ID
-      #define THERMISTOR_ID TEMP_SENSOR_4
-      #include "../thermistornames.h"
-      STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
-      STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_4_MINTEMP), false);
-      STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_4_MAXTEMP), false);
-    #endif
-
-    #if HAS_HEATED_BED
-      #undef THERMISTOR_ID
-      #define THERMISTOR_ID TEMP_SENSOR_BED
-      #include "../thermistornames.h"
-      STATIC_ITEM("TBed:" THERMISTOR_NAME, false, true);
-      STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(BED_MINTEMP), false);
-      STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(BED_MAXTEMP), false);
-    #endif
-    END_SCREEN();
-  }
-
-  /**
-   *
-   * About Printer > Board Info
-   *
-   */
-  void menu_info_board() {
-    if (use_click()) { return lcd_goto_previous_menu(); }
-    START_SCREEN();
-    STATIC_ITEM(BOARD_NAME, true, true);                           // MyPrinterController
-    STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
-    STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true);    // Protocol: 1.0
-    #if POWER_SUPPLY == 0
-      STATIC_ITEM(MSG_INFO_PSU ": Generic", true);
-    #elif POWER_SUPPLY == 1
-      STATIC_ITEM(MSG_INFO_PSU ": ATX", true);  // Power Supply: ATX
-    #elif POWER_SUPPLY == 2
-      STATIC_ITEM(MSG_INFO_PSU ": XBox", true); // Power Supply: XBox
-    #endif
-    END_SCREEN();
-  }
-
-  /**
-   *
-   * About Printer > Printer Info
-   *
-   */
-  void menu_info_printer() {
-    if (use_click()) { return lcd_goto_previous_menu(); }
-    START_SCREEN();
-    STATIC_ITEM(MSG_MARLIN, true, true);                             // Marlin
-    STATIC_ITEM(SHORT_BUILD_VERSION, true);                          // x.x.x-Branch
-    STATIC_ITEM(STRING_DISTRIBUTION_DATE, true);                     // YYYY-MM-DD HH:MM
-    STATIC_ITEM(MACHINE_NAME, true);                                 // My3DPrinter
-    STATIC_ITEM(WEBSITE_URL, true);                                  // www.my3dprinter.com
-    STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS), true); // Extruders: 2
-    #if ENABLED(AUTO_BED_LEVELING_3POINT)
-      STATIC_ITEM(MSG_3POINT_LEVELING, true);                        // 3-Point Leveling
-    #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
-      STATIC_ITEM(MSG_LINEAR_LEVELING, true);                        // Linear Leveling
-    #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      STATIC_ITEM(MSG_BILINEAR_LEVELING, true);                      // Bi-linear Leveling
-    #elif ENABLED(AUTO_BED_LEVELING_UBL)
-      STATIC_ITEM(MSG_UBL_LEVELING, true);                           // Unified Bed Leveling
-    #elif ENABLED(MESH_BED_LEVELING)
-      STATIC_ITEM(MSG_MESH_LEVELING, true);                          // Mesh Leveling
-    #endif
-    END_SCREEN();
-  }
-
-  /**
-   *
-   * "About Printer" submenu
-   *
-   */
-  void menu_info() {
-    START_MENU();
-    MENU_BACK(MSG_MAIN);
-    MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer);        // Printer Info >
-    MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board);            // Board Info >
-    MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
-    #if ENABLED(PRINTCOUNTER)
-      MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats);          // Printer Statistics >
-    #endif
-    END_MENU();
-  }
-#endif // LCD_INFO_MENU
-
 /**
  *
  * LED Menu

Marlin/src/lcd/menu/menu_info.cpp

@@ -0,0 +1,198 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+//
+// Info Menu
+//
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if HAS_LCD_MENU && ENABLED(LCD_INFO_MENU)
+
+#include "menu.h"
+// #include "../../module/motion.h"
+// #include "../../module/planner.h"
+// #include "../../module/temperature.h"
+// #include "../../Marlin.h"
+
+// #if HAS_LEVELING
+//   #include "../../feature/bedlevel/bedlevel.h"
+// #endif
+
+
+#if ENABLED(PRINTCOUNTER)
+
+  #include "../../module/printcounter.h"
+
+  //
+  // About Printer > Printer Stats
+  //
+  void menu_info_stats() {
+    if (use_click()) { return lcd_goto_previous_menu(); }
+
+    char buffer[21];
+    printStatistics stats = print_job_timer.getStats();
+
+    START_SCREEN();                                                                                // 12345678901234567890
+    STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints));          // Print Count: 999
+    STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints));   // Completed  : 666
+
+    duration_t elapsed = stats.printTime;
+    elapsed.toString(buffer);
+
+    STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false);                                           // Total print Time:
+    STATIC_ITEM("", false, false, buffer);                                                         // 99y 364d 23h 59m 59s
+
+    elapsed = stats.longestPrint;
+    elapsed.toString(buffer);
+
+    STATIC_ITEM(MSG_INFO_PRINT_LONGEST ": ", false, false);                                        // Longest job time:
+    STATIC_ITEM("", false, false, buffer);                                                         // 99y 364d 23h 59m 59s
+
+    sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
+    STATIC_ITEM(MSG_INFO_PRINT_FILAMENT ": ", false, false);                                       // Extruded total:
+    STATIC_ITEM("", false, false, buffer);                                                         // 125m
+    END_SCREEN();
+  }
+
+#endif
+
+//
+// About Printer > Thermistors
+//
+void menu_info_thermistors() {
+  if (use_click()) { return lcd_goto_previous_menu(); }
+  START_SCREEN();
+  #define THERMISTOR_ID TEMP_SENSOR_0
+  #include "../thermistornames.h"
+  STATIC_ITEM("T0: " THERMISTOR_NAME, false, true);
+  STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_0_MINTEMP), false);
+  STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_0_MAXTEMP), false);
+
+  #if TEMP_SENSOR_1 != 0
+    #undef THERMISTOR_ID
+    #define THERMISTOR_ID TEMP_SENSOR_1
+    #include "../thermistornames.h"
+    STATIC_ITEM("T1: " THERMISTOR_NAME, false, true);
+    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_1_MINTEMP), false);
+    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_1_MAXTEMP), false);
+  #endif
+
+  #if TEMP_SENSOR_2 != 0
+    #undef THERMISTOR_ID
+    #define THERMISTOR_ID TEMP_SENSOR_2
+    #include "../thermistornames.h"
+    STATIC_ITEM("T2: " THERMISTOR_NAME, false, true);
+    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_2_MINTEMP), false);
+    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_2_MAXTEMP), false);
+  #endif
+
+  #if TEMP_SENSOR_3 != 0
+    #undef THERMISTOR_ID
+    #define THERMISTOR_ID TEMP_SENSOR_3
+    #include "../thermistornames.h"
+    STATIC_ITEM("T3: " THERMISTOR_NAME, false, true);
+    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_3_MINTEMP), false);
+    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
+  #endif
+
+  #if TEMP_SENSOR_4 != 0
+    #undef THERMISTOR_ID
+    #define THERMISTOR_ID TEMP_SENSOR_4
+    #include "../thermistornames.h"
+    STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
+    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_4_MINTEMP), false);
+    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_4_MAXTEMP), false);
+  #endif
+
+  #if HAS_HEATED_BED
+    #undef THERMISTOR_ID
+    #define THERMISTOR_ID TEMP_SENSOR_BED
+    #include "../thermistornames.h"
+    STATIC_ITEM("TBed:" THERMISTOR_NAME, false, true);
+    STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(BED_MINTEMP), false);
+    STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(BED_MAXTEMP), false);
+  #endif
+  END_SCREEN();
+}
+
+//
+// About Printer > Board Info
+//
+void menu_info_board() {
+  if (use_click()) { return lcd_goto_previous_menu(); }
+  START_SCREEN();
+  STATIC_ITEM(BOARD_NAME, true, true);                           // MyPrinterController
+  STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
+  STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true);    // Protocol: 1.0
+  #if POWER_SUPPLY == 0
+    STATIC_ITEM(MSG_INFO_PSU ": Generic", true);
+  #elif POWER_SUPPLY == 1
+    STATIC_ITEM(MSG_INFO_PSU ": ATX", true);  // Power Supply: ATX
+  #elif POWER_SUPPLY == 2
+    STATIC_ITEM(MSG_INFO_PSU ": XBox", true); // Power Supply: XBox
+  #endif
+  END_SCREEN();
+}
+
+//
+// About Printer > Printer Info
+//
+void menu_info_printer() {
+  if (use_click()) { return lcd_goto_previous_menu(); }
+  START_SCREEN();
+  STATIC_ITEM(MSG_MARLIN, true, true);                             // Marlin
+  STATIC_ITEM(SHORT_BUILD_VERSION, true);                          // x.x.x-Branch
+  STATIC_ITEM(STRING_DISTRIBUTION_DATE, true);                     // YYYY-MM-DD HH:MM
+  STATIC_ITEM(MACHINE_NAME, true);                                 // My3DPrinter
+  STATIC_ITEM(WEBSITE_URL, true);                                  // www.my3dprinter.com
+  STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS), true); // Extruders: 2
+  #if ENABLED(AUTO_BED_LEVELING_3POINT)
+    STATIC_ITEM(MSG_3POINT_LEVELING, true);                        // 3-Point Leveling
+  #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
+    STATIC_ITEM(MSG_LINEAR_LEVELING, true);                        // Linear Leveling
+  #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
+    STATIC_ITEM(MSG_BILINEAR_LEVELING, true);                      // Bi-linear Leveling
+  #elif ENABLED(AUTO_BED_LEVELING_UBL)
+    STATIC_ITEM(MSG_UBL_LEVELING, true);                           // Unified Bed Leveling
+  #elif ENABLED(MESH_BED_LEVELING)
+    STATIC_ITEM(MSG_MESH_LEVELING, true);                          // Mesh Leveling
+  #endif
+  END_SCREEN();
+}
+
+//
+// "About Printer" submenu
+//
+void menu_info() {
+  START_MENU();
+  MENU_BACK(MSG_MAIN);
+  MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer);        // Printer Info >
+  MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board);            // Board Info >
+  MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
+  #if ENABLED(PRINTCOUNTER)
+    MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats);          // Printer Stats >
+  #endif
+  END_MENU();
+}
+
+#endif // HAS_LCD_MENU && LCD_INFO_MENU