Browse Source

🧻 Cosmetic changes (#20859)

qwewer0 4 years ago
parent
commit
90be1c3fa7
No account linked to committer's email address
2 changed files with 19 additions and 19 deletions
  1. 2
    2
      Marlin/Configuration.h
  2. 17
    17
      Marlin/Configuration_adv.h

+ 2
- 2
Marlin/Configuration.h View File

421
 #define TEMP_SENSOR_CHAMBER 0
421
 #define TEMP_SENSOR_CHAMBER 0
422
 
422
 
423
 // Dummy thermistor constant temperature readings, for use with 998 and 999
423
 // Dummy thermistor constant temperature readings, for use with 998 and 999
424
-#define DUMMY_THERMISTOR_998_VALUE 25
424
+#define DUMMY_THERMISTOR_998_VALUE  25
425
 #define DUMMY_THERMISTOR_999_VALUE 100
425
 #define DUMMY_THERMISTOR_999_VALUE 100
426
 
426
 
427
 // Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1
427
 // Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1
1360
     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1360
     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1361
     #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1361
     #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1362
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1362
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1363
-    #define G26_XY_FEEDRATE         20    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
1363
+    #define G26_XY_FEEDRATE        100    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
1364
     #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
1364
     #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
1365
   #endif
1365
   #endif
1366
 
1366
 

+ 17
- 17
Marlin/Configuration_adv.h View File

163
   #if ENABLED(CHAMBER_VENT)
163
   #if ENABLED(CHAMBER_VENT)
164
     #define CHAMBER_VENT_SERVO_NR  1  // Index of the vent servo
164
     #define CHAMBER_VENT_SERVO_NR  1  // Index of the vent servo
165
     #define HIGH_EXCESS_HEAT_LIMIT 5  // How much above target temp to consider there is excess heat in the chamber
165
     #define HIGH_EXCESS_HEAT_LIMIT 5  // How much above target temp to consider there is excess heat in the chamber
166
-    #define LOW_EXCESS_HEAT_LIMIT 3
166
+    #define LOW_EXCESS_HEAT_LIMIT  3
167
     #define MIN_COOLING_SLOPE_TIME_CHAMBER_VENT 20
167
     #define MIN_COOLING_SLOPE_TIME_CHAMBER_VENT 20
168
     #define MIN_COOLING_SLOPE_DEG_CHAMBER_VENT 1.5
168
     #define MIN_COOLING_SLOPE_DEG_CHAMBER_VENT 1.5
169
   #endif
169
   #endif
206
    * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
206
    * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
207
    * below 2.
207
    * below 2.
208
    */
208
    */
209
-  #define WATCH_TEMP_PERIOD 20                // Seconds
209
+  #define WATCH_TEMP_PERIOD  20               // Seconds
210
   #define WATCH_TEMP_INCREASE 2               // Degrees Celsius
210
   #define WATCH_TEMP_INCREASE 2               // Degrees Celsius
211
 #endif
211
 #endif
212
 
212
 
284
       // DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
284
       // DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
285
 
285
 
286
       #define PID_FAN_SCALING_AT_FULL_SPEED 13.0        //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
286
       #define PID_FAN_SCALING_AT_FULL_SPEED 13.0        //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
287
-      #define PID_FAN_SCALING_AT_MIN_SPEED 6.0          //=PID_FAN_SCALING_LIN_FACTOR*PID_FAN_SCALING_MIN_SPEED+DEFAULT_Kf
288
-      #define PID_FAN_SCALING_MIN_SPEED 10.0            // Minimum fan speed at which to enable PID_FAN_SCALING
287
+      #define PID_FAN_SCALING_AT_MIN_SPEED   6.0        //=PID_FAN_SCALING_LIN_FACTOR*PID_FAN_SCALING_MIN_SPEED+DEFAULT_Kf
288
+      #define PID_FAN_SCALING_MIN_SPEED     10.0        // Minimum fan speed at which to enable PID_FAN_SCALING
289
 
289
 
290
       #define DEFAULT_Kf (255.0*PID_FAN_SCALING_AT_MIN_SPEED-PID_FAN_SCALING_AT_FULL_SPEED*PID_FAN_SCALING_MIN_SPEED)/(255.0-PID_FAN_SCALING_MIN_SPEED)
290
       #define DEFAULT_Kf (255.0*PID_FAN_SCALING_AT_MIN_SPEED-PID_FAN_SCALING_AT_FULL_SPEED*PID_FAN_SCALING_MIN_SPEED)/(255.0-PID_FAN_SCALING_MIN_SPEED)
291
       #define PID_FAN_SCALING_LIN_FACTOR (PID_FAN_SCALING_AT_FULL_SPEED-DEFAULT_Kf)/255.0
291
       #define PID_FAN_SCALING_LIN_FACTOR (PID_FAN_SCALING_AT_FULL_SPEED-DEFAULT_Kf)/255.0
2056
  */
2056
  */
2057
 //#define FWRETRACT
2057
 //#define FWRETRACT
2058
 #if ENABLED(FWRETRACT)
2058
 #if ENABLED(FWRETRACT)
2059
-  #define FWRETRACT_AUTORETRACT           // Override slicer retractions
2059
+  #define FWRETRACT_AUTORETRACT             // Override slicer retractions
2060
   #if ENABLED(FWRETRACT_AUTORETRACT)
2060
   #if ENABLED(FWRETRACT_AUTORETRACT)
2061
-    #define MIN_AUTORETRACT 0.1           // (mm) Don't convert E moves under this length
2062
-    #define MAX_AUTORETRACT 10.0          // (mm) Don't convert E moves over this length
2063
-  #endif
2064
-  #define RETRACT_LENGTH 3                // (mm) Default retract length (positive value)
2065
-  #define RETRACT_LENGTH_SWAP 13          // (mm) Default swap retract length (positive value)
2066
-  #define RETRACT_FEEDRATE 45             // (mm/s) Default feedrate for retracting
2067
-  #define RETRACT_ZRAISE 0                // (mm) Default retract Z-raise
2068
-  #define RETRACT_RECOVER_LENGTH 0        // (mm) Default additional recover length (added to retract length on recover)
2069
-  #define RETRACT_RECOVER_LENGTH_SWAP 0   // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
2070
-  #define RETRACT_RECOVER_FEEDRATE 8      // (mm/s) Default feedrate for recovering from retraction
2071
-  #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // (mm/s) Default feedrate for recovering from swap retraction
2061
+    #define MIN_AUTORETRACT             0.1 // (mm) Don't convert E moves under this length
2062
+    #define MAX_AUTORETRACT            10.0 // (mm) Don't convert E moves over this length
2063
+  #endif
2064
+  #define RETRACT_LENGTH                3   // (mm) Default retract length (positive value)
2065
+  #define RETRACT_LENGTH_SWAP          13   // (mm) Default swap retract length (positive value)
2066
+  #define RETRACT_FEEDRATE             45   // (mm/s) Default feedrate for retracting
2067
+  #define RETRACT_ZRAISE                0   // (mm) Default retract Z-raise
2068
+  #define RETRACT_RECOVER_LENGTH        0   // (mm) Default additional recover length (added to retract length on recover)
2069
+  #define RETRACT_RECOVER_LENGTH_SWAP   0   // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
2070
+  #define RETRACT_RECOVER_FEEDRATE      8   // (mm/s) Default feedrate for recovering from retraction
2071
+  #define RETRACT_RECOVER_FEEDRATE_SWAP 8   // (mm/s) Default feedrate for recovering from swap retraction
2072
   #if ENABLED(MIXING_EXTRUDER)
2072
   #if ENABLED(MIXING_EXTRUDER)
2073
-    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
2073
+    //#define RETRACT_SYNC_MIXING           // Retract and restore all mixing steppers simultaneously
2074
   #endif
2074
   #endif
2075
 #endif
2075
 #endif
2076
 
2076
 

Loading…
Cancel
Save