Merge branch 'main' of github.com:sparkfun/sfe-iot-node-lorawan

Author: gigapod

.github/workflows/build-iotnode-lorawan.yml

@@ -1,15 +1,12 @@
 name: IoT Node - LoRaWAN -  Firmware build Action
 on:
   push:
-
-  workflow_dispatch:
     branches:
-      - 'main'
-      - 'develop'
-      - 'feature/**'
-      - 'release/**'
-      - 'hotfix/**'
+        - main
 
+  workflow_dispatch:
+    
+      
 env:
   ARDUINO_RP2040_DIR: .arduino15/packages/rp2040/hardware/rp2040/4.3.1
   IOT_NODE_LORAWAN_APP_KEY: ${{ secrets.IOT_NODE_LORAWAN_APP_KEY }}
@@ -27,7 +24,7 @@ jobs:
       # checkout flux-sdk
       - name: Checkout the flux-sdk
         run: |
-          git clone --branch release/iot-node-lorawan-release-v1.0.0 https://github.com/sparkfun/flux-sdk.git
+          git clone --branch release/iot-node-lorawan-v1.0.1 https://github.com/sparkfun/flux-sdk.git
           echo "FLUX_SDK_PATH=`pwd`/flux-sdk" >> $GITHUB_ENV
 
       # Run cmake - this will build a custom SparkFun_Flux library we can use with
@@ -52,43 +49,49 @@ jobs:
 
       # Install RP2040 - 4.0.3 (Nov, 2024)
       - name: Arduino - Install rp2040 platform
-        run: arduino-cli core install rp2040:rp2040@4.3.1
+        run: arduino-cli core install rp2040:rp2040@4.4.4
 
-      - name: Patch in our IOT Node boards
-        run: |
-          cd patch
-          cp boards.txt $HOME/$ARDUINO_RP2040_DIR/boards.txt
-          cp -R sparkfun_iotnode_lorawanrp2350 $HOME/$ARDUINO_RP2040_DIR/variants/
-          cp sparkfun_iotnode_lorawan_rp2350.h $HOME/$ARDUINO_RP2040_DIR//pico-sdk/src/boards/include/boards/
-          cd ..
+    #   - name: Patch in our IOT Node boards
+    #     run: |
+    #       cd patch
+    #       cp boards.txt $HOME/$ARDUINO_RP2040_DIR/boards.txt
+    #       cp -R sparkfun_iotnode_lorawanrp2350 $HOME/$ARDUINO_RP2040_DIR/variants/
+    #       cp sparkfun_iotnode_lorawan_rp2350.h $HOME/$ARDUINO_RP2040_DIR//pico-sdk/src/boards/include/boards/
+    #       cd ..
 
       # install the libraries Flux uses
       - name: Install Flux dependant libraries
         run: ./flux-sdk/install-libs.sh
 
       # currently using a local copy of the library that removed some warning messages - source is here:
       # arduino-cli lib install --git-url "https://github.com/felixgalindo/XBeeArduino.git"
+      # arduino-cli lib install --git-url "https://github.com/sparkfun/XBeeArduino.git"
       - name: Install The XBee LoRaWAN library
         run: |
           arduino-cli config set library.enable_unsafe_install true
-          arduino-cli lib install --git-url "https://github.com/sparkfun/XBeeArduino.git"
+          arduino-cli lib install --git-url "https://github.com/felixgalindo/XBeeArduino.git"
           arduino-cli lib install FastLED
 
       # Compile time - build the Firmware for the data logger.
       # Note:
       #   - The use of a full path to flux - this is needed or the build fails (relative paths get merged).
       #   - ** Nov 25 - for build testing, using the pro micro board definition until new board added
+      # 
+      # May 2025 -
+      # Add filesystem params for the flash layout - 1MB+ for prefs, 4MB for filesystem, the rest (11MB) for firmware
 
       - name: Compile DataLogger firmware binary
         run:
           arduino-cli compile --fqbn rp2040:rp2040:sparkfun_iotnode_lorawanrp2350 ./sfeIoTNodeLoRaWAN/sfeIoTNodeLoRaWAN.ino
           --build-property "compiler.cpp.extra_flags=\"-DIOT_NODE_LORAWAN_APP_KEY=$IOT_NODE_LORAWAN_APP_KEY\" \"-DFLX_SPARKFUN_LORAWAN_APP_EUI=$FLX_SPARKFUN_LORAWAN_APP_EUI\" \"-DBUILD_NUMBER=$GITHUB_RUN_NUMBER\""
+          --build-property build.flash_length=11526144 --build-property upload.maximum_size=11526144 --build-property build.eeprom_start=284155904 --build-property build.fs_end=284155904 --build-property build.fs_start=279961600 --build-property build.flash_total=16777216 
           --export-binaries --clean --library `pwd`/SparkFun_IoTNodeLoRaWAN
 
-      # Upload the build files - bootloader, paritions, firmware
-      - uses: actions/upload-artifact@v4
+      # Upload the build files - bootloader, partitions, firmware
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: Upload Build
-          path: sfeIoTNodeLoRaWAN/build/rp2040.rp2040.sparkfun_iotnode_lorawanrp2350/sfeIoTNodeLoRaWAN.ino.uf2
+          name: Upload Builds
+          path: sfeIoTNodeLoRaWAN/build/rp2040.rp2040.sparkfun_iotnode_lorawanrp2350/
 
 

.gitignore

@@ -0,0 +1,4 @@
+
+build/
+
+SparkFun_IoTNodeLoRaWAN/

CMakeLists.txt

