diff --git a/library.properties b/library.properties index 1a0517a61..d61c8966f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper -version=1.0.0-beta.120 +version=1.0.0-beta.121 author=Adafruit maintainer=Adafruit sentence=Arduino application for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index d1ea1b1dd..56f37ed2b 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -139,7 +139,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.120" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.121" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic diff --git a/src/network_interfaces/Wippersnapper_AIRLIFT.h b/src/network_interfaces/Wippersnapper_AIRLIFT.h index 081b0692f..63b767db6 100644 --- a/src/network_interfaces/Wippersnapper_AIRLIFT.h +++ b/src/network_interfaces/Wippersnapper_AIRLIFT.h @@ -27,8 +27,14 @@ #include "WiFiNINA.h" #include "Wippersnapper.h" +#if defined ARDUINO_ADAFRUIT_FRUITJAM_RP2350 +#define NINAFWVER \ + "3.3.0" /*!< Fruit Jam's ESP32-C6 requires nina-fw version 3.3.0+ to work \ + with this library. */ +#else #define NINAFWVER \ "1.7.7" /*!< min. nina-fw version compatible with this library. */ +#endif #define AIRLIFT_CONNECT_TIMEOUT_MS 20000 /*!< Connection timeout (in ms) */ #define AIRLIFT_CONNECT_RETRY_DELAY_MS 200 /*!< delay time between retries. */ @@ -337,11 +343,14 @@ class Wippersnapper_AIRLIFT : public Wippersnapper { WS_PRINTER.flush(); feedWDT(); - // validate co-processor's firmware version + // Validate nina-fw version if (!firmwareCheck()) { // TODO: see if there's a way to add to bootlog without usb reattach - WS_DEBUG_PRINTLN("Please upgrade the firmware on the ESP module to the " - "latest version."); + WS_DEBUG_PRINTLN("ERROR: Incompatible nina-fw version!"); + WS_DEBUG_PRINT("Required nina-fw version: "); + WS_DEBUG_PRINTLN(NINAFWVER); + WS_PRINTER.flush(); + return; } WS_DEBUG_PRINT("Connecting to ");