Browse Source

Fix Service Menu compile error (#14903)

Ludy 6 years ago
parent
commit
9479ec32f7

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h View File

567
 #define HAS_COLOR_LEDS        ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
567
 #define HAS_COLOR_LEDS        ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
568
 #define HAS_LEDS_OFF_FLAG     (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
568
 #define HAS_LEDS_OFF_FLAG     (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
569
 #define HAS_PRINT_PROGRESS    EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
569
 #define HAS_PRINT_PROGRESS    EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
570
-#define HAS_SERVICE_INTERVALS (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0)
570
+#define HAS_SERVICE_INTERVALS (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
571
 #define HAS_FILAMENT_SENSOR   ENABLED(FILAMENT_RUNOUT_SENSOR)
571
 #define HAS_FILAMENT_SENSOR   ENABLED(FILAMENT_RUNOUT_SENSOR)
572
 
572
 
573
 #define Z_MULTI_STEPPER_DRIVERS EITHER(Z_DUAL_STEPPER_DRIVERS, Z_TRIPLE_STEPPER_DRIVERS)
573
 #define Z_MULTI_STEPPER_DRIVERS EITHER(Z_DUAL_STEPPER_DRIVERS, Z_TRIPLE_STEPPER_DRIVERS)

+ 1
- 1
Marlin/src/lcd/language/language_de.h View File

287
 #define MSG_BUTTON_INIT                     _UxGT("Bestätigen")
287
 #define MSG_BUTTON_INIT                     _UxGT("Bestätigen")
288
 #define MSG_BUTTON_STOP                     _UxGT("Stop")
288
 #define MSG_BUTTON_STOP                     _UxGT("Stop")
289
 #define MSG_BUTTON_PRINT                    _UxGT("Drucken")
289
 #define MSG_BUTTON_PRINT                    _UxGT("Drucken")
290
-#define MSG_BUTTON_RESET                    _UxGT("Zurücksetzen")
290
+#define MSG_BUTTON_RESET                    _UxGT("Reseten")
291
 #define MSG_BUTTON_CANCEL                   _UxGT("Abbrechen")
291
 #define MSG_BUTTON_CANCEL                   _UxGT("Abbrechen")
292
 #define MSG_BUTTON_DONE                     _UxGT("Fertig")
292
 #define MSG_BUTTON_DONE                     _UxGT("Fertig")
293
 #define MSG_PAUSE_PRINT                     _UxGT("SD-Druck pausieren")
293
 #define MSG_PAUSE_PRINT                     _UxGT("SD-Druck pausieren")

+ 2
- 2
Marlin/src/lcd/menu/menu_main.cpp View File

83
   void menu_mixer();
83
   void menu_mixer();
84
 #endif
84
 #endif
85
 
85
 
86
-#if HAS_SERVICE_INTERVALS && ENABLED(PRINTCOUNTER)
86
+#if HAS_SERVICE_INTERVALS
87
   #if SERVICE_INTERVAL_1 > 0
87
   #if SERVICE_INTERVAL_1 > 0
88
     void menu_service1();
88
     void menu_service1();
89
   #endif
89
   #endif
237
     }
237
     }
238
   #endif // HAS_ENCODER_WHEEL && SDSUPPORT
238
   #endif // HAS_ENCODER_WHEEL && SDSUPPORT
239
 
239
 
240
-  #if HAS_SERVICE_INTERVALS && ENABLED(PRINTCOUNTER)
240
+  #if HAS_SERVICE_INTERVALS
241
     #if SERVICE_INTERVAL_1 > 0
241
     #if SERVICE_INTERVAL_1 > 0
242
       MENU_ITEM(submenu, SERVICE_NAME_1, menu_service1);
242
       MENU_ITEM(submenu, SERVICE_NAME_1, menu_service1);
243
     #endif
243
     #endif

+ 39
- 21
Marlin/src/lcd/menu/menu_service.cpp View File

26
 
26
 
27
 #include "../../inc/MarlinConfigPre.h"
27
 #include "../../inc/MarlinConfigPre.h"
28
 
28
 
29
-#if HAS_LCD_MENU && HAS_SERVICE_INTERVALS && ENABLED(PRINTCOUNTER)
29
+#if HAS_LCD_MENU && HAS_SERVICE_INTERVALS
30
 
30
 
31
 #include "menu.h"
31
 #include "menu.h"
32
 #include "../../module/printcounter.h"
32
 #include "../../module/printcounter.h"
33
 
33
 
