Bring SAMD Airlift in-line for v2

Author: brentru

examples/Wippersnapper_demo/.pico_rp2350_tinyusb.test.skip renamed to examples/Wippersnapper_demo/.pico_rp2350_tinyusb.generate

@@ -62,7 +62,7 @@
     while (millis() - start < timeout) {                                       \
       delay(10);                                                               \
       yield();                                                                 \
-      feedWDT();                                                               \
+      WsV2.feedWDTV2();                                                               \
       if (millis() < start) {                                                  \
         start = millis();                                                      \
       }                                                                        \

examples/Wippersnapper_demo/.picow_rp2040_tinyusb.test.skip

@@ -11,7 +11,7 @@
  * please support Adafruit and open-source hardware by purchasing
  * products from Adafruit!
  *
- * Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
+ * Copyright (c) Brent Rubell 2020-2025 for Adafruit Industries.
  *
  * MIT license, all text here must be included in any redistribution.
  *
@@ -25,30 +25,30 @@
 #include "Arduino.h"
 #include "SPI.h"
 #include "WiFiNINA.h"
-#include "Wippersnapper.h"
+#include "Wippersnapper_V2.h"
+#include "../../helpers/ws_helper_macros.h"
 
-#define NINAFWVER                                                              \
-  "1.7.7" /*!< min. nina-fw version compatible with this library. */
+#define NINAFWVER "2.0.0-rc.0+adafruit" /*!< min. nina-fw version compatible with this library. */
 #define AIRLIFT_CONNECT_TIMEOUT_MS 20000   /*!< Connection timeout (in ms) */
 #define AIRLIFT_CONNECT_RETRY_DELAY_MS 200 /*!< delay time between retries. */
 
 #define SPIWIFI SPI /*!< Instance of SPI interface used by an AirLift. */
 
-extern Wippersnapper WS; ///< Global Wippersnapper instance
+extern Wippersnapper_V2 WsV2; ///< Wippersnapper client instance
 /****************************************************************************/
 /*!
     @brief  Class for using the AirLift Co-Processor network iface.
 */
 /****************************************************************************/
-class ws_wifi_airlift : public Wippersnapper {
+class ws_wifi_airlift : public Wippersnapper_V2 {
 
 public:
   /**************************************************************************/
   /*!
   @brief  Initializes the Adafruit IO class for AirLift devices.
   */
   /**************************************************************************/
-  ws_wifi_airlift() : Wippersnapper() {
+  ws_wifi_airlift() : Wippersnapper_V2() {
     _ssPin = SPIWIFI_SS;     // 10;
     _ackPin = SPIWIFI_ACK;   // 7;
     _rstPin = SPIWIFI_RESET; // 5; // should be 7 on PyPortals
@@ -72,8 +72,8 @@ class ws_wifi_airlift : public Wippersnapper {
   */
   /**************************************************************************/
   ~ws_wifi_airlift() {
-    if (_mqtt)
-      delete _mqtt;
+    if (_mqttV2)
+      delete _mqttV2;
   }
 
   /**********************************************************/
@@ -97,8 +97,8 @@ class ws_wifi_airlift : public Wippersnapper {
   */
   /**********************************************************/
   void set_ssid_pass() {
-    _ssid = WS._config.network.ssid;
-    _pass = WS._config.network.pass;
+    _ssid = WsV2._configV2.network.ssid;
+    _pass = WsV2._configV2.network.pass;
   }
 
   /***********************************************************/
@@ -231,7 +231,7 @@ class ws_wifi_airlift : public Wippersnapper {
   void getMacAddr() {
     uint8_t mac[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     WiFi.macAddress(mac);
-    memcpy(WS._macAddr, mac, sizeof(mac));
+    memcpy(WsV2._macAddrV2, mac, sizeof(mac));
   }
 
   /********************************************************/
@@ -250,9 +250,9 @@ class ws_wifi_airlift : public Wippersnapper {
   */
   /********************************************************/
   void setupMQTTClient(const char *clientID) {
-    WS._mqtt = new Adafruit_MQTT_Client(
-        _mqtt_client, WS._config.aio_url, WS._config.io_port, clientID,
-        WS._config.aio_user, WS._config.aio_key);
+    WsV2._mqttV2 = new Adafruit_MQTT_Client(
+        _mqtt_client, WsV2._configV2.aio_url, WsV2._configV2.io_port, clientID,
+        WsV2._configV2.aio_user, WsV2._configV2.aio_key);
   }
 
   /********************************************************/
@@ -300,7 +300,7 @@ class ws_wifi_airlift : public Wippersnapper {
   /**************************************************************************/
   void _connect() {
     if (strlen(_ssid) == 0) {
-      _status = WS_SSID_INVALID; // possibly unneccesary  as already checking
+      _statusV2 = WS_SSID_INVALID; // possibly unneccesary  as already checking
                                  // elsewhere
     } else {
       // disconnect from possible previous connection
@@ -310,16 +310,16 @@ class ws_wifi_airlift : public Wippersnapper {
       _wifi->end();
       delay(100);
       _wifi->begin();
-      feedWDT();
+      WsV2.feedWDTV2();
       // reset the esp32 if possible
       resetAirLift();
-      feedWDT();
+      WsV2.feedWDTV2();
 
       WS_DEBUG_PRINT("ESP32 booted, version: ");
       WS_PRINTER.flush();
       WS_DEBUG_PRINTLN(WiFi.firmwareVersion());
       WS_PRINTER.flush();
-      feedWDT();
+      WsV2.feedWDTV2();
 
       // validate co-processor's firmware version
       if (!firmwareCheck()) {
@@ -330,26 +330,25 @@ class ws_wifi_airlift : public Wippersnapper {
       WS_DEBUG_PRINT("Connecting to ");
       WS_DEBUG_PRINTLN(_ssid);
       WS_PRINTER.flush();
-      feedWDT();
+      WsV2.feedWDTV2();
       WiFi.begin(_ssid, _pass);
-      _status = WS_NET_DISCONNECTED;
+      _statusV2 = WS_NET_DISCONNECTED;
 
       // Use the macro to retry the status check until connected / timed out
       int lastResult = -1;
       RETRY_FUNCTION_UNTIL_TIMEOUT(
           []() -> int { return WiFi.status(); }, // Function call each cycle
-          int,                                   // return type
           lastResult,                            // return variable
           [](int status) { return status == WL_CONNECTED; }, // check
           AIRLIFT_CONNECT_TIMEOUT_MS,      // timeout interval (ms)
           AIRLIFT_CONNECT_RETRY_DELAY_MS); // interval between retries
 
       if (lastResult == WL_CONNECTED) {
-        _status = WS_NET_CONNECTED;
+        _statusV2 = WS_NET_CONNECTED;
         // wait 2seconds for connection to stabilize
         WS_DELAY_WITH_WDT(2000);
       } else {
-        _status = WS_NET_DISCONNECTED; // maybe connect failed instead?
+        _statusV2 = WS_NET_DISCONNECTED; // maybe connect failed instead?
       }
     }
   }

src/Wippersnapper_V2.h

@@ -25,7 +25,7 @@
     while (millis() - start < timeout) {                                       \
       delay(10);                                                               \
       yield();                                                                 \
-      feedWDT();                                                               \
+      WsV2.feedWDTV2();                                                               \
       if (millis() < start) {                                                  \
         start = millis(); /* if rollover */                                    \
       }                                                                        \
@@ -51,12 +51,12 @@
             The arguments to pass to the function.
 */
 /**************************************************************************/
-#define RETRY_FUNCTION_UNTIL_TIMEOUT(func, result_type, result_var, condition, \
+#define RETRY_FUNCTION_UNTIL_TIMEOUT(func, result_var, condition, \
                                      timeout, interval, ...)                   \
   {                                                                            \
     unsigned long startTime = millis();                                        \
     while (millis() - startTime < timeout) {                                   \
-      result_type result_var = func(__VA_ARGS__);                              \
+      result_var = func(__VA_ARGS__);                                          \
       if (condition(result_var)) {                                             \
         break;                                                                 \
       }                                                                        \