Skip to content

[Fix] Implement version check for FruitJam C6 #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brentru merged 2 commits into from
Dec 3, 2025
Merged

[Fix] Implement version check for FruitJam C6 #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9aeff
[Fix] Implement guarding for FruitJam C6
brentru Dec 2, 2025
f639a73
Merge branch 'main' into patch-fj-c6
brentru Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WipperSnapper
version=1.0.0-beta.120
version=1.0.0-beta.121
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Arduino application for Adafruit.io WipperSnapper
Expand Down
2 changes: 1 addition & 1 deletion src/Wippersnapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 12 additions & 3 deletions src/network_interfaces/Wippersnapper_AIRLIFT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down Expand Up @@ -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 ");
Expand Down
Loading