Merge pull request #14 from golioth/merge/template_v2.8.0

Merge/template v2.8.0

Author: szczys

.github/workflows/build_zephyr.yml

@@ -13,7 +13,7 @@ on:
       BOARD:
         required: true
         type: string
-        default: aludel_mini_v1_sparkfun9160_ns
+        default: nrf9160dk/nrf9160/ns
       ARTIFACT:
         required: true
         type: boolean

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             matrix:
               ZEPHYR_SDK: [0.16.3]
-              BOARD: ["nrf9160dk/nrf9160/ns","aludel_mini/nrf9160/ns","aludel_elixir/nrf9160/ns"]
+              BOARD: ["nrf9160dk/nrf9160/ns","aludel_elixir/nrf9160/ns"]
 
         uses: ./.github/workflows/build_zephyr.yml
         with:

.github/workflows/test.yml

@@ -22,9 +22,3 @@ jobs:
       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

CMakeLists.txt

@@ -12,5 +12,3 @@ target_sources(app PRIVATE src/app_rpc.c)
 target_sources(app PRIVATE src/app_settings.c)
 target_sources(app PRIVATE src/app_state.c)
 target_sources(app PRIVATE src/app_sensors.c)
-
-add_subdirectory_ifdef(CONFIG_ALUDEL_BATTERY_MONITOR src/battery_monitor)

Kconfig

@@ -13,6 +13,4 @@ config DNS_SERVER1
 
 endif # DNS_RESOLVER
 
-rsource "src/battery_monitor/Kconfig"
-
 source "Kconfig.zephyr"

README.md

@@ -25,7 +25,6 @@ images](https://github.com/golioth/reference-design-ac-power-monitor/releases).
 
 - Nordic nRF9160-DK
 - Golioth Aludel Elixir
-- Golioth Aludel Mini
 
 ### Additional Sensors/Components
 
@@ -48,8 +47,8 @@ This app implements:
 
 ### Settings Service
 
-The following settings should be set in the Device Settings menu of the
-[Golioth Console](https://console.golioth.io).
+The following settings should be set in [the Device Settings menu of the
+Golioth Console](https://console.golioth.io/device-settings).
 
   - `LOOP_DELAY_S`
     Adjusts the delay between sensor readings. Set to an integer value
@@ -66,8 +65,8 @@ The following settings should be set in the Device Settings menu of the
 
 ### Remote Procedure Call (RPC) Service
 
-The following RPCs can be initiated in the Remote Procedure Call menu of
-the [Golioth Console](https://console.golioth.io).
+The following RPCs can be initiated in the Remote Procedure Call tab of
+each device in the [Golioth Console](https://console.golioth.io).
 
   - `get_network_info`
     Query and return network information.
@@ -150,8 +149,6 @@ should ever write to that path.
     }
 }```
 
-## Building the application
-
 ### OTA Firmware Update
 
 This application includes the ability to perform Over-the-Air (OTA)
@@ -243,7 +240,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).
 
-### Nordic nRF9160 DK
+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`

boards/aludel_elixir_ns.conf

@@ -1,44 +1,8 @@
 # Copyright (c) 2024 Golioth, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-# General config
-CONFIG_HEAP_MEM_POOL_SIZE=4096
-CONFIG_NEWLIB_LIBC=y
-
-# Networking
-CONFIG_NET_SOCKETS_OFFLOAD=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_MLD=n
-
-# Increase native TLS socket implementation, so that it is chosen instead of
-# offloaded nRF91 sockets
-CONFIG_NET_SOCKETS_TLS_PRIORITY=35
-
-# Modem library
-CONFIG_NRF_MODEM_LIB=y
-
-# LTE connectivity with network connection manager
-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
-
-# Add Logs for LTE Link Handler
-CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
-
-# Disable options y-selected by NCS for no good reason
-CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
-CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
-
-# Add Network Info Support
-CONFIG_MODEM_INFO=y
-
-# Generate MCUboot compatible images
-CONFIG_BOOTLOADER_MCUBOOT=y
-
-# Use Golioth Ostentus Faceplate
-CONFIG_LIB_OSTENTUS=y
+# Battery Support
+CONFIG_ALUDEL_BATTERY_MONITOR=y
 
+# Turn on regulator to power click headers
 CONFIG_REGULATOR=y

boards/aludel_mini_nrf9160_ns.conf

@@ -16,15 +16,15 @@ CONFIG_GOLIOTH_STREAM=y
 CONFIG_GOLIOTH_SAMPLE_COMMON=y
 
 # Configure Golioth SDK dependencies
-CONFIG_EVENTFD_MAX=14
+CONFIG_ZVFS_EVENTFD_MAX=14
+CONFIG_ZVFS_OPEN_MAX=23
 CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1536
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=10240
-CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=2048
-CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
 CONFIG_NETWORKING=y
 CONFIG_NET_IPV4=y
-CONFIG_POSIX_MAX_FDS=23
+CONFIG_COAP_EXTENDED_OPTIONS_LEN=y
+CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=39
 
 # Application
 CONFIG_MAIN_STACK_SIZE=4096
@@ -45,13 +45,12 @@ CONFIG_REBOOT=y
 # The rest of the runtime credentials config
 CONFIG_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
-CONFIG_GOLIOTH_SAMPLE_SETTINGS=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
 
 # Misc.
 CONFIG_JSON_LIBRARY=y
-CONFIG_NETWORK_INFO=y
+
 # Longer response length needed for network info
 CONFIG_GOLIOTH_RPC_MAX_RESPONSE_LEN=512
 CONFIG_I2C=y