Merge template at 307e809

.github/workflows/build_zephyr.yml

@@ -49,6 +49,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: app
+
+      - name: Process Board name
+        id: nicename
+        shell: bash
+        run: |
+          BOARD_NICENAME=${{ inputs.BOARD }}
+          BOARD_NICENAME=${BOARD_NICENAME//\//_}
+          echo "BOARD_NICENAME=${BOARD_NICENAME}" >> $GITHUB_OUTPUT
+
       - name: Setup West workspace
         run: |
           west init -l app
@@ -60,23 +69,24 @@ jobs:
 
       - name: Build with West
         run: |
-          west build -p -b ${{ inputs.BOARD }} app
+          west build -p -b ${{ inputs.BOARD }} --sysbuild app
 
       - name: Prepare artifacts
+        shell: bash
         if: inputs.ARTIFACT == true && inputs.TAG != ''
 
         run: |
-          cd build/zephyr
+          cd build
           mkdir -p artifacts
-          mv merged.hex     ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_full.hex
-          mv app_update.bin ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_update.bin
-          mv zephyr.elf     ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}.elf
+          mv merged.hex                   ./artifacts/modbus_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_full.hex
+          mv app/zephyr/zephyr.signed.bin ./artifacts/modbus_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_update.bin
+          mv app/zephyr/zephyr.elf        ./artifacts/modbus_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}.elf
 
       # Run IDs are unique per repo but are reused on re-runs
       - name: Save artifact
         if: inputs.ARTIFACT == true
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: build_artifacts_${{ github.run_id }}
+          name: build_artifacts_${{ github.run_id }}_${{ steps.nicename.outputs.BOARD_NICENAME }}
           path: |
