update to Golioth v0.7.1

Update to most recent Golioth Zephyr SDK release v0.7.1 which uses:
* nRF Connect SDK v2.4.1 (NCS)
* Zephyr v3.3.99-ncs1-1

Changes in this commit:

* Updates for Golioth Zephy SDK:
  * update to use zcbor instead of qcbor
  * update RPC functions to use zcbor
  * update network-info repo revision to use new version that is zcbor
    compatible
  * update flash.c/flash.h files to match what is present in the DFU sample
  * boards/nrf9160dk_nrf9160_ns: update configuration
  * boards/aludel_mini_v1_sparkfun9160_ns: update configuration
* Updates for new NCS/Zephyr version:
  * update LTE link control: Disable samples/common link control and use
    in-app link control to start connection asynchronously
  * main.c: return int from main()
  * battery_monitor: use void as initialization param
* Misc updates:
  * golioth-boards: include as a module
  * remove module.yml: no longer needed for golioth-boards
  * network-info: include as a module
  * main: use LOG instead of printk for button errors

Signed-off-by: Mike Szczys <[email protected]>

Author: szczys

.gitignore

@@ -6,6 +6,4 @@ build*/
 .cache
 credentials.conf
 __pycache__/
-golioth-boards
 libostentus
-network_info/

CMakeLists.txt

@@ -17,4 +17,3 @@ target_sources(app PRIVATE src/libostentus/libostentus.c)
 target_sources_ifdef(CONFIG_BOOTLOADER_MCUBOOT app PRIVATE src/dfu/flash.c)
 
 add_subdirectory_ifdef(CONFIG_ALUDEL_BATTERY_MONITOR src/battery_monitor)
-add_subdirectory(src/network_info)

boards/aludel_mini_v1_sparkfun9160_ns.conf

@@ -6,34 +6,37 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_NEWLIB_LIBC=y
 
 # Networking
-CONFIG_NET_NATIVE=n
 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
 
-# LTE link control
-CONFIG_LTE_LINK_CONTROL=y
-CONFIG_LTE_AUTO_INIT_AND_CONNECT=y
-
 # 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_NET_CONNECTION_MANAGER=y
+CONFIG_NET_CONNECTION_MANAGER_STACK_SIZE=1024
 
-# Use NCS fork of mbedTLS, as Zephyr built-in mbedTLS integration (CONFIG_MBEDTLS_BUILTIN) is in
-# conflict with CONFIG_NRF_SECURITY
-CONFIG_MBEDTLS_TLS_LIBRARY=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_GCM_C=y
-# ... and disable options y-selected by NCS for no good reason
+# 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
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
-# ... also increase heap size to "high enough to make it work"
-CONFIG_MBEDTLS_HEAP_SIZE=49152
 
 # Battery Support
 CONFIG_ALUDEL_BATTERY_MONITOR=y
 
 # Add Network Info Support
 CONFIG_MODEM_INFO=y
 CONFIG_GOLIOTH_RPC_MAX_RESPONSE_LEN=512
+
+# Generate MCUboot compatible images
+CONFIG_BOOTLOADER_MCUBOOT=y

boards/nrf9160dk_nrf9160_ns.conf

@@ -6,31 +6,37 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_NEWLIB_LIBC=y
 
 # Networking
-CONFIG_NET_NATIVE=n
 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
 
-# LTE link control
-CONFIG_LTE_LINK_CONTROL=y
-CONFIG_LTE_AUTO_INIT_AND_CONNECT=y
-
 # 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_NET_CONNECTION_MANAGER=y
+CONFIG_NET_CONNECTION_MANAGER_STACK_SIZE=1024
+
+# Increased sysworkq size, due to LTE connectivity
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
-# Use NCS fork of mbedTLS, as Zephyr built-in mbedTLS integration (CONFIG_MBEDTLS_BUILTIN) is in
-# conflict with CONFIG_NRF_SECURITY
-CONFIG_MBEDTLS_TLS_LIBRARY=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_GCM_C=y
-# ... and disable options y-selected by NCS for no good reason
+# 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
-# ... also increase heap size to "high enough to make it work"
-CONFIG_MBEDTLS_HEAP_SIZE=49152
+
+# Battery Support
+CONFIG_ALUDEL_BATTERY_MONITOR=n
 
 # Add Network Info Support
 CONFIG_MODEM_INFO=y
 CONFIG_GOLIOTH_RPC_MAX_RESPONSE_LEN=512
+
+# Generate MCUboot compatible images
+CONFIG_BOOTLOADER_MCUBOOT=y

prj.conf

@@ -2,49 +2,33 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_GOLIOTH_SAMPLES_COMMON=y
-
-# Generic networking options
-CONFIG_NETWORKING=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=n
-
-# Logging
-CONFIG_NET_LOG=y
-
-# Network Shell
-CONFIG_NET_SHELL=y
-
-# TLS configuration
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=10240
+CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=n #App implements its own LTE Monitor
 
 # Application
