Merge/template v2.7.0

.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:

CMakeLists.txt

@@ -17,5 +17,3 @@ target_sources(app PRIVATE src/app_settings.c)
 target_sources(app PRIVATE src/app_state.c)
 target_sources(app PRIVATE src/app_sensors.c)
 target_sources(app PRIVATE src/qm30vt2.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

@@ -22,7 +22,6 @@ images](https://github.com/golioth/reference-design-modbus-vibration-monitor/rel
 
 - 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
@@ -59,8 +58,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.
@@ -327,7 +326,7 @@ these repositories from `west.yml` and remove the includes/function
 calls from the C code.
 
   - [golioth-zephyr-boards](https://github.com/golioth/golioth-zephyr-boards)
-    includes the board definitions for the Golioth Aludel-Mini
+    includes the board definitions for the Golioth Aludel-Elixir
   - [libostentus](https://github.com/golioth/libostentus) is a helper
     library for controlling the Ostentus ePaper faceplate
   - [zephyr-network-info](https://github.com/golioth/zephyr-network-info)

boards/aludel_elixir_ns.conf

@@ -2,50 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # General config
-CONFIG_HEAP_MEM_POOL_SIZE=4096
-CONFIG_NEWLIB_LIBC=y
-CONFIG_CBPRINTF_FP_SUPPORT=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
-
-# 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
-
-# Generate MCUboot compatible images
-CONFIG_BOOTLOADER_MCUBOOT=y
-
-# Use Golioth Ostentus Faceplate
-CONFIG_LIB_OSTENTUS=y
+CONFIG_ALUDEL_BATTERY_MONITOR=y
 
+# Turn on regulator to power click headers
 CONFIG_REGULATOR=y

prj.conf

@@ -25,10 +25,10 @@ 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_COAP_EXTENDED_OPTIONS_LEN=y
+CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=39
 
 # Application
 CONFIG_MAIN_STACK_SIZE=4096
@@ -55,7 +55,7 @@ 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

boards/aludel_mini_nrf9160_ns.conf → socs/nrf9160_ns.conf

@@ -1,6 +1,3 @@
-# Copyright (c) 2023-2024 Golioth, Inc.
-# SPDX-License-Identifier: Apache-2.0
-
 # General config
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_NEWLIB_LIBC=y
@@ -26,8 +23,8 @@ 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
+# Increased sysworkq size, due to LTE connectivity
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 # Disable options y-selected by NCS for no good reason
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
@@ -39,11 +36,13 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 CONFIG_NORDIC_SECURITY_BACKEND=n
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 
-# Battery Support
-CONFIG_ALUDEL_BATTERY_MONITOR=y
-
-# Add Network Info Support
-CONFIG_MODEM_INFO=y
+# Configure Golioth SDK dependencies (for NCS)
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=2048
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
 
 # Generate MCUboot compatible images
 CONFIG_BOOTLOADER_MCUBOOT=y
+
+# Add Network Info Support
+CONFIG_NETWORK_INFO=y
+CONFIG_MODEM_INFO=y

src/app_rpc.c

@@ -12,7 +12,10 @@ LOG_MODULE_REGISTER(app_rpc, LOG_LEVEL_DBG);
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/reboot.h>
 
+#ifdef CONFIG_NETWORK_INFO
 #include <network_info.h>
+#endif
+
 #include "app_rpc.h"
 
 static void reboot_work_handler(struct k_work *work)
@@ -35,9 +38,9 @@ static enum golioth_rpc_status on_get_network_info(zcbor_state_t *request_params
 						   zcbor_state_t *response_detail_map,
 						   void *callback_arg)
 {
-	network_info_add_to_map(response_detail_map);
-
-	return GOLIOTH_RPC_OK;
+	COND_CODE_1(CONFIG_NETWORK_INFO,
+		    (network_info_add_to_map(response_detail_map); return GOLIOTH_RPC_OK;),
+		    (return GOLIOTH_RPC_UNIMPLEMENTED););
 }
 
 static enum golioth_rpc_status on_set_log_level(zcbor_state_t *request_params_array,
@@ -86,8 +89,7 @@ static enum golioth_rpc_status on_set_log_level(zcbor_state_t *request_params_ar
 }
 
 static enum golioth_rpc_status on_reboot(zcbor_state_t *request_params_array,
-					 zcbor_state_t *response_detail_map,
-					 void *callback_arg)
+					 zcbor_state_t *response_detail_map, void *callback_arg)
 {
 	/* Use work queue so this RPC can return confirmation to Golioth */
 	k_work_submit(&reboot_work);

src/app_sensors.c

@@ -24,7 +24,7 @@ static const struct device *o_dev = DEVICE_DT_GET_ANY(golioth_ostentus);
 #endif
 
 #ifdef CONFIG_ALUDEL_BATTERY_MONITOR
-#include "battery_monitor/battery.h"
+#include <battery_monitor.h>
 #endif
 
 #define ZEPHYR_USER_NODE DT_PATH(zephyr_user)