Merge pull request #816 from adafruit/fruit-jam-platformio

Fruit Jam fixes + tweaks (plus airlift FW reported in bootlog)

Author: tyeth

.github/workflows/build-clang-doxy.yml

@@ -664,6 +664,7 @@ jobs:
         # manually install OneWireNG/TempControlLib for OneWireNg (RP2040 Supported OneWire w/backwards compat.)
       - name: Install extra Arduino libraries
         run: |
+          git clone --quiet https://github.com/adafruit/WiFiNINA.git /home/runner/Arduino/libraries/WiFiNINA
           git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
           git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
           git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit WipperSnapper
-version=1.0.0-beta.114
+version=1.0.0-beta.115
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Arduino application for Adafruit.io WipperSnapper

platformio.ini

@@ -669,6 +669,16 @@ build_flags =
     ; -DPIO_FRAMEWORK_ARDUINO_ENABLE_IPV6
 
 [env:adafruit_fruitjam]
+extends = common:arduinopico
+board = adafruit_fruitjam
+board_build.filesystem_size = 8m
+lib_ignore = WiFi, WiFi101, Adafruit Zero DMA Library
+build_flags = -DUSE_TINYUSB -DARDUINO_ADAFRUIT_FRUITJAM_RP2350
+
+[env:adafruit_fruitjam_debug]
+extends = common:arduinopico
+build_type = debug
 board = adafruit_fruitjam
+board_build.filesystem_size = 8m
 lib_ignore = WiFi, WiFi101, Adafruit Zero DMA Library
-build_flags = -DUSE_TINYUSB -DADAFRUIT_FRUITJAM_RP2350
+build_flags = -DUSE_TINYUSB -DARDUINO_ADAFRUIT_FRUITJAM_RP2350

src/Wippersnapper.h

@@ -144,7 +144,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-beta.114" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.115" ///< WipperSnapper app. version (semver-formatted)
 
 // Reserved Adafruit IO MQTT topics
 #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic
@@ -372,10 +372,11 @@ class Wippersnapper {
   ws_uart *_uartComponent;        ///< Instance of UART class
 
   // TODO: does this really need to be global?
-  uint8_t _macAddr[6];  /*!< Unique network iface identifier */
-  char sUID[13];        /*!< Unique network iface identifier */
-  const char *_boardId; /*!< Adafruit IO+ board string */
-  Adafruit_MQTT *_mqtt; /*!< Reference to Adafruit_MQTT, _mqtt. */
+  uint8_t _macAddr[6];          /*!< Unique network iface identifier */
+  char sUID[13];                /*!< Unique network iface identifier */
+  const char *_airlift_version; /*!< AirLift Firmware version */
+  const char *_boardId;         /*!< Adafruit IO+ board string */
+  Adafruit_MQTT *_mqtt;         /*!< Reference to Adafruit_MQTT, _mqtt. */
 
   secretsConfig _config; /*!< Wippersnapper secrets.json as a struct. */
   networkConfig _multiNetworks[3]; /*!< Wippersnapper networks as structs. */

src/Wippersnapper_Networking.h

@@ -24,7 +24,7 @@
 #if defined(ADAFRUIT_METRO_M4_EXPRESS) ||                                      \
     defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) ||   \
     defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT) ||            \
-    defined(ADAFRUIT_FRUITJAM_RP2350)
+    defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
 #include "network_interfaces/Wippersnapper_AIRLIFT.h"
 /** Nina-FW (adafruit fork) networking class */
 typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -195,7 +195,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
   */
   /********************************************************/
   bool firmwareCheck() {
-    _fv = WiFi.firmwareVersion();
+    WS._airlift_version = _fv = WiFi.firmwareVersion();
     return compareVersions(_fv, NINAFWVER);
   }
 
@@ -242,6 +242,9 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
   */
   /********************************************************/
   void getMacAddr() {
+    if (_fv == "0.0.1") {
+      (void)firmwareCheck(); // ensure _fv is set in bootlog
+    }
     byte mac[6] = {0};
     WiFi.macAddress(mac);
     memcpy(WS._macAddr, mac, sizeof(mac));

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -29,7 +29,7 @@
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) ||                             \
     defined(ARDUINO_XIAO_ESP32S3) || \
-    defined(ADAFRUIT_FRUITJAM_RP2350)
+    defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
 
 #include "Wippersnapper_FS.h"
 #include "print_dependencies.h"
@@ -296,6 +296,13 @@ bool Wippersnapper_FS::createBootFile() {
     bootFile.print("Board ID: ");
     bootFile.println(BOARD_ID);
 
+#if defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT) ||          \
+    defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || \
+    defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
+    bootFile.print("AirLift FW Revision: ");
+    bootFile.println(WS._airlift_version);
+#endif
+
     sprintf(sMAC, "%02X:%02X:%02X:%02X:%02X:%02X", WS._macAddr[0],
             WS._macAddr[1], WS._macAddr[2], WS._macAddr[3], WS._macAddr[4],
             WS._macAddr[5]);