From d3bb5b69ba46e3e0f56838da21e24fa3ba98a5a4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 26 May 2019 03:01:43 -0500 Subject: [PATCH] Apply NOLESS/NOMORE --- Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp | 2 +- Marlin/src/sd/cardreader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp index 0e2f94c35..a07f6ab20 100644 --- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp +++ b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp @@ -49,7 +49,7 @@ void Heater::update() { last = now; heat += (heater_state - heat) * (delta / 1000000000.0); - if (heat < room_temp_raw) heat = room_temp_raw; + NOLESS(heat, room_temp_raw); Gpio::pin_map[analogInputToDigitalPin(adc_pin)].value = 0xFFFF - (uint16_t)heat; } } diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 51702fa22..72b15410f 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -798,7 +798,7 @@ void CardReader::setroot() { // Never sort more than the max allowed // If you use folders to organize, 20 may be enough - if (fileCnt > SDSORT_LIMIT) fileCnt = SDSORT_LIMIT; + NOMORE(fileCnt, SDSORT_LIMIT); // Sort order is always needed. May be static or dynamic. #if ENABLED(SDSORT_DYNAMIC_RAM)