+CONFIG_LOG_BACKEND_GOLIOTH=y
 CONFIG_MAIN_STACK_SIZE=4096
 
-CONFIG_GOLIOTH=y
 CONFIG_GOLIOTH_FW=y
-CONFIG_GOLIOTH_SYSTEM_CLIENT=y
-
-CONFIG_LOG_BACKEND_GOLIOTH=y
-CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=2048
 
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-
-CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
+CONFIG_STREAM_FLASH=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
 CONFIG_REBOOT=y
 
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+
 CONFIG_JSON_LIBRARY=y
 
 CONFIG_SETTINGS=y
+CONFIG_GOLIOTH_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
+CONFIG_GOLIOTH_SAMPLE_PSK_SETTINGS=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
-CONFIG_GOLIOTH_SETTINGS=y
 
 CONFIG_GOLIOTH_RPC=y
+CONFIG_NETWORK_INFO=y
 CONFIG_I2C=y

src/app_rpc.c

@@ -10,12 +10,10 @@ LOG_MODULE_REGISTER(app_rpc, LOG_LEVEL_DBG);
 
 #include <net/golioth/system_client.h>
 #include <net/golioth/rpc.h>
-#include <qcbor/qcbor.h>
-#include <qcbor/qcbor_spiffy_decode.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/reboot.h>
 
-#include "network_info.h"
+#include <network_info.h>
 #include "app_rpc.h"
 
 static struct golioth_client *client;
@@ -36,39 +34,32 @@ static void reboot_work_handler(struct k_work *work)
 }
 K_WORK_DEFINE(reboot_work, reboot_work_handler);
 
