Browse Source

Move 'last_pause_state' closer to usage

Scott Lahteine 4 years ago
parent
commit
b579f5dc99
1 changed files with 7 additions and 6 deletions
  1. 7
    6
      Marlin/src/module/temperature.cpp

+ 7
- 6
Marlin/src/module/temperature.cpp View File

1030
     if (!inited) return watchdog_refresh();
1030
     if (!inited) return watchdog_refresh();
1031
   #endif
1031
   #endif
1032
 
1032
 
1033
-  #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
1034
-    static bool last_pause_state;
1035
-  #endif
1036
-
1037
   #if ENABLED(EMERGENCY_PARSER)
1033
   #if ENABLED(EMERGENCY_PARSER)
1038
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
1034
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
1039
   #endif
1035
   #endif
1125
       }
1121
       }
1126
     #endif // WATCH_BED
1122
     #endif // WATCH_BED
1127
 
1123
 
1124
+    #define PAUSE_CHANGE_REQD BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
1125
+    #if PAUSE_CHANGE_REQD
1126
+      static bool last_pause_state;
1127
+    #endif
1128
+
1128
     do {
1129
     do {
1129
 
1130
 
1130
       #if DISABLED(PIDTEMPBED)
1131
       #if DISABLED(PIDTEMPBED)
1131
         if (PENDING(ms, next_bed_check_ms)
1132
         if (PENDING(ms, next_bed_check_ms)
1132
-          #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
1133
+          #if PAUSE_CHANGE_REQD
1133
             && paused == last_pause_state
1134
             && paused == last_pause_state
1134
           #endif
1135
           #endif
1135
         ) break;
1136
         ) break;
1136
         next_bed_check_ms = ms + BED_CHECK_INTERVAL;
1137
         next_bed_check_ms = ms + BED_CHECK_INTERVAL;
1137
-        #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
1138
+        #if PAUSE_CHANGE_REQD
1138
           last_pause_state = paused;
1139
           last_pause_state = paused;
1139
         #endif
1140
         #endif
1140
       #endif
1141
       #endif

Loading…
Cancel
Save