-            build/zephyr/artifacts/*
+            build/artifacts/*

.github/workflows/release.yml

@@ -9,15 +9,15 @@ on:
             version:
                 description: 'Release Version.'
                 required: true
-                default: 'v0.0.0'
+                default: 'template_v0.0.0'
                 type: string
 
 jobs:
     build-binaries:
         strategy:
             matrix:
               ZEPHYR_SDK: [0.16.3]
-              BOARD: ["nrf9160dk_nrf9160_ns","aludel_mini_v1_sparkfun9160_ns"]
+              BOARD: ["nrf9160dk/nrf9160/ns","aludel_mini/nrf9160/ns","aludel_elixir/nrf9160/ns"]
 
         uses: ./.github/workflows/build_zephyr.yml
         with:
@@ -36,10 +36,11 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Download artifact
-              uses: actions/download-artifact@v3
+              uses: actions/download-artifact@v4
               with:
-                name: build_artifacts_${{ github.run_id }}
+                pattern: build_artifacts_*
                 path: ~/artifacts
+                merge-multiple: true
 
             - name: Create Release manually with GH CLI
               run: gh release create --title ${{ inputs.version }} --draft ${{ inputs.version }}

.github/workflows/test.yml

@@ -1,17 +1,30 @@
 # Copyright (c) 2023 Golioth, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-name: Test firmware    
+name: Test firmware
 
 on:
   pull_request:
 
   push:
+    branches: [ main ]
 
 jobs:
-  test_build:
+  test_build_nrf9160dk:
     uses: ./.github/workflows/build_zephyr.yml
     with:
       ZEPHYR_SDK: 0.16.3
-      BOARD: aludel_mini_v1_sparkfun9160_ns
-      ARTIFACT: false
+      BOARD: nrf9160dk/nrf9160/ns
+      ARTIFACT: false
+  test_build_aludel_elixir:
+    uses: ./.github/workflows/build_zephyr.yml
+    with:
+      ZEPHYR_SDK: 0.16.3
+      BOARD: aludel_elixir/nrf9160/ns
+      ARTIFACT: false
+  test_build_aludel_mini:
+    uses: ./.github/workflows/build_zephyr.yml
+    with:
+      ZEPHYR_SDK: 0.16.3
+      BOARD: aludel_mini/nrf9160/ns
+      ARTIFACT: false

README.md

@@ -27,6 +27,7 @@ images](https://github.com/golioth/reference-design-modbus-vibration-monitor/rel
 ### Additional Sensors/Components
 
 - Texas Instruments THVD1426 RS-485 transceiver
+- Banner QM30VT2 Banner Modbus temperature & vibration sensor
 
 ## Golioth Features
 
@@ -123,7 +124,8 @@ the LightDB Stream service:
 {
   "sensor": {
     "temperature": {
-      "celcius": 27.08
+      "celcius": 21.96,
+      "farenheight": 71.53
     },
     "x_axis": {
       "acceleration": {
@@ -294,7 +296,9 @@ folder. The `build` and `deps` directories being one level higher
 prevents the repo from cataloging all of the changes to the dependencies
 and the build (so no `.gitignore` is needed).
 
-### Use `west` to initialize the workspace and install dependencies
+Prior to building, update `VERSION` file to reflect the firmware version
+number you want to assign to this build. Then run the following commands
+to build and program the firmware onto the device.
 
 > [!WARNING]
 > You must perform a pristine build (use `-p` or remove the `build`

VERSION

@@ -0,0 +1,5 @@
+VERSION_MAJOR = 1
+VERSION_MINOR = 0
+PATCHLEVEL = 0
+VERSION_TWEAK = 0
+EXTRAVERSION =

boards/aludel_elixir_ns.conf

@@ -18,11 +18,11 @@ CONFIG_NET_SOCKETS_TLS_PRIORITY=35
 
 # Modem library
 CONFIG_NRF_MODEM_LIB=y
-CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
 
 # LTE connectivity with network connection manager
-CONFIG_LTE_CONNECTIVITY=y
-CONFIG_LTE_CONNECTIVITY_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
 CONFIG_NET_CONNECTION_MANAGER=y
 CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
 
@@ -33,6 +33,12 @@ CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 
+# MbedTLS configuration to support p-384 curve. These options
+# enable using the MbedTLS built-in support for operations not
+# supported by the default nRF Oberon crypto backend
+CONFIG_NORDIC_SECURITY_BACKEND=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+
 # Add Network Info Support
 CONFIG_MODEM_INFO=y
 
@@ -41,3 +47,5 @@ CONFIG_BOOTLOADER_MCUBOOT=y
 
 # Use Golioth Ostentus Faceplate
 CONFIG_LIB_OSTENTUS=y
+
+CONFIG_REGULATOR=y

boards/aludel_elixir_ns_B.overlay → boards/aludel_elixir_ns.overlay

@@ -10,6 +10,19 @@
 	};
 };
 
+&i2c2 {
+    status = "okay";
+
+    /* Needed for I2C writes used by libostentus */
+    zephyr,concat-buf-size = <48>;
+
+    ostentus@12 {
+        status = "okay";
+        compatible = "golioth,ostentus";
+        reg = <0x12>;
+    };
+};
+
 &mikrobus_serial {
 	status = "okay";
 
@@ -18,7 +31,3 @@
 		status = "okay";
 	};
 };
-
-&qwiic_i2c {
-	status = "okay";
-};

boards/aludel_mini_v1_sparkfun9160_ns.conf → boards/aludel_mini_nrf9160_ns.conf

@@ -18,11 +18,11 @@ CONFIG_NET_SOCKETS_TLS_PRIORITY=35
 
 # Modem library
 CONFIG_NRF_MODEM_LIB=y
-CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
 
 # LTE connectivity with network connection manager
-CONFIG_LTE_CONNECTIVITY=y
-CONFIG_LTE_CONNECTIVITY_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
 CONFIG_NET_CONNECTION_MANAGER=y
 CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
 
