Merge branch 'master' into dynusb

earlephilhower · web-flow · commit 2be197190afa · 2025-09-21T15:22:48.000-07:00
diff --git a/cores/rp2040/Arduino.h b/cores/rp2040/Arduino.h
@@ -170,6 +170,9 @@ constexpr uint64_t __bitset(const int (&a)[N], size_t i = 0U) {
 #define __FIRSTANALOGGPIO 26
 #endif
 
+// For peripherals where a pin may be not used
+#define NOPIN ((pin_size_t) 0xff)
+
 #ifdef __cplusplus
 using namespace arduino;
 #endif
diff --git a/cores/rp2040/RP2040Support.h b/cores/rp2040/RP2040Support.h
@@ -175,7 +175,7 @@ class _MFIFO {
 
 class RP2040;
 extern RP2040 rp2040;
-extern "C" void main1();
+extern void main1();
 extern "C" char __StackLimit;
 extern "C" char __bss_end__;
 extern "C" void setup1() __attribute__((weak));
diff --git a/cores/rp2040/SerialPIO.cpp b/cores/rp2040/SerialPIO.cpp
@@ -338,7 +338,7 @@ int SerialPIO::available() {
     if (!_running || !m || (_rx == NOPIN)) {
         return 0;
     }
-    return (_writer - _reader) % _fifoSize;
+    return (_fifoSize + _writer - _reader) % _fifoSize;
 }
 
 int SerialPIO::availableForWrite() {
diff --git a/cores/rp2040/SerialPIO.h b/cores/rp2040/SerialPIO.h
@@ -29,7 +29,6 @@ extern "C" typedef struct uart_inst uart_inst_t;
 
 class SerialPIO : public arduino::HardwareSerial {
 public:
-    static const pin_size_t NOPIN = 0xff; // Use in constructor to disable RX or TX unit
     SerialPIO(pin_size_t tx, pin_size_t rx, size_t fifoSize = 32);
     ~SerialPIO();
 
diff --git a/cores/rp2040/Tone.cpp b/cores/rp2040/Tone.cpp
@@ -45,7 +45,7 @@ static inline bool pio_sm_get_enabled(PIO pio, uint sm) {
     return (pio->ctrl & ~(1u << sm)) & (1 << sm);
 }
 
-int64_t _stopTonePIO(alarm_id_t id, void *user_data) {
+static int64_t _stopTonePIO(alarm_id_t id, void *user_data) {
     (void) id;
     Tone *tone = (Tone *)user_data;
     tone->alarm = 0;
diff --git a/cores/rp2040/WMath.cpp b/cores/rp2040/WMath.cpp
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <Arduino.h>
 
 void randomSeed(uint32_t dwSeed) {
     if (dwSeed != 0) {
diff --git a/cores/rp2040/delay.cpp b/cores/rp2040/delay.cpp
@@ -18,6 +18,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <Arduino.h>
 #include <pico.h>
 #include <pico/time.h>
 
diff --git a/cores/rp2040/lwip_wrap.cpp b/cores/rp2040/lwip_wrap.cpp
@@ -845,6 +845,7 @@ extern "C" {
             return;
         }
 #endif
+        (void) buffer;
         cb(cbData);
         return;
     }
diff --git a/cores/rp2040/main.cpp b/cores/rp2040/main.cpp
@@ -55,7 +55,7 @@ bool core1_separate_stack __attribute__((weak)) = false;
 bool core1_disable_systick __attribute__((weak)) = false;
 extern void setup1() __attribute__((weak));
 extern void loop1() __attribute__((weak));
-extern "C" void main1() {
+void __attribute__((__noreturn__)) main1() {
     if (!core1_disable_systick) {
         // Don't install the SYSTICK exception handler. rp2040.getCycleCount will not work properly on core1
         rp2040.begin(1);
diff --git a/cores/rp2040/wiring_private.cpp b/cores/rp2040/wiring_private.cpp
@@ -82,7 +82,7 @@ void *_gpioIrqCBParam[__GPIOCNT];
 
 // Only 1 GPIO IRQ callback for all pins, so we need to look at the pin it's for and
 // dispatch to the real callback manually
-void _gpioInterruptDispatcher(uint gpio, uint32_t events) {
+static void _gpioInterruptDispatcher(uint gpio, uint32_t events) {
     (void) events;
     uint64_t mask = 1LL << gpio;
     if (_gpioIrqEnabled & mask) {
diff --git a/docs/piouart.rst b/docs/piouart.rst
@@ -12,13 +12,13 @@ are supported, as well as data sizes from 5- to 8-bits.  Fifosize, if not
 specified, defaults to 32 bytes.
 
 To instantiate only a serial transmit or receive unit, pass in
-``SerialPIO::NOPIN`` as the ``txpin`` or ``rxpin``.
+``NOPIN`` as the ``txpin`` or ``rxpin``.
 
 For example, to make a transmit-only port on GP16
 
 .. code:: cpp
 
-        SerialPIO transmitter( 16, SerialPIO::NOPIN );
+        SerialPIO transmitter( 16, NOPIN );
 
 For detailed information about the Serial ports, see the
 Arduino `Serial Reference <https://www.arduino.cc/reference/en/language/functions/communication/serial/>`_ .
diff --git a/docs/spi.rst b/docs/spi.rst
@@ -16,6 +16,9 @@ SPI pinouts can be set **before SPI.begin()** using the following calls:
 Note that the ``CS`` pin can be hardware or software controlled by the sketch.
 When software controlled, the ``setCS()`` call is ignored.
 
+Passing in ``NOPIN`` to either ``setRX`` or ``setTX`` will disable SPI on that
+interface, making it behave as a unidirectional (output- or input-only SPI interface.
+
 The Arduino `SPI documentation <https://docs.arduino.cc/language-reference/en/functions/communication/SPI/>`_ gives
 a detailed overview of the library, except for the following RP2040-specific
 changes:
diff --git a/libraries/LittleFS/src/LittleFS.h b/libraries/LittleFS/src/LittleFS.h
@@ -146,7 +146,7 @@ class LittleFSImpl : public FSImpl {
         if ((rc == 0) && _timeCallback) {
             time_t now = _timeCallback();
             // Add metadata with creation time to the directory marker
-            int rc = lfs_setattr(&_lfs, path, 'c', (const void *)&now, sizeof(now));
+            rc = lfs_setattr(&_lfs, path, 'c', (const void *)&now, sizeof(now));
             if (rc < 0) {
                 DEBUGV("Unable to set creation time on '%s' to %ld\n", path, (long)now);
             }
diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp
@@ -281,6 +281,11 @@ bool SPIClassRP2040::setRX(pin_size_t pin) {
         return true;
     }
 
+    if (!_running && (pin == NOPIN)) {
+        _RX = pin;
+        return true;
+    }
+
     if (_running) {
         panic("FATAL: Attempting to set SPI%s.RX while running", spi_get_index(_spi) ? "1" : "");
     } else {
@@ -362,6 +367,11 @@ bool SPIClassRP2040::setTX(pin_size_t pin) {
         return true;
     }
 
+    if (!_running && (pin == NOPIN)) {
+        _TX = pin;
+        return true;
+    }
+
     if (_running) {
         panic("FATAL: Attempting to set SPI%s.TX while running", spi_get_index(_spi) ? "1" : "");
     } else {
@@ -372,13 +382,22 @@ bool SPIClassRP2040::setTX(pin_size_t pin) {
 
 void SPIClassRP2040::begin(bool hwCS) {
     DEBUGSPI("SPI::begin(%d), rx=%d, cs=%d, sck=%d, tx=%d\n", hwCS, _RX, _CS, _SCK, _TX);
-    gpio_set_function(_RX, GPIO_FUNC_SPI);
+
+    if ((_RX == NOPIN) && (_TX == NOPIN)) {
+        panic("SPI%s: TX and RX assigned to NOPIN", spi_get_index(_spi) ? "1" : "");
+    }
+
+    if (_RX != NOPIN) {
+        gpio_set_function(_RX, GPIO_FUNC_SPI);
+    }
     _hwCS = hwCS;
     if (hwCS) {
         gpio_set_function(_CS, GPIO_FUNC_SPI);
     }
     gpio_set_function(_SCK, GPIO_FUNC_SPI);
-    gpio_set_function(_TX, GPIO_FUNC_SPI);
+    if (_TX != NOPIN) {
+        gpio_set_function(_TX, GPIO_FUNC_SPI);
+    }
     // Give a default config in case user doesn't use beginTransaction
     beginTransaction(_spis);
     endTransaction();
@@ -391,12 +410,16 @@ void SPIClassRP2040::end() {
         _initted = false;
         spi_deinit(_spi);
     }
-    gpio_set_function(_RX, GPIO_FUNC_SIO);
+    if (_RX != NOPIN) {
+        gpio_set_function(_RX, GPIO_FUNC_SIO);
+    }
     if (_hwCS) {
         gpio_set_function(_CS, GPIO_FUNC_SIO);
     }
     gpio_set_function(_SCK, GPIO_FUNC_SIO);
-    gpio_set_function(_TX, GPIO_FUNC_SIO);
+    if (_TX != NOPIN) {
+        gpio_set_function(_TX, GPIO_FUNC_SIO);
+    }
     _spis = SPISettings(0, LSBFIRST, SPI_MODE0);
 }
 
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
diff --git a/libraries/SingleFileDrive/src/SingleFileDrive.cpp b/libraries/SingleFileDrive/src/SingleFileDrive.cpp

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ int SerialPIO::available() {`
`338`	`338`	`if (!_running \|\| !m \|\| (_rx == NOPIN)) {`
`339`	`339`	`return 0;`
`340`	`340`	`}`
`341`		`- return (_writer - _reader) % _fifoSize;`
	`341`	`+ return (_fifoSize + _writer - _reader) % _fifoSize;`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`int SerialPIO::availableForWrite() {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static inline bool pio_sm_get_enabled(PIO pio, uint sm) {`
`45`	`45`	`return (pio->ctrl & ~(1u << sm)) & (1 << sm);`
`46`	`46`	`}`
`47`	`47`
`48`		`-int64_t _stopTonePIO(alarm_id_t id, void *user_data) {`
	`48`	`+static int64_t _stopTonePIO(alarm_id_t id, void *user_data) {`
`49`	`49`	`(void) id;`
`50`	`50`	`Tone tone = (Tone )user_data;`
`51`	`51`	`tone->alarm = 0;`
Original file line number	Diff line number	Diff line change
`@@ -845,6 +845,7 @@ extern "C" {`
`845`	`845`	`return;`
`846`	`846`	`}`
`847`	`847`	`#endif`
	`848`	`+ (void) buffer;`
`848`	`849`	`cb(cbData);`
`849`	`850`	`return;`
`850`	`851`	`}`