Merge pull request #27 from golioth/merge/template_v2.7.1

Merge/template v2.7.1

Author: szczys

prj.conf

@@ -21,14 +21,13 @@ 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=2048
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_NET_LOG=y
 CONFIG_SHELL=y
 CONFIG_REBOOT=y
@@ -49,8 +48,6 @@ CONFIG_GOLIOTH_SAMPLE_SETTINGS=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
 
-# Misc.
-CONFIG_NETWORK_INFO=y
 # Longer response length needed for network info
 CONFIG_GOLIOTH_RPC_MAX_RESPONSE_LEN=512
 CONFIG_I2C=y

socs/nrf9151_ns.conf

@@ -1,6 +1,3 @@
-# Copyright (c) 2024 Golioth, Inc.
-# SPDX-License-Identifier: Apache-2.0
-
 # General config
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_NEWLIB_LIBC=y
@@ -25,8 +22,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
@@ -38,8 +35,13 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 CONFIG_NORDIC_SECURITY_BACKEND=n
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C=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

socs/nrf9160_ns.conf

@@ -1,6 +1,3 @@
-# Copyright (c) 2024 Golioth, Inc.
-# SPDX-License-Identifier: Apache-2.0
-
 # General config
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_NEWLIB_LIBC=y
@@ -25,8 +22,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
@@ -38,8 +35,13 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 CONFIG_NORDIC_SECURITY_BACKEND=n
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C=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_buzzer.h"
 #include "app_rpc.h"
 
@@ -36,9 +39,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,
@@ -138,8 +141,7 @@ static enum golioth_rpc_status on_play_song(zcbor_state_t *request_params_array,
 }
 
 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/main.c

@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(thingy91_golioth, LOG_LEVEL_DBG);
 #include <samples/common/sample_credentials.h>
 #include <zephyr/kernel.h>
 
-#if defined(CONFIG_SOC_SERIES_NRF91X)
+#ifdef CONFIG_SOC_SERIES_NRF91X
 #include <modem/lte_lc.h>
 #endif
 
@@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(thingy91_golioth, LOG_LEVEL_DBG);
 
 /* Current firmware version; update in VERSION */
 static const char *_current_version =
-    STRINGIFY(APP_VERSION_MAJOR) "." STRINGIFY(APP_VERSION_MINOR) "." STRINGIFY(APP_PATCHLEVEL);
+	STRINGIFY(APP_VERSION_MAJOR) "." STRINGIFY(APP_VERSION_MINOR) "." STRINGIFY(APP_PATCHLEVEL);
 
 static struct golioth_client *client;
 K_SEM_DEFINE(connected, 0, 1);
@@ -47,8 +47,7 @@ void wake_system_thread(void)
 	k_wakeup(_system_thread);
 }
 
-static void on_client_event(struct golioth_client *client,
-			    enum golioth_client_event event,
+static void on_client_event(struct golioth_client *client, enum golioth_client_event event,
 			    void *arg)
 {
 	bool is_connected = (event == GOLIOTH_CLIENT_EVENT_CONNECTED);
@@ -74,7 +73,6 @@ static void start_golioth_client(void)
 	/* Initialize DFU components */
 	golioth_fw_update_init(client, _current_version);
 
-
 	/*** Call Golioth APIs for other services in dedicated app files ***/
 
 	/* Observe State service data */
@@ -90,7 +88,7 @@ static void start_golioth_client(void)
 	app_rpc_register(client);
 }
 
-#if defined(CONFIG_SOC_SERIES_NRF91X)
+#ifdef CONFIG_SOC_SERIES_NRF91X
 
 static void lte_handler(const struct lte_lc_evt *const evt)
 {
@@ -110,7 +108,7 @@ static void lte_handler(const struct lte_lc_evt *const evt)
 	}
 }
 
-#endif /* CONFIG_SOC_NRF9160 */
+#endif /* CONFIG_SOC_SERIES_NRF91X */
 
 #ifdef CONFIG_MODEM_INFO
 static void log_modem_firmware_version(void)
@@ -153,7 +151,7 @@ int main(void)
 	/* Get system thread id so loop delay change event can wake main */
 	_system_thread = k_current_get();
 
-#if defined(CONFIG_SOC_SERIES_NRF91X)
+#ifdef CONFIG_SOC_SERIES_NRF91X
 	/* Start LTE asynchronously if the nRF9160 is used.
 	 * Golioth Client will start automatically when LTE connects
 	 */
@@ -175,7 +173,7 @@ int main(void)
 
 	/* Block until connected to Golioth */
 	k_sem_take(&connected, K_FOREVER);
-#endif /* CONFIG_SOC_NRF9160 */
+#endif /* CONFIG_SOC_SERIES_NRF91X */
 
 	err = app_buzzer_init();
 	if (err) {

west.yml

@@ -10,7 +10,7 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: v0.17.0
+      revision: v0.18.0
       url: https://github.com/golioth/golioth-firmware-sdk.git
       west-commands: scripts/west-commands.yml
       submodules: true
@@ -47,5 +47,10 @@ manifest:
       revision: v1.2.0
       url: https://github.com/golioth/zephyr-network-info
 
+    - name: golioth-battery-monitor
+      path: deps/modules/lib/battery-monitor
+      revision: v1.0.0
+      url: https://github.com/golioth/battery-monitor
+
   self:
     path: app