zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Apply NOLESS/NOMORE

Browse source
This commit is contained in:
Scott Lahteine 2019-05-26 03:01:43 -05:00
parent b315157053
commit d3bb5b69ba
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
View file

@ -49,7 +49,7 @@ void Heater::update() {
last = now; last = now;
heat += (heater_state - heat) * (delta / 1000000000.0); 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; Gpio::pin_map[analogInputToDigitalPin(adc_pin)].value = 0xFFFF - (uint16_t)heat;
} }
} }

2
Marlin/src/sd/cardreader.cpp
View file

@ -798,7 +798,7 @@ void CardReader::setroot() {
// Never sort more than the max allowed // Never sort more than the max allowed
// If you use folders to organize, 20 may be enough // 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. // Sort order is always needed. May be static or dynamic.
#if ENABLED(SDSORT_DYNAMIC_RAM) #if ENABLED(SDSORT_DYNAMIC_RAM)