34
-inline void _menu_service(const int index, PGM_P const name) {
35
-  char sram[30];
36
-  strncpy_P(sram, name, 29);
37
-  do_select_screen(
38
-    PSTR(MSG_BUTTON_RESET), PSTR(MSG_BUTTON_CANCEL),
39
-    []{
40
-      print_job_timer.resetServiceInterval(index);
41
-      #if HAS_BUZZER
42
-        ui.completion_feedback();
43
-      #endif
44
-      ui.reset_status();
45
-      ui.return_to_status();
46
-    },
47
-    ui.goto_previous_screen,
48
-    PSTR(MSG_SERVICE_RESET), sram, PSTR("?")
49
-  );
34
+inline void _service_reset(const int index) {
35
+  print_job_timer.resetServiceInterval(index);
36
+  #if HAS_BUZZER
37
+    ui.completion_feedback();
38
+  #endif
39
+  ui.reset_status();
40
+  ui.return_to_status();
50
 }
41
 }
51
 
42
 
52
 #if SERVICE_INTERVAL_1 > 0
43
 #if SERVICE_INTERVAL_1 > 0
53
-  void menu_service1() { _menu_service(1, PSTR(SERVICE_NAME_1)); }
44
+  void menu_service1() {
45
+    char sram[30];
46
+    strncpy_P(sram, PSTR(SERVICE_NAME_1), 29);
47
+    do_select_screen(
48
+      PSTR(MSG_BUTTON_RESET), PSTR(MSG_BUTTON_CANCEL),
49
+      []{ _service_reset(1); },
50
+      ui.goto_previous_screen,
51
+      PSTR(MSG_SERVICE_RESET), sram, PSTR("?")
52
+    );
53
+  }
54
 #endif
54
 #endif
55
 
55
 
56
 #if SERVICE_INTERVAL_2 > 0
56
 #if SERVICE_INTERVAL_2 > 0
57
-  void menu_service2() { _menu_service(2, PSTR(SERVICE_NAME_2)); }
57
+  void menu_service2() {
58
+    char sram[30];
59
+    strncpy_P(sram, PSTR(SERVICE_NAME_2), 29);
60
+    do_select_screen(
61
+      PSTR(MSG_BUTTON_RESET), PSTR(MSG_BUTTON_CANCEL),
62
+      []{ _service_reset(2); },
63
+      ui.goto_previous_screen,
64
+      PSTR(MSG_SERVICE_RESET), sram, PSTR("?")
65
+    );
66
+  }
58
 #endif
67
 #endif
59
 
68
 
60
 #if SERVICE_INTERVAL_3 > 0
69
 #if SERVICE_INTERVAL_3 > 0
61
-  void menu_service3() { _menu_service(3, PSTR(SERVICE_NAME_3)); }
70
+  void menu_service3() {
71
+    char sram[30];
72
+    strncpy_P(sram, PSTR(SERVICE_NAME_3), 29);
73
+    do_select_screen(
74
+      PSTR(MSG_BUTTON_RESET), PSTR(MSG_BUTTON_CANCEL),
75
+      []{ _service_reset(3); },
76
+      ui.goto_previous_screen,
77
+      PSTR(MSG_SERVICE_RESET), sram, PSTR("?")
78
+    );
79
+  }
62
 #endif
80
 #endif
63
 
81
 
64
-#endif // HAS_LCD_MENU && HAS_SERVICE_INTERVALS && PRINTCOUNTER
82
+#endif // HAS_LCD_MENU && HAS_SERVICE_INTERVALS

+ 8
- 9
buildroot/share/tests/megaatmega2560-tests View File

93
 #
93
 #
94
 restore_configs
94
 restore_configs
95
 opt_set MOTHERBOARD BOARD_MINIRAMBO
95
 opt_set MOTHERBOARD BOARD_MINIRAMBO
96
-opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING MESH_EDIT_MENU \
97
-           EEPROM_SETTINGS EEPROM_CHITCHAT \
96
+opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
97
+           ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
98
+           AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_EDITING MESH_EDIT_MENU \
98
            M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR \
99
            M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR \
99
-           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
100
-           ULTIMAKERCONTROLLER SDSUPPORT \
101
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 \
102
-           BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \
103
-           ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE \
104
-           LCD_INFO_MENU M114_DETAIL
100
+           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \
101
+           NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
102
+           ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
103
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
105
 opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
104
 opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
106
 opt_set I2C_SLAVE_ADDRESS 63
105
 opt_set I2C_SLAVE_ADDRESS 63
107
-exec_test $1 $2 "MINIRAMBO for PWM_MOTOR_CURRENT etc"
106
+exec_test $1 $2 "MINIRAMBO with M100, PWM_MOTOR_CURRENT, PRINTCOUNTER, etc."
108
 
107
 
109
 #
108
 #
110
 # Mixing Extruder with 5 steppers, Cyrillic
109
 # Mixing Extruder with 5 steppers, Cyrillic

Loading…
Cancel
Save