@@ -33,6 +33,12 @@ CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 
+# MbedTLS configuration to support p-384 curve. These options
+# enable using the MbedTLS built-in support for operations not
+# supported by the default nRF Oberon crypto backend
+CONFIG_NORDIC_SECURITY_BACKEND=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+
 # Battery Support
 CONFIG_ALUDEL_BATTERY_MONITOR=y
 
@@ -41,6 +47,3 @@ CONFIG_MODEM_INFO=y
 
 # Generate MCUboot compatible images
 CONFIG_BOOTLOADER_MCUBOOT=y
-
-# Use Golioth Ostentus Faceplate
-CONFIG_LIB_OSTENTUS=y

boards/aludel_mini_v1_sparkfun9160_ns.overlay → boards/aludel_mini_nrf9160_ns.overlay

@@ -6,10 +6,21 @@
 
 / {
 	zephyr,user {
-		rs485-8-click-en-gpios = <&mikrobus_header_1 1 GPIO_ACTIVE_HIGH>;
+		rs485-8-click-en-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 	};
 };
 
+&i2c2 {
+    /* Needed for I2C writes used by libostentus */
+    zephyr,concat-buf-size = <48>;
+
+    ostentus@12 {
+        status = "okay";
+        compatible = "golioth,ostentus";
+        reg = <0x12>;
+    };
+};
+
 /* On this board, mikrobus_spi == spi2 & mikrobus_serial == uart2, and a
  * limitation of the nRF9160 is that both can't be enabled simultaneously.
  * On this board, mikrobus_spi is enabled by default and mikrobus_serial is

boards/nrf9160dk_nrf9160_ns.conf

@@ -18,11 +18,11 @@ CONFIG_NET_SOCKETS_TLS_PRIORITY=35
 
 # Modem library
 CONFIG_NRF_MODEM_LIB=y
-CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
 
 # LTE connectivity with network connection manager
-CONFIG_LTE_CONNECTIVITY=y
-CONFIG_LTE_CONNECTIVITY_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
 CONFIG_NET_CONNECTION_MANAGER=y
 CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
 
@@ -33,6 +33,12 @@ CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 
+# MbedTLS configuration to support p-384 curve. These options
+# enable using the MbedTLS built-in support for operations not
+# supported by the default nRF Oberon crypto backend
+CONFIG_NORDIC_SECURITY_BACKEND=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+
 # Add Network Info Support
 CONFIG_MODEM_INFO=y
 

boards/nrf9160dk_nrf9160_ns.overlay

@@ -6,19 +6,42 @@
 
 / {
 	zephyr,user {
-		rs485-8-click-en-gpios = <&mikrobus_header_1 1 GPIO_ACTIVE_HIGH>;
+		rs485-8-click-en-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
 	};
 
 	aliases {
 		golioth-led = &led2;
 	};
 };
 
-&mikrobus_serial {
+&uart1 {
 	status = "okay";
 
 	modbus0 {
 		compatible = "zephyr,modbus-serial";
 		status = "okay";
 	};
 };
+
+&pinctrl {
+	/*
+	 * The default pin group includes RTS/CTS HW flow control, but the Arduino
+	 * Uno Click Shield board does not connect these pins (only TX/RX are used).
+	 * This keeps RX/TX on the same pins, but just removes RTS/CTS from the
+	 * pin groups.
+	 */
+	uart1_default: uart1_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 1)>,
+				<NRF_PSEL(UART_RX, 0, 0)>;
+		};
+	};
+
+	uart1_sleep: uart1_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 1)>,
+				<NRF_PSEL(UART_RX, 0, 0)>;
+			low-power-enable;
+		};
+	};
+};

pipelines/json-to-lightdb.yml

@@ -0,0 +1,19 @@
+filter:
+  path: "*"
+  content_type: application/json
+steps:
+  - name: step-0
+    destination:
+      type: batch
+      version: v1
+  - name: step-1
+    transformer:
+      type: extract-timestamp
+      version: v1
+  - name: step-2
+    transformer:
+      type: inject-path
+      version: v1
+    destination:
+      type: lightdb-stream
+      version: v1