Browse Source

Apply NOLESS/NOMORE

Scott Lahteine 5 years ago
parent
commit
d3bb5b69ba
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
  2. 1
    1
      Marlin/src/sd/cardreader.cpp

+ 1
- 1
Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp View File

49
     last = now;
49
     last = now;
50
     heat += (heater_state - heat) * (delta / 1000000000.0);
50
     heat += (heater_state - heat) * (delta / 1000000000.0);
51
 
51
 
52
-    if (heat < room_temp_raw) heat = room_temp_raw;
52
+    NOLESS(heat, room_temp_raw);
53
     Gpio::pin_map[analogInputToDigitalPin(adc_pin)].value = 0xFFFF - (uint16_t)heat;
53
     Gpio::pin_map[analogInputToDigitalPin(adc_pin)].value = 0xFFFF - (uint16_t)heat;
54
   }
54
   }
55
 }
55
 }

+ 1
- 1
Marlin/src/sd/cardreader.cpp View File

798
 
798
 
799
       // Never sort more than the max allowed
799
       // Never sort more than the max allowed
800
       // If you use folders to organize, 20 may be enough
800
       // If you use folders to organize, 20 may be enough
801
-      if (fileCnt > SDSORT_LIMIT) fileCnt = SDSORT_LIMIT;
801
+      NOMORE(fileCnt, SDSORT_LIMIT);
802
 
802
 
803
       // Sort order is always needed. May be static or dynamic.
803
       // Sort order is always needed. May be static or dynamic.
804
       #if ENABLED(SDSORT_DYNAMIC_RAM)
804
       #if ENABLED(SDSORT_DYNAMIC_RAM)

Loading…
Cancel
Save