@@ -28,8 +28,12 @@ flux_sdk_add_module(
     flux_logging
     flux_system
     flux_prefs
+    flux_prefs_json
     flux_prefs_serial
     flux_network
+    flux_sdcard
+    flux_file
+    flux_firmware
     device_bme280
     device_bme68x
     device_bmp384
@@ -57,7 +61,8 @@ flux_sdk_add_module(
     device_vcnl4040
     device_veml6075
     device_veml7700
-    device_vl53l1x)
+    device_vl53l1x
+    device_soilmoisture)
 
 # now call the init function/macro - this will build the Arduino Library SparkFun_Flux under this
 # main directory

README.md

@@ -24,7 +24,10 @@ Details are outlined in [IoT Node - LoRaWAN Documentation](https://docs.sparkfun
 
 ## Latest Firmware
 
-* Version 01.00.00 - [Release](https://github.com/sparkfun/sfe-iot-node-lorawan/releases/tag/v01.00.00)
+* Version 01.01.00 - [Release](https://github.com/sparkfun/sfe-iot-node-lorawan/releases/tag/v01.01.00)
+
+> [!NOTE]
+> With firmware version v1.1.0 and above, the XBee LR module on the IoT Node - LoRaWAN board must be running firmware version A5013 - (May 1, 2025) or later. Details on the firmware and how to update are located [here](https://hub.digi.com/support/products/xbee-studio/?_gl=1*1dnbbi0*_gcl_au*MTY5MDM3NjY5LjE3NDYwNDk1Nzg.*_ga*MjY3MjAwOTM1LjE3NDYwNDk1Nzg.*_ga_RZXDK3PM3B*MTc0NjIyNTE0NC42LjAuMTc0NjIyNTE0NC42MC4wLjE4MzUzMzYzNjg.)
 
 ## Documentation
 

sfeIoTNodeLoRaWAN/flxLoRaWANDigi.cpp

@@ -391,7 +391,7 @@ bool flxLoRaWANDigi::setupModule(void)
     for (int i = 0; i < 3; i++)
     {
         flxLog_N_(F("."));
-        if (_pXBeeLR->getLoRaWANDevEUI((uint8_t *)_devEUI, sizeof(_devEUI)))
+        if (_pXBeeLR->getLoRaWANDevEUI(_devEUI, sizeof(_devEUI)))
         {
             status = true;
             break;
@@ -408,13 +408,13 @@ bool flxLoRaWANDigi::setupModule(void)
 
     // note:
     // TODO: this wasn't working in 12/2024 -- need to revisit in the future as the XBee LR library is updated
-    // // Set the region
-    // if (!_pXBeeLR->setLoRaWANRegion(_lora_region))
-    //     flxLog_W(F("%s: Error setting the LoRaWAN Region to `%s`"), name(), getRegionName());
-    // else
-    //     flxLog_V(F("%s: Set the LoRaWAN Region to `%s`"), name(), getRegionName());
+    // Set the region
+    if (!_pXBeeLR->setLoRaWANRegion(_lora_region))
+        flxLog_W(F("%s: Error setting the LoRaWAN Region to `%s`"), name(), getRegionName());
+    else
+        flxLog_V_(F("%s: Set the LoRaWAN Region to `%s`"), name(), getRegionName());
 
-    // flxLog_N_(F("."));
+    flxLog_N_(F("."));
 
     // Do we need to configure the module?
     if (_moduleConfigured() == false)

sfeIoTNodeLoRaWAN/flxLoRaWANLogger.cpp

@@ -9,6 +9,7 @@
  */
 
 #include "flxLoRaWANLogger.h"
+#include <Flux/flxDeviceValueTypes.h>
 
 //---------------------------------------------------------------------------
 // flxLoRaWANLogger Class - outputs data to the lorawan during a log event
@@ -52,7 +53,46 @@ void flxLoRaWANLogger::logObservation(void)
             // we don't process arrays. We only process scalar values
             if ((param->flags() & kParameterOutFlagArray) == kParameterOutFlagArray)
             {
-                flxLog_V("Array parameters not supported by LoRaWAN driver. Parameter: %s", param->name());
+                flxParameterOutArray *pArray = (flxParameterOutArray *)param->accessor();
+                // look for known values - if not, skip
+                switch (pArray->valueType())
+                {
+                case kParamValueLocation: {
+
+                    flxDataArrayFloat *parrData = (flxDataArrayFloat *)pArray->get();
+
+                    // is the data array sane?
+                    if (parrData->size() != 2)
+                    {
+                        flxLog_W("Location array size is not 2. Size: %d", parrData->size());
+                        continue;
+                    }
+
+                    // location is a two element float array, that we want to send in the same packet.
+                    // So first, flush the buffer, then send the data
+                    _pLoRaWAN->flushBuffer();
+
+                    // trick the system into thinking we have a float array, which the LoRaWAN driver
+                    // can handle. We need to do this because the LoRaWAN driver is expecting a float array[2]
+                    float *pfData = parrData->get();
+                    float tmparr[2] = {pfData[0], pfData[1]};
+
+                    if (flxIsLoggingVerbose())
+                    {
+                        // dump out details for the parameter. Note - for packed value, this depends on
+                        // verbose output from the packer.
+                        flxLog_V_("LoRa Packing [%s::%s]  Type: Location  Value ID: 0x%02X Value: (%f,%f)",
+                                  pDevice->name(), param->name(), pArray->valueType(), tmparr[0], tmparr[1]);
+                    }
+
+                    // send the data
+                    status = _pLoRaWAN->sendData(pArray->valueType(), tmparr);
+                    break;
+                }
+                default:
+                    flxLog_V("Array parameters not supported by LoRaWAN driver. Parameter: %s", param->name());
+                    break;
+                }
                 continue;
             }
             flxParameterOutScalar *pScalar = (flxParameterOutScalar *)param->accessor();