Parcourir la source

🎨 Misc. issue review patches

Scott Lahteine il y a 3 ans
Parent
révision
a7549aac5c

+ 4
- 4
Marlin/Configuration_adv.h Voir le fichier

329
  * Thermal Protection parameters for the laser cooler.
329
  * Thermal Protection parameters for the laser cooler.
330
  */
330
  */
331
 #if ENABLED(THERMAL_PROTECTION_COOLER)
331
 #if ENABLED(THERMAL_PROTECTION_COOLER)
332
-  #define THERMAL_PROTECTION_COOLER_PERIOD    10 // Seconds
333
-  #define THERMAL_PROTECTION_COOLER_HYSTERESIS 3 // Degrees Celsius
332
+  #define THERMAL_PROTECTION_COOLER_PERIOD     10 // Seconds
333
+  #define THERMAL_PROTECTION_COOLER_HYSTERESIS  3 // Degrees Celsius
334
 
334
 
335
   /**
335
   /**
336
    * Laser cooling watch settings (M143/M193).
336
    * Laser cooling watch settings (M143/M193).
337
    */
337
    */
338
-  #define WATCH_COOLER_TEMP_PERIOD            60 // Seconds
339
-  #define WATCH_COOLER_TEMP_INCREASE           3 // Degrees Celsius
338
+  #define WATCH_COOLER_TEMP_PERIOD             60 // Seconds
339
+  #define WATCH_COOLER_TEMP_INCREASE            3 // Degrees Celsius
340
 #endif
340
 #endif
341
 
341
 
342
 #if ENABLED(PIDTEMP)
342
 #if ENABLED(PIDTEMP)

+ 2
- 2
Marlin/src/gcode/feature/pause/M600.cpp Voir le fichier

106
     // Change toolhead if specified
106
     // Change toolhead if specified
107
     const uint8_t active_extruder_before_filament_change = active_extruder;
107
     const uint8_t active_extruder_before_filament_change = active_extruder;
108
     if (active_extruder != target_extruder && TERN1(DUAL_X_CARRIAGE, !idex_is_duplicating()))
108
     if (active_extruder != target_extruder && TERN1(DUAL_X_CARRIAGE, !idex_is_duplicating()))
109
-      tool_change(target_extruder, false);
109
+      tool_change(target_extruder);
110
   #endif
110
   #endif
111
 
111
 
112
   // Initial retract before move to filament change position
112
   // Initial retract before move to filament change position
159
   #if HAS_MULTI_EXTRUDER
159
   #if HAS_MULTI_EXTRUDER
160
     // Restore toolhead if it was changed
160
     // Restore toolhead if it was changed
161
     if (active_extruder_before_filament_change != active_extruder)
161
     if (active_extruder_before_filament_change != active_extruder)
162
-      tool_change(active_extruder_before_filament_change, false);
162
+      tool_change(active_extruder_before_filament_change);
163
   #endif
163
   #endif
164
 
164
 
165
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
165
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool

+ 5
- 5
Marlin/src/gcode/feature/pause/M701_M702.cpp Voir le fichier

85
     // Change toolhead if specified
85
     // Change toolhead if specified
86
     uint8_t active_extruder_before_filament_change = active_extruder;
86
     uint8_t active_extruder_before_filament_change = active_extruder;
87
     if (active_extruder != target_extruder)
87
     if (active_extruder != target_extruder)
88
-      tool_change(target_extruder, false);
88
+      tool_change(target_extruder);
89
   #endif
89
   #endif
90
 
90
 
