Merge branch 'earlephilhower:master' into lowpower

Author: maxgerhardt

README.md

@@ -16,9 +16,11 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Raspberry Pi Pico
 * Raspberry Pi Pico W
 * Raspberry Pi Pico 2
+* Raspberry Pi Pico 2W
 * 0xCB Helios
 * Adafruit Feather RP2040
 * Adafruit Feather RP2040 SCORPIO
+* Adafruit Floppsy RP2040
 * Adafruit ItsyBitsy RP2040
 * Adafruit KB2040
 * Adafruit Macropad RP2040

boards.txt

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 4
-#define ARDUINO_PICO_MINOR 2
-#define ARDUINO_PICO_REVISION 1
-#define ARDUINO_PICO_VERSION_STR "4.2.1"
+#define ARDUINO_PICO_MINOR 3
+#define ARDUINO_PICO_REVISION 0
+#define ARDUINO_PICO_VERSION_STR "4.3.0"

cores/rp2040/RP2040Version.h

@@ -23,11 +23,15 @@
 #include <pico/cyw43_driver.h>
 
 extern bool __isPicoW;
+#ifdef __cplusplus
 extern "C" {
-    void init_cyw43_wifi();
-    void __lockBluetooth();
-    void __unlockBluetooth();
-    void cyw43_pinMode(pin_size_t pin, PinMode mode);
-    void cyw43_digitalWrite(pin_size_t pin, PinStatus val);
-    PinStatus cyw43_digitalRead(pin_size_t pin);
+#endif
+void init_cyw43_wifi();
+void __lockBluetooth();
+void __unlockBluetooth();
+void cyw43_pinMode(pin_size_t pin, PinMode mode);
+void cyw43_digitalWrite(pin_size_t pin, PinStatus val);
+PinStatus cyw43_digitalRead(pin_size_t pin);
+#ifdef __cplusplus
 }
+#endif

cores/rp2040/cyw43_wrappers.h

@@ -76,10 +76,13 @@ extern "C" void *pcalloc(size_t count, size_t size) {
 #else
 // No PSRAM, always fail
 extern "C" void *pmalloc(size_t size) {
+    (void) size;
     return nullptr;
 }
 
 extern "C" void *pcalloc(size_t count, size_t size) {
+    (void) count;
+    (void) size;
     return nullptr;
 }
 #endif

cores/rp2040/flash_wrapper.cpp

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'4.2.1'
+version = u'4.3.0'
 # The full version, including alpha/beta/rc tags.
-release = u'4.2.1'
+release = u'4.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

cores/rp2040/malloc-lock.cpp

@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H
 
 #define PICO_SDK_VERSION_MAJOR    2
-#define PICO_SDK_VERSION_MINOR    0
-#define PICO_SDK_VERSION_REVISION 1
-#define PICO_SDK_VERSION_STRING   "2.0.1-develop"
+#define PICO_SDK_VERSION_MINOR    1
+#define PICO_SDK_VERSION_REVISION 0
+#define PICO_SDK_VERSION_STRING   "2.1.0"
 
 #endif

docs/conf.py

@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H
 
 #define PICO_SDK_VERSION_MAJOR    2
-#define PICO_SDK_VERSION_MINOR    0
-#define PICO_SDK_VERSION_REVISION 1
-#define PICO_SDK_VERSION_STRING   "2.0.1-develop"
+#define PICO_SDK_VERSION_MINOR    1
+#define PICO_SDK_VERSION_REVISION 0
+#define PICO_SDK_VERSION_STRING   "2.1.0"
 
 #endif

include/rp2040/pico_base/pico/version.h

@@ -67,8 +67,3 @@
 -Wl,--wrap=cyw43_tcpip_link_status
 -Wl,--wrap=cyw43_cb_tcpip_init
 -Wl,--wrap=cyw43_cb_tcpip_deinit
-
--Wl,--wrap=flash_range_erase
--Wl,--wrap=flash_range_program
--Wl,--wrap=flash_get_unique_id
--Wl,--wrap=flash_do_cmd