Fix compilation for cmake / pure C++

TcMenu · Oct 12, 2024 · 76178be · 76178be
1 parent f268ae0
commit 76178be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/EepromAbstractionWire.cpp b/src/EepromAbstractionWire.cpp
@@ -67,11 +67,11 @@ uint8_t I2cAt24Eeprom::findMaximumInPage(uint16_t destEeprom, uint8_t len) const
 	// We can read/write in bulk, but do no exceed the page size or we will read / write
 	// the wrong bytes
 	uint16_t offs = destEeprom % pageSize;
-    uint16_t currentGo = min((uint16_t)pageSize, uint16_t(offs + len)) - offs;
+    uint16_t currentGo = internal_min((uint16_t)pageSize, uint16_t(offs + len)) - offs;
 
 	// dont exceed the buffer length of the  wire library
     auto absoluteMax = MAX_BUFFER_SIZE_TO_USE - 2;
-	return min(currentGo, (uint16_t) absoluteMax);
+	return internal_min(currentGo, (uint16_t) absoluteMax);
 }
 
 uint8_t I2cAt24Eeprom::read8(EepromPosition position) {

diff --git a/src/SwitchInput.cpp b/src/SwitchInput.cpp
@@ -100,7 +100,7 @@ void KeyboardItem::checkAndTrigger(uint8_t buttonState){
 		else if (getState() == BUTTON_HELD && repeatInterval != NO_REPEAT && notify.callback != nullptr) {
 			counter = counter + (acceleration >> SWITCHES_ACCELERATION_DIVISOR) + 1;
 			if (counter > repeatInterval) {
-				acceleration = min(255, acceleration + 1);
+				acceleration = internal_min(255, acceleration + 1);
 				trigger(true);
 				counter = 0;
 			}
@@ -326,7 +326,7 @@ void RotaryEncoder::increment(int8_t incVal) {
 			currentReading = (currentReading + incVal);
 			if (currentReading > maximumValue) currentReading = currentReading - maximumValue - 1;
         } else {
-			currentReading = min((uint16_t)(currentReading + incVal), maximumValue);
+			currentReading = internal_min((uint16_t)(currentReading + incVal), maximumValue);
 		}
 	} else if(currentReading < abs(incVal)) {
 		currentReading = rollover? maximumValue - safeAbs(incVal) + 1 : 0;