91
   auto move_z_by = [](const_float_t zdist) {
91
   auto move_z_by = [](const_float_t zdist) {
124
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
124
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
125
     // Restore toolhead if it was changed
125
     // Restore toolhead if it was changed
126
     if (active_extruder_before_filament_change != active_extruder)
126
     if (active_extruder_before_filament_change != active_extruder)
127
-      tool_change(active_extruder_before_filament_change, false);
127
+      tool_change(active_extruder_before_filament_change);
128
   #endif
128
   #endif
129
 
129
 
130
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
130
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
188
     // Change toolhead if specified
188
     // Change toolhead if specified
189
     uint8_t active_extruder_before_filament_change = active_extruder;
189
     uint8_t active_extruder_before_filament_change = active_extruder;
190
     if (active_extruder != target_extruder)
190
     if (active_extruder != target_extruder)
191
-      tool_change(target_extruder, false);
191
+      tool_change(target_extruder);
192
   #endif
192
   #endif
193
 
193
 
194
   // Lift Z axis
194
   // Lift Z axis
202
     #if BOTH(HAS_MULTI_EXTRUDER, FILAMENT_UNLOAD_ALL_EXTRUDERS)
202
     #if BOTH(HAS_MULTI_EXTRUDER, FILAMENT_UNLOAD_ALL_EXTRUDERS)
203
       if (!parser.seenval('T')) {
203
       if (!parser.seenval('T')) {
204
         HOTEND_LOOP() {
204
         HOTEND_LOOP() {
205
-          if (e != active_extruder) tool_change(e, false);
205
+          if (e != active_extruder) tool_change(e);
206
           unload_filament(-fc_settings[e].unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
206
           unload_filament(-fc_settings[e].unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
207
         }
207
         }
208
       }
208
       }
228
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
228
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
229
     // Restore toolhead if it was changed
229
     // Restore toolhead if it was changed
230
     if (active_extruder_before_filament_change != active_extruder)
230
     if (active_extruder_before_filament_change != active_extruder)
231
-      tool_change(active_extruder_before_filament_change, false);
231
+      tool_change(active_extruder_before_filament_change);
232
   #endif
232
   #endif
233
 
233
 
234
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
234
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool

+ 1
- 1
Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h Voir le fichier

39
   AMPAUSESTATE_PARKING,
39
   AMPAUSESTATE_PARKING,
40
   AMPAUSESTATE_PARKED,
40
   AMPAUSESTATE_PARKED,
41
   AMPAUSESTATE_FILAMENT_OUT,
41
   AMPAUSESTATE_FILAMENT_OUT,
42
-  AMPAUSESTATE_FIAMENT_PRUGING,
42
+  AMPAUSESTATE_FILAMENT_PURGING,
43
   AMPAUSESTATE_HEATER_TIMEOUT,
43
   AMPAUSESTATE_HEATER_TIMEOUT,
44
   AMPAUSESTATE_REHEATING,
44
   AMPAUSESTATE_REHEATING,
45
   AMPAUSESTATE_REHEAT_FINISHED
45
   AMPAUSESTATE_REHEAT_FINISHED

+ 4
- 4
Marlin/src/module/temperature.cpp Voir le fichier

593
     #define ONHEATINGSTART() C_TERN(ischamber, printerEventLEDs.onChamberHeatingStart(), B_TERN(isbed, printerEventLEDs.onBedHeatingStart(), printerEventLEDs.onHotendHeatingStart()))
593
     #define ONHEATINGSTART() C_TERN(ischamber, printerEventLEDs.onChamberHeatingStart(), B_TERN(isbed, printerEventLEDs.onBedHeatingStart(), printerEventLEDs.onHotendHeatingStart()))
594
     #define ONHEATING(S,C,T) C_TERN(ischamber, printerEventLEDs.onChamberHeating(S,C,T), B_TERN(isbed, printerEventLEDs.onBedHeating(S,C,T), printerEventLEDs.onHotendHeating(S,C,T)))
594
     #define ONHEATING(S,C,T) C_TERN(ischamber, printerEventLEDs.onChamberHeating(S,C,T), B_TERN(isbed, printerEventLEDs.onBedHeating(S,C,T), printerEventLEDs.onHotendHeating(S,C,T)))
595
 
595
 
596
-    #define WATCH_PID BOTH(WATCH_CHAMBER, PIDTEMPCHAMBER) || BOTH(WATCH_BED, PIDTEMPBED) || BOTH(WATCH_HOTENDS, PIDTEMP)
596
+    #define WATCH_PID DISABLED(NO_WATCH_PID_TUNING) && (BOTH(WATCH_CHAMBER, PIDTEMPCHAMBER) || BOTH(WATCH_BED, PIDTEMPBED) || BOTH(WATCH_HOTENDS, PIDTEMP))
597
 
597
 
598
     #if WATCH_PID
598
     #if WATCH_PID
599
       #if BOTH(THERMAL_PROTECTION_CHAMBER, PIDTEMPCHAMBER)
599
       #if BOTH(THERMAL_PROTECTION_CHAMBER, PIDTEMPCHAMBER)
684
             if (cycles > 2) {
684
             if (cycles > 2) {
685
               const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
685
               const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
686
                           Tu = float(t_low + t_high) * 0.001f,
686
                           Tu = float(t_low + t_high) * 0.001f,
687
-                          pf = ischamber ? 0.2f : (isbed ? 0.2f : 0.6f),
688
-                          df = ischamber ? 1.0f / 3.0f : (isbed ? 1.0f / 3.0f : 1.0f / 8.0f);
687
+                          pf = (ischamber || isbed) ? 0.2f : 0.6f,
688
+                          df = (ischamber || isbed) ? 1.0f / 3.0f : 1.0f / 8.0f;
689
 
689
 
690
               tune_pid.Kp = Ku * pf;
690
               tune_pid.Kp = Ku * pf;
691
               tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
691
               tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
731
             if (!heated) {                                            // If not yet reached target...
731
             if (!heated) {                                            // If not yet reached target...
732
               if (current_temp > next_watch_temp) {                   // Over the watch temp?
732
               if (current_temp > next_watch_temp) {                   // Over the watch temp?
733
                 next_watch_temp = current_temp + watch_temp_increase; // - set the next temp to watch for
733
                 next_watch_temp = current_temp + watch_temp_increase; // - set the next temp to watch for
734
-                temp_change_ms = ms + SEC_TO_MS(watch_temp_period);     // - move the expiration timer up
734
+                temp_change_ms = ms + SEC_TO_MS(watch_temp_period);   // - move the expiration timer up
735
                 if (current_temp > watch_temp_target) heated = true;  // - Flag if target temperature reached
735
                 if (current_temp > watch_temp_target) heated = true;  // - Flag if target temperature reached
736
               }
736
               }
737
               else if (ELAPSED(ms, temp_change_ms))                   // Watch timer expired
737
               else if (ELAPSED(ms, temp_change_ms))                   // Watch timer expired

Chargement…
Annuler
Enregistrer