Merge pull request repetier#722 from luc-github/development

Hide printed time if no extruder
mandolincreek · Dec 22, 2017 · 14bde81 · 14bde81
2 parents b8c3524 + 98e8cff
commit 14bde81
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/ArduinoAVR/Repetier/Eeprom.cpp b/src/ArduinoAVR/Repetier/Eeprom.cpp
@@ -881,7 +881,9 @@ void EEPROM::writeSettings()
 #if EEPROM_MODE != 0
     writeByte(EPR_SELECTED_LANGUAGE,Com::tLanguage);
     writeLong(EPR_BAUDRATE, Com::tEPRBaudrate);
+#if NUM_EXTRUDER > 0
     writeFloat(EPR_PRINTING_DISTANCE, Com::tEPRFilamentPrinted);
+#endif
     writeLong(EPR_PRINTING_TIME, Com::tEPRPrinterActive);
     writeLong(EPR_MAX_INACTIVE_TIME, Com::tEPRMaxInactiveTime);
     writeLong(EPR_STEPPER_INACTIVE_TIME, Com::tEPRStopAfterInactivty);

diff --git a/src/ArduinoAVR/Repetier/uimenu.h b/src/ArduinoAVR/Repetier/uimenu.h
@@ -254,7 +254,7 @@
 
 UI_PAGE6_T(ui_page1, UI_TEXT_MAINPAGE6_1_ID, UI_TEXT_MAINPAGE6_2_ID, UI_TEXT_MAINPAGE6_3_ID, UI_TEXT_MAINPAGE6_4_ID, UI_TEXT_MAINPAGE6_5_ID, UI_TEXT_MAINPAGE6_6_ID)
 
-#if EEPROM_MODE != 0
+#if EEPROM_MODE != 0 && NUM_EXTRUDER > 0
 UI_PAGE6_T(ui_page2, UI_TEXT_PRINT_TIME_ID, UI_TEXT_PRINT_TIME_VALUE_ID, UI_TEXT_PRINT_FILAMENT_ID, UI_TEXT_PRINT_FILAMENT_VALUE_ID,UI_TEXT_EMPTY_ID,UI_TEXT_STATUS_ID)
 #define UI_PRINTTIME_PAGES ,&ui_page2
 #define UI_PRINTTIME_COUNT 1
@@ -367,7 +367,7 @@ UI_PAGE4_T(ui_page3
            , UI_TEXT_EMPTY_ID, UI_TEXT_EMPTY_ID, UI_TEXT_EMPTY_ID, UI_TEXT_STATUS_ID
 #endif
           )
-#if EEPROM_MODE != 0
+#if EEPROM_MODE != 0 && NUM_EXTRUDER > 0
 UI_PAGE4_T(ui_page4, UI_TEXT_PRINT_TIME_ID, UI_TEXT_PRINT_TIME_VALUE_ID, UI_TEXT_PRINT_FILAMENT_ID, UI_TEXT_PRINT_FILAMENT_VALUE_ID)
 #define UI_PRINTTIME_PAGES ,&ui_page4
 #define UI_PRINTTIME_COUNT 1

diff --git a/src/ArduinoDUE/Repetier/Eeprom.cpp b/src/ArduinoDUE/Repetier/Eeprom.cpp
@@ -881,7 +881,9 @@ void EEPROM::writeSettings()
 #if EEPROM_MODE != 0
     writeByte(EPR_SELECTED_LANGUAGE,Com::tLanguage);
     writeLong(EPR_BAUDRATE, Com::tEPRBaudrate);
+#if NUM_EXTRUDER > 0
     writeFloat(EPR_PRINTING_DISTANCE, Com::tEPRFilamentPrinted);
+#endif
     writeLong(EPR_PRINTING_TIME, Com::tEPRPrinterActive);
     writeLong(EPR_MAX_INACTIVE_TIME, Com::tEPRMaxInactiveTime);
     writeLong(EPR_STEPPER_INACTIVE_TIME, Com::tEPRStopAfterInactivty);

diff --git a/src/ArduinoDUE/Repetier/uimenu.h b/src/ArduinoDUE/Repetier/uimenu.h
@@ -254,7 +254,7 @@
 
 UI_PAGE6_T(ui_page1, UI_TEXT_MAINPAGE6_1_ID, UI_TEXT_MAINPAGE6_2_ID, UI_TEXT_MAINPAGE6_3_ID, UI_TEXT_MAINPAGE6_4_ID, UI_TEXT_MAINPAGE6_5_ID, UI_TEXT_MAINPAGE6_6_ID)
 
-#if EEPROM_MODE != 0
+#if EEPROM_MODE != 0 && NUM_EXTRUDER > 0
 UI_PAGE6_T(ui_page2, UI_TEXT_PRINT_TIME_ID, UI_TEXT_PRINT_TIME_VALUE_ID, UI_TEXT_PRINT_FILAMENT_ID, UI_TEXT_PRINT_FILAMENT_VALUE_ID,UI_TEXT_EMPTY_ID,UI_TEXT_STATUS_ID)
 #define UI_PRINTTIME_PAGES ,&ui_page2
 #define UI_PRINTTIME_COUNT 1
@@ -367,7 +367,7 @@ UI_PAGE4_T(ui_page3
            , UI_TEXT_EMPTY_ID, UI_TEXT_EMPTY_ID, UI_TEXT_EMPTY_ID, UI_TEXT_STATUS_ID
 #endif
           )
-#if EEPROM_MODE != 0
+#if EEPROM_MODE != 0 && NUM_EXTRUDER > 0
 UI_PAGE4_T(ui_page4, UI_TEXT_PRINT_TIME_ID, UI_TEXT_PRINT_TIME_VALUE_ID, UI_TEXT_PRINT_FILAMENT_ID, UI_TEXT_PRINT_FILAMENT_VALUE_ID)
 #define UI_PRINTTIME_PAGES ,&ui_page4
 #define UI_PRINTTIME_COUNT 1