fixes for STM32

resolves #1010
nRF24 · Nov 26, 2024 · 1fc6ce8 · 1fc6ce8
1 parent 8aa7103
commit 1fc6ce8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/RF24.cpp b/RF24.cpp
@@ -1368,6 +1368,11 @@ bool RF24::startWrite(const void* buf, uint8_t len, const bool multicast)
     ce(HIGH);
 #if !defined(F_CPU) || F_CPU > 20000000
     delayMicroseconds(10);
+#endif
+#ifdef ARDUINO_ARCH_STM32
+    if (F_CPU > 20000000) {
+        delayMicroseconds(10);
+    }
 #endif
     ce(LOW);
     return !(status & _BV(TX_FULL));

diff --git a/examples/scanner/scanner.ino b/examples/scanner/scanner.ino
@@ -141,7 +141,7 @@ void loop(void) {
   if (Serial.available()) {
     int8_t c = Serial.parseInt();
     if (c >= 0) {
-      c = min(125, max(0, c));  // clamp channel to supported range
+      c = min((int8_t)125, c);  // clamp channel to supported range
       constCarrierMode = 1;
       radio.stopListening();
       delay(2);
@@ -199,7 +199,7 @@ void loop(void) {
     // Print out channel measurements, clamped to a single hex digit
     for (int i = 0; i < num_channels; ++i) {
       if (values[i])
-        Serial.print(min(0xf, values[i]), HEX);
+        Serial.print(min((uint8_t)0xf, values[i]), HEX);
       else
         Serial.print(F("-"));
     }