浏览代码

Cleanups following recent commits

Scott Lahteine 7 年前
父节点
当前提交
71396f77d3
共有 6 个文件被更改,包括 40 次插入57 次删除
  1. 1
    1
      Marlin/Conditionals_post.h
  2. 18
    25
      Marlin/Marlin_main.cpp
  3. 18
    27
      Marlin/temperature.cpp
  4. 1
    2
      Marlin/temperature.h
  5. 1
    1
      Marlin/ubl_G29.cpp
  6. 1
    1
      Marlin/ubl_motion.cpp

+ 1
- 1
Marlin/Conditionals_post.h 查看文件

@@ -649,7 +649,7 @@
649 649
   /**
650 650
    * Heater & Fan Pausing
651 651
    */
652
-  #if ENABLED(PROBING_FANS_OFF) && FAN_COUNT == 0
652
+  #if FAN_COUNT == 0
653 653
     #undef PROBING_FANS_OFF
654 654
   #endif
655 655
   #define QUIET_PROBING (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF))

+ 18
- 25
Marlin/Marlin_main.cpp 查看文件

@@ -2057,26 +2057,21 @@ static void clean_up_after_endstop_or_probe_move() {
2057 2057
 #endif
2058 2058
 
2059 2059
 #if ENABLED(PROBING_FANS_OFF)
2060
-  void fans_pause(bool p) {
2061
-    if (p == fans_paused) { // If called out of order something is wrong
2062
-      SERIAL_ERROR_START;
2063
-      SERIAL_ERRORPGM("Fans already ");
2064
-      if (!fans_paused) SERIAL_ERRORPGM("un");
2065
-      SERIAL_ERRORLNPGM("paused!");
2066
-      return;
2067
-    }
2068 2060
 
2069
-    if (p)
2070
-      for (uint8_t x = 0;x < FAN_COUNT;x++) {
2071
-        paused_fanSpeeds[x] = fanSpeeds[x];
2072
-        fanSpeeds[x] = 0;
2073
-      }
2074
-    else
2075
-      for (uint8_t x = 0;x < FAN_COUNT;x++)
2076
-        fanSpeeds[x] = paused_fanSpeeds[x];
2077
-
2078
-    fans_paused = p;
2061
+  void fans_pause(const bool p) {
2062
+    if (p != fans_paused) {
2063
+      fans_paused = p;
2064
+      if (p)
2065
+        for (uint8_t x = 0; x < FAN_COUNT; x++) {
2066
+          paused_fanSpeeds[x] = fanSpeeds[x];
2067
+          fanSpeeds[x] = 0;
2068
+        }
2069
+      else
2070
+        for (uint8_t x = 0; x < FAN_COUNT; x++)
2071
+          fanSpeeds[x] = paused_fanSpeeds[x];
2072
+    }
2079 2073
   }
2074
+
2080 2075
 #endif // PROBING_FANS_OFF
2081 2076
 
2082 2077
 #if HAS_BED_PROBE
@@ -2091,18 +2086,16 @@ static void clean_up_after_endstop_or_probe_move() {
2091 2086
   #endif
2092 2087
 
2093 2088
   #if QUIET_PROBING
2094
-    void probing_pause(bool pause) {
2089
+    void probing_pause(const bool p) {
2095 2090
       #if ENABLED(PROBING_HEATERS_OFF)
2096
-        thermalManager.pause(pause);
2091
+        thermalManager.pause(p);
2097 2092
       #endif
2098
-
2099 2093
       #if ENABLED(PROBING_FANS_OFF)
2100
-        fans_pause(pause);
2094
+        fans_pause(p);
2101 2095
       #endif
2102
-
2103
-      if(pause) safe_delay(25);
2096
+      if (p) safe_delay(25);
2104 2097
     }
2105
-  #endif
2098
+  #endif // QUIET_PROBING
2106 2099
 
2107 2100
   #if ENABLED(BLTOUCH)
2108 2101
 

+ 18
- 27
Marlin/temperature.cpp 查看文件

@@ -1353,38 +1353,29 @@ void Temperature::disable_all_heaters() {
1353 1353
 }
1354 1354
 
1355 1355
 #if ENABLED(PROBING_HEATERS_OFF)
1356
-  void Temperature::pause(bool p) {
1357
-    if (p == paused) { // If called out of order something is wrong
1358
-      SERIAL_ERROR_START;
1359
-      SERIAL_ERRORPGM("Heaters already ");
1360
-      if (!paused) SERIAL_ERRORPGM("un");
1361
-      SERIAL_ERRORLNPGM("paused!");
1362
-      return;
1363
-    }
1364 1356
 
1365
-    if (p) {
1366
-      HOTEND_LOOP() {
1367
-        paused_hotend_temp[e] = degTargetHotend(e);
1368
-        setTargetHotend(0, e);
1357
+  void Temperature::pause(const bool p) {
1358
+    if (p != paused) {
1359
+      paused = p;
1360
+      if (p) {
1361
+        HOTEND_LOOP() {
1362
+          paused_hotend_temp[e] = degTargetHotend(e);
1363
+          setTargetHotend(0, e);
1364
+        }
1365
+        #if HAS_TEMP_BED
1366
+          paused_bed_temp = degTargetBed();
1367
+          setTargetBed(0);
1368
+        #endif
1369
+      }
1370
+      else {
1371
+        HOTEND_LOOP() setTargetHotend(paused_hotend_temp[e], e);
1372
+        #if HAS_TEMP_BED
1373
+          setTargetBed(paused_bed_temp);
1374
+        #endif
1369 1375
       }
1370
-      #if HAS_TEMP_BED
1371
-        paused_bed_temp = degTargetBed();
1372
-        setTargetBed(0);
1373
-      #endif
1374
-    }
1375
-    else {
1376
-      HOTEND_LOOP() setTargetHotend(paused_hotend_temp[e], e);
1377
-      #if HAS_TEMP_BED
1378
-        setTargetBed(paused_bed_temp);
1379
-      #endif
1380 1376
     }
1381
-
1382
-    paused = p;
1383 1377
   }
1384 1378
 
1385
-  bool Temperature::ispaused() {
1386
-    return paused;
1387
-  }
1388 1379
 #endif // PROBING_HEATERS_OFF
1389 1380
 
1390 1381
 #if ENABLED(HEATER_0_USES_MAX6675)

+ 1
- 2
Marlin/temperature.h 查看文件

@@ -458,8 +458,7 @@ class Temperature {
458 458
     #endif // BABYSTEPPING
459 459
 
460 460
     #if ENABLED(PROBING_HEATERS_OFF)
461
-      static void pause(bool p);
462
-      static bool ispaused();
461
+      static void pause(const bool p);
463 462
     #endif
464 463
 
465 464
   private:

+ 1
- 1
Marlin/ubl_G29.cpp 查看文件

@@ -1006,7 +1006,7 @@
1006 1006
     if (!ubl.state.active) SERIAL_PROTOCOLPGM("de");
1007 1007
     SERIAL_PROTOCOLLNPGM("activated.\n");
1008 1008
   }
1009
- 
1009
+
1010 1010
   bool g29_parameter_parsing() {
1011 1011
     bool err_flag = false;
1012 1012
 

+ 1
- 1
Marlin/ubl_motion.cpp 查看文件

@@ -225,7 +225,7 @@
225 225
     const float e_normalized_dist = e_position / on_axis_distance,
226 226
                 z_normalized_dist = z_position / on_axis_distance;
227 227
 
228
-    int current_xi = cell_start_xi, 
228
+    int current_xi = cell_start_xi,
229 229
         current_yi = cell_start_yi;
230 230
 
231 231
     const float m = dy / dx,

正在加载...
取消
保存