Przeglądaj źródła

hasstatus => has_status

Scott Lahteine 6 lat temu
rodzic
commit
54ec5528a0

+ 1
- 1
Marlin/src/gcode/motion/G4.cpp Wyświetl plik

38
     SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
38
     SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
39
   #endif
39
   #endif
40
 
40
 
41
-  if (!ui.hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
41
+  if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL);
42
 
42
 
43
   dwell(dwell_ms);
43
   dwell(dwell_ms);
44
 }
44
 }

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp Wyświetl plik

1090
   refresh();
1090
   refresh();
1091
 }
1091
 }
1092
 
1092
 
1093
-bool MarlinUI::hasstatus() { return (status_message[0] != '\0'); }
1093
+bool MarlinUI::has_status() { return (status_message[0] != '\0'); }
1094
 
1094
 
1095
 void MarlinUI::setstatus(const char * const message, const bool persist) {
1095
 void MarlinUI::setstatus(const char * const message, const bool persist) {
1096
   if (status_message_level > 0) return;
1096
   if (status_message_level > 0) return;

+ 3
- 3
Marlin/src/lcd/ultralcd.h Wyświetl plik

303
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
303
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
304
         static uint8_t status_scroll_offset;
304
         static uint8_t status_scroll_offset;
305
       #endif
305
       #endif
306
-      static bool hasstatus();
306
+      static bool has_status();
307
 
307
 
308
       static uint8_t lcd_status_update_delay;
308
       static uint8_t lcd_status_update_delay;
309
       static uint8_t status_message_level;      // Higher levels block lower levels
309
       static uint8_t status_message_level;      // Higher levels block lower levels
346
 
346
 
347
       static void refresh() {}
347
       static void refresh() {}
348
       static inline void reset_alert_level() {}
348
       static inline void reset_alert_level() {}
349
-      static constexpr bool hasstatus() { return true; }
349
+      static constexpr bool has_status() { return true; }
350
 
350
 
351
     #endif
351
     #endif
352
 
352
 
366
     static inline void status_printf_P(const uint8_t level, PGM_P const fmt, ...) { UNUSED(level); UNUSED(fmt); }
366
     static inline void status_printf_P(const uint8_t level, PGM_P const fmt, ...) { UNUSED(level); UNUSED(fmt); }
367
     static inline void reset_status() {}
367
     static inline void reset_status() {}
368
     static inline void reset_alert_level() {}
368
     static inline void reset_alert_level() {}
369
-    static constexpr bool hasstatus() { return false; }
369
+    static constexpr bool has_status() { return false; }
370
 
370
 
371
   #endif
371
   #endif
372
 
372
 

Ładowanie…
Anuluj
Zapisz