Sfoglia il codice sorgente

Tweak MMU beeps, misc. cleanup

Scott Lahteine 3 anni fa
parent
commit
4975e93350

+ 2
- 4
Marlin/src/feature/mmu2/mmu2.cpp Vedi File

838
 
838
 
839
       if (move_axes && all_axes_homed()) {
839
       if (move_axes && all_axes_homed()) {
840
         LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
840
         LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
841
-        BUZZ(200, 404);
842
-        BUZZ(200, 404);
841
+        BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
843
 
842
 
844
         // Move XY to starting position, then Z
843
         // Move XY to starting position, then Z
845
         do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
844
         do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
848
         do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
847
         do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
849
       }
848
       }
850
       else {
849
       else {
851
-        BUZZ(200, 404);
852
-        BUZZ(200, 404);
850
+        BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
853
         LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
851
         LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
854
       }
852
       }
855
     }
853
     }

+ 1
- 1
Marlin/src/gcode/config/M302.cpp Vedi File

37
  *
37
  *
38
  *       M302         ; report current cold extrusion state
38
  *       M302         ; report current cold extrusion state
39
  *       M302 P0      ; enable cold extrusion checking
39
  *       M302 P0      ; enable cold extrusion checking
40
- *       M302 P1      ; disables cold extrusion checking
40
+ *       M302 P1      ; disable cold extrusion checking
41
  *       M302 S0      ; always allow extrusion (disables checking)
41
  *       M302 S0      ; always allow extrusion (disables checking)
42
  *       M302 S170    ; only allow extrusion above 170
42
  *       M302 S170    ; only allow extrusion above 170
43
  *       M302 S170 P1 ; set min extrude temp to 170 but leave disabled
43
  *       M302 S170 P1 ; set min extrude temp to 170 but leave disabled

+ 3
- 1
Marlin/src/gcode/sd/M24_M25.cpp Vedi File

98
 
98
 
99
     print_job_timer.pause();
99
     print_job_timer.pause();
100
 
100
 
101
-    TERN(DWIN_CREALITY_LCD,,ui.reset_status());
101
+    #if DISABLED(DWIN_CREALITY_LCD)
102
+      ui.reset_status();
103
+    #endif
102
 
104
 
103
     #if ENABLED(HOST_ACTION_COMMANDS)
105
     #if ENABLED(HOST_ACTION_COMMANDS)
104
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("Pause SD"), PSTR("Resume")));
106
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("Pause SD"), PSTR("Resume")));

+ 2
- 2
Marlin/src/lcd/dwin/e3v2/dwin.cpp Vedi File

1099
 
1099
 
1100
   // Copy into filebuf string before entry
1100
   // Copy into filebuf string before entry
1101
   char * const name = card.longest_filename();
1101
   char * const name = card.longest_filename();
1102
-  const int8_t npos = _MAX(0, DWIN_WIDTH - strlen(name) * MENU_CHR_W) / 2;
1102
+  const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * MENU_CHR_W) / 2;
1103
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
1103
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
1104
 
1104
 
1105
   DWIN_ICON_Show(ICON, ICON_PrintTime, 17, 193);
1105
   DWIN_ICON_Show(ICON, ICON_PrintTime, 17, 193);
1787
   inline void Draw_SDItem_Shifted(int8_t &shift) {
1787
   inline void Draw_SDItem_Shifted(int8_t &shift) {
1788
     // Limit to the number of chars past the cutoff
1788
     // Limit to the number of chars past the cutoff
1789
     const size_t len = strlen(shift_name);
1789
     const size_t len = strlen(shift_name);
1790
-    NOMORE(shift, _MAX((signed)len - MENU_CHAR_LIMIT, 0));
1790
+    NOMORE(shift, _MAX(len - MENU_CHAR_LIMIT, 0U));
1791
 
1791
 
1792
     // Shorten to the available space
1792
     // Shorten to the available space
1793
     const size_t lastchar = _MIN((signed)len, shift + MENU_CHAR_LIMIT);
1793
     const size_t lastchar = _MIN((signed)len, shift + MENU_CHAR_LIMIT);

+ 2
- 2
Marlin/src/sd/cardreader.cpp Vedi File

53
   #include "../feature/pause.h"
53
   #include "../feature/pause.h"
54
 #endif
54
 #endif
55
 
55
 
56
-#define DEBUG_OUT ENABLED(DEBUG_CARDREADER)
56
+#define DEBUG_OUT EITHER(DEBUG_CARDREADER, MARLIN_DEV_MODE)
57
 #include "../core/debug_out.h"
57
 #include "../core/debug_out.h"
58
 
58
 
59
 // public:
59
 // public:
716
   cdroot();
716
   cdroot();
717
 }
717
 }
718
 
718
 
719
-void CardReader::closefile(const bool store_location) {
719
+void CardReader::closefile(const bool store_location/*=false*/) {
720
   file.sync();
720
   file.sync();
721
   file.close();
721
   file.close();
722
   flag.saving = flag.logging = false;
722
   flag.saving = flag.logging = false;

Loading…
Annulla
Salva