-static enum golioth_rpc_status on_get_network_info(QCBORDecodeContext *request_params_array,
-						   QCBOREncodeContext *response_detail_map,
+static enum golioth_rpc_status on_get_network_info(zcbor_state_t *request_params_array,
+						   zcbor_state_t *response_detail_map,
 						   void *callback_arg)
 {
-	QCBORError qerr;
-
-	qerr = QCBORDecode_GetError(request_params_array);
-	if (qerr != QCBOR_SUCCESS) {
-		LOG_ERR("Failed to decode array items: %d (%s)", qerr, qcbor_err_to_str(qerr));
-		return GOLIOTH_RPC_INVALID_ARGUMENT;
-	}
-
 	network_info_add_to_map(response_detail_map);
 
 	return GOLIOTH_RPC_OK;
 }
 
-static enum golioth_rpc_status on_set_log_level(QCBORDecodeContext *request_params_array,
-						QCBOREncodeContext *response_detail_map,
+static enum golioth_rpc_status on_set_log_level(zcbor_state_t *request_params_array,
+						zcbor_state_t *response_detail_map,
 						void *callback_arg)
 {
-	double a;
-	uint32_t log_level;
-	QCBORError qerr;
-
-	QCBORDecode_GetDouble(request_params_array, &a);
-	qerr = QCBORDecode_GetError(request_params_array);
-	if (qerr != QCBOR_SUCCESS) {
-		LOG_ERR("Failed to decode array item: %d (%s)", qerr, qcbor_err_to_str(qerr));
+	double param_0;
+	uint8_t log_level;
+	bool ok;
+
+	LOG_WRN("on_set_log_level");
+
+	ok = zcbor_float_decode(request_params_array, &param_0);
+	if (!ok) {
+		LOG_ERR("Failed to decode array item");
 		return GOLIOTH_RPC_INVALID_ARGUMENT;
 	}
 
-	log_level = (uint32_t)a;
+	log_level = (uint8_t)param_0;
 
 	if ((log_level < 0) || (log_level > LOG_LEVEL_DBG)) {
 
@@ -90,11 +81,15 @@ static enum golioth_rpc_status on_set_log_level(QCBORDecodeContext *request_para
 	}
 
 	LOG_WRN("Log levels for %d modules set to: %d", source_id, log_level);
+
+	ok = zcbor_tstr_put_lit(response_detail_map, "log_modules") &&
+	     zcbor_float64_put(response_detail_map, (double)source_id);
+
 	return GOLIOTH_RPC_OK;
 }
 
-static enum golioth_rpc_status on_reboot(QCBORDecodeContext *request_params_array,
-					 QCBOREncodeContext *response_detail_map,
+static enum golioth_rpc_status on_reboot(zcbor_state_t *request_params_array,
+					 zcbor_state_t *response_detail_map,
 					 void *callback_arg)
 {
 	/* Use work queue so this RPC can return confirmation to Golioth */
@@ -113,7 +108,6 @@ static void rpc_log_if_register_failure(int err)
 int app_rpc_init(struct golioth_client *state_client)
 {
 	client = state_client;
-	network_info_init();
 	int err = app_rpc_register(client);
 	return err;
 }

src/battery_monitor/battery.c

@@ -178,7 +178,7 @@ static int divider_setup(void)
 
 static bool battery_ok;
 
-static int battery_setup(const struct device *arg)
+static int battery_setup(void)
 {
 	LOG_INF("Initializing battery measurement");
 

src/dfu/flash.c

@@ -12,54 +12,35 @@ LOG_MODULE_REGISTER(golioth_dfu, LOG_LEVEL_DBG);
 
 #include "flash.h"
 
-/* NCS' fork of Zephyr does not implement DT_FIXED_PARTITION_EXISTS macro yet */
-#ifndef DT_FIXED_PARTITION_EXISTS
-#define DT_FIXED_PARTITION_EXISTS(node_id) DT_NODE_HAS_COMPAT(DT_PARENT(node_id), fixed_partitions)
-#endif
-
-/* NCS' fork of Zephyr does not implement FIXED_PARTITION_ macros yet */
-#ifndef FIXED_PARTITION_EXISTS
-#define FIXED_PARTITION_EXISTS(label) DT_FIXED_PARTITION_EXISTS(DT_NODELABEL(label))
-#endif
-
-/* NCS' fork of Zephyr does not implement FIXED_PARTITION_ macros yet */
-#ifndef FIXED_PARTITION_ID
-#define FIXED_PARTITION_ID(label) DT_FIXED_PARTITION_ID(DT_NODELABEL(label))
-#endif
-
 #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
-#define SLOT0_LABEL slot0_ns_partition
-#define SLOT1_LABEL slot1_ns_partition
+#define SLOT0_LABEL	slot0_ns_partition
 #else
-#define SLOT0_LABEL slot0_partition
-#define SLOT1_LABEL slot1_partition
+#define SLOT0_LABEL	slot0_partition
 #endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
 
 /* FIXED_PARTITION_ID() values used below are auto-generated by DT */
 #define FLASH_AREA_IMAGE_PRIMARY FIXED_PARTITION_ID(SLOT0_LABEL)
-#if FIXED_PARTITION_EXISTS(SLOT1_LABEL)
-#define FLASH_AREA_IMAGE_SECONDARY FIXED_PARTITION_ID(SLOT1_LABEL)
-#endif
 
 char current_version_str[sizeof("255.255.65535")];
 
-static int current_version_init(const struct device *dev)
+static int current_version_init(void)
 {
 	struct mcuboot_img_header hdr;
 	int written;
 	int err;
 
 	err = boot_read_bank_header(FLASH_AREA_IMAGE_PRIMARY, &hdr, sizeof(hdr));
 	if (err) {
-		LOG_ERR("Failed to read primary area (%u) header: %d", FLASH_AREA_IMAGE_PRIMARY,
-			err);
+		LOG_ERR("Failed to read primary area (%u) header: %d",
+			FLASH_AREA_IMAGE_PRIMARY, err);
 		return err;
 	}
 
-	written =
-		snprintf(current_version_str, sizeof(current_version_str), "%u.%u.%u",
-			 (unsigned int)hdr.h.v1.sem_ver.major, (unsigned int)hdr.h.v1.sem_ver.minor,
-			 (unsigned int)hdr.h.v1.sem_ver.revision);
+	written = snprintf(current_version_str, sizeof(current_version_str),
+			   "%u.%u.%u",
+			   (unsigned int) hdr.h.v1.sem_ver.major,
+			   (unsigned int) hdr.h.v1.sem_ver.minor,
+			   (unsigned int) hdr.h.v1.sem_ver.revision);
 	if (written >= sizeof(current_version_str)) {
 		LOG_ERR("Version string is too long!");
 		current_version_str[0] = '\0';
@@ -81,7 +62,8 @@ SYS_INIT(current_version_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
  *
  * @note This is a copy of zephyr_img_mgmt_flash_check_empty() from mcumgr.
  */
-static int flash_area_check_empty(const struct flash_area *fa, bool *out_empty)
+static int flash_area_check_empty(const struct flash_area *fa,
+				  bool *out_empty)
 {
 	uint32_t data[16];
 	off_t addr;

src/dfu/flash.h

@@ -32,15 +32,16 @@ static inline int flash_img_prepare(struct flash_img_context *flash)
 	return 0;
 }
 
-static inline int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
-					   size_t len, bool flush)
+static inline
+int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
+			     size_t len, bool flush)
 {
 	return 0;
 }
 
 /** Boot upgrade request modes */
-#define BOOT_UPGRADE_TEST      0
-#define BOOT_UPGRADE_PERMANENT 1
+#define BOOT_UPGRADE_TEST       0
+#define BOOT_UPGRADE_PERMANENT  1
 
 static inline int boot_request_upgrade(int permanent)
 {