app: Fix build errors

* Fix build errors in all modules
* Align use of SMF macros

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>

Author: jtguggedal

app/src/common/message_channel.h

@@ -55,6 +55,10 @@ struct payload {
 enum network_status {
 	NETWORK_DISCONNECTED = 0x1,
 	NETWORK_CONNECTED,
+	NETWORK_UICC_FAILURE,
+	NETWORK_DISCONNECT,
+	NETWORK_CONNECT,
+	NETWORK_QUALITY_SAMPLE,
 };
 
 #define MSG_TO_NETWORK_STATUS(_msg)	(*(const enum network_status *)_msg)

app/src/common/modules_common.h

@@ -18,7 +18,7 @@ extern "C" {
  *
  *  @return see smf_set_initial().
  */
-#define STATE_SET_INITIAL(_state)	smf_set_initial(SMF_CTX(&_state_obj), &states[_state])
+#define STATE_SET_INITIAL(_state_obj, _state) smf_set_initial(SMF_CTX(&_state_obj), &states[_state])
 
 /** @brief Set the state for a module.
  *
@@ -27,15 +27,15 @@ extern "C" {
  *
  *  @return see smf_set_state().
  */
-#define STATE_SET(_state)		smf_set_state(SMF_CTX(&_state_obj), &states[_state])
+#define STATE_SET(_state_obj, _state)		smf_set_state(SMF_CTX(&_state_obj), &states[_state])
 
 /** @brief Set the state for a module and handle the event.
  *
  *  @param _state_obj State machine object.
  *
  *  @return see smf_set_handled().
  */
-#define STATE_EVENT_HANDLED(_state_obj)	smf_set_handled(SMF_CTX(&_state_obj))
+#define STATE_EVENT_HANDLED(_state_obj)         smf_set_handled(SMF_CTX(&_state_obj))
 
 /** @brief Run the state machine for a module.
  *

app/src/modules/app/CMakeLists.txt

@@ -5,32 +5,3 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/app.c)
-
-# generate encoder code using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${CMAKE_CURRENT_SOURCE_DIR}/app_object.cddl
-	--decode # Generate decoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t app-object # Create a public API for decoding the "app_object" type from the cddl file
-	--output-cmake app_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/app_object.cmake)
-
-# Ensure that the cmake reconfiguration is triggerred everytime the cddl file changes.
-# This ensures that the codec generation is triggered.
-set_property(
-	DIRECTORY
-	PROPERTY
-	CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/app_object.cddl
-)
-
-zephyr_link_libraries(app_object)
-target_link_libraries(app_object PRIVATE zephyr_interface)

app/src/modules/app/Kconfig.app

@@ -1,7 +1,8 @@
-module = APP
-module-str = APP
-source "subsys/logging/Kconfig.template.log_config"
-
+#
+# Copyright (c) 2023 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
 menu "App"
 
 config APP_MODULE_THREAD_STACK_SIZE
@@ -22,4 +23,9 @@ config APP_MODULE_RECV_BUFFER_SIZE
 	int "Receive buffer size"
 	default 1024
 
+
+module = APP
+module-str = APP
+source "subsys/logging/Kconfig.template.log_config"
+
 endmenu

app/src/modules/app/app.c

@@ -17,7 +17,6 @@
 #endif /* CONFIG_MEMFAULT */
 
 #include "message_channel.h"
-#include "app_object_decode.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(app, CONFIG_APP_LOG_LEVEL);
@@ -37,16 +36,13 @@ BUILD_ASSERT(CONFIG_APP_MODULE_WATCHDOG_TIMEOUT_SECONDS > CONFIG_APP_MODULE_EXEC
 static void shadow_get(bool delta_only)
 {
 	int err;
-	struct app_object app_object = { 0 };
-	struct configuration configuration = { 0 };
-	uint8_t buf_cbor[CONFIG_APP_MODULE_RECV_BUFFER_SIZE] = { 0 };
-	size_t buf_cbor_len = sizeof(buf_cbor);
-	size_t not_used;
+	uint8_t recv_buf[CONFIG_APP_MODULE_RECV_BUFFER_SIZE] = { 0 };
+	size_t recv_buf_len = sizeof(recv_buf);
 
-	LOG_DBG("Requesting device configuration from the device shadow");
+	LOG_DBG("Requesting device shadow from the device");
 
-	err = nrf_cloud_coap_shadow_get(buf_cbor, &buf_cbor_len, delta_only,
-					COAP_CONTENT_FORMAT_APP_CBOR);
+	err = nrf_cloud_coap_shadow_get(recv_buf, &recv_buf_len, delta_only,
+					COAP_CONTENT_FORMAT_APP_JSON);
 	if (err == -EACCES) {
 		LOG_WRN("Not connected, error: %d", err);
 		return;
@@ -65,111 +61,7 @@ static void shadow_get(bool delta_only)
 		return;
 	}
 
-	if (buf_cbor_len == 0) {
-		LOG_DBG("No shadow delta changes available");
-		return;
-	}
-
-	/* Workaroud: Sometimes nrf_cloud_coap_shadow_get() returns 0 even though obtaining
-	 * the shadow failed. Ignore the payload if the first 10 bytes are zero.
-	 */
-	if (!memcmp(buf_cbor, "\0\0\0\0\0\0\0\0\0\0", 10)) {
-		LOG_WRN("Returned buffer is empty, ignore");
-		return;
-	}
-
-	err = cbor_decode_app_object(buf_cbor, buf_cbor_len, &app_object, &not_used);
-	if (err) {
-		/* Do not throw an error if decoding fails. This might occur if the shadow
- 		 * structure or content changes. In such cases, we need to ensure the possibility
- 		 * of performing a Firmware Over-The-Air (FOTA) update to address the issue.
- 		 * Hardfaulting would prevent FOTA, hence it should be avoided.
- 		 */
-		LOG_ERR("Ignoring incoming configuration change due to decoding error: %d", err);
-		LOG_HEXDUMP_ERR(buf_cbor, buf_cbor_len, "CBOR data");
-
-		IF_ENABLED(CONFIG_MEMFAULT,
-			(MEMFAULT_TRACE_EVENT_WITH_STATUS(cbor_decode_app_object, err)));
-
-		return;
-	}
-
-	if (!app_object.lwm2m_present) {
-		LOG_DBG("No LwM2M object present in shadow, ignoring");
-		return;
-	}
-
-	if (app_object.lwm2m.lwm2m._1424010_present) {
-		configuration.led_present = true;
-
-		configuration.led_red = app_object.lwm2m.lwm2m._1424010._1424010._0._0._0;
-		configuration.led_red_present =
-			app_object.lwm2m.lwm2m._1424010._1424010._0._0_present;
-
-		configuration.led_green = app_object.lwm2m.lwm2m._1424010._1424010._0._1._1;
-		configuration.led_green_present =
-			app_object.lwm2m.lwm2m._1424010._1424010._0._1_present;
-
-		configuration.led_blue = app_object.lwm2m.lwm2m._1424010._1424010._0._2._2;
-		configuration.led_blue_present =
-			app_object.lwm2m.lwm2m._1424010._1424010._0._2_present;
-
-		LOG_DBG("LED object (1424010) values received from cloud:");
-
-		if (configuration.led_red_present) {
-			LOG_DBG("New RED value: %d", configuration.led_red);
-		}
-
-		if (configuration.led_green_present) {
-			LOG_DBG("New GREEN value: %d", configuration.led_green);
-		}
-
-		if (configuration.led_blue_present) {
-			LOG_DBG("New BLUE value: %d", configuration.led_blue);
-		}
-
-		LOG_DBG("Timestamp: %lld", app_object.lwm2m.lwm2m._1424010._1424010._0._99);
-	}
-
-	if (app_object.lwm2m.lwm2m._1430110_present) {
-		configuration.config_present = true;
-
-		configuration.update_interval = app_object.lwm2m.lwm2m._1430110._1430110._0._0._0;
-		configuration.update_interval_present =
-			app_object.lwm2m.lwm2m._1430110._1430110._0._0_present;
-
-		configuration.gnss = app_object.lwm2m.lwm2m._1430110._1430110._0._1._1;
-		configuration.gnss_present = app_object.lwm2m.lwm2m._1430110._1430110._0._1_present;
-
-		LOG_DBG("Application configuration object (1430110) values received from cloud:");
-
-		if (configuration.update_interval_present) {
-			LOG_DBG("New update interval: %lld", configuration.update_interval);
-		}
-
-		if (configuration.gnss_present) {
-			LOG_DBG("New GNSS setting: %d", configuration.gnss);
-		}
-
-		LOG_DBG("Timestamp: %lld", app_object.lwm2m.lwm2m._1430110._1430110._0._99);
-	}
-
-	/* Distribute configuration */
-	err = zbus_chan_pub(&CONFIG_CHAN, &configuration, K_SECONDS(1));
-	if (err) {
-		LOG_ERR("zbus_chan_pub, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
-	}
-
-	/* Send the received configuration back to the reported shadow section. */
-	err = nrf_cloud_coap_patch("state/reported", NULL, (uint8_t *)buf_cbor,
-				   buf_cbor_len, COAP_CONTENT_FORMAT_APP_CBOR, true, NULL, NULL);
-	if (err < 0) {
-		LOG_ERR("Failed to send PATCH request: %d", err);
-	} else if (err > 0) {
-		LOG_ERR("Error from server: %d", err);
-	}
+	/* No further processing of shadow is implemented */
 }
 
 static void task_wdt_callback(int channel_id, void *user_data)

app/src/modules/battery/CMakeLists.txt

@@ -5,24 +5,3 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/battery.c)
-
-# generate encoder code using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${CMAKE_CURRENT_SOURCE_DIR}/bat_object.cddl
-	--encode # Generate encoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t bat-object # Create a public API for decoding/encoding the "bat-object" type from the cddl file
-	--output-cmake bat_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/bat_object.cmake)
-
-zephyr_link_libraries(bat_object)
-target_link_libraries(bat_object PRIVATE zephyr_interface)

app/src/modules/battery/Kconfig.battery

@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2023 Nordic Semiconductor
+# Copyright (c) 2024 Nordic Semiconductor
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "Sampler"
+menu "Battery"
 
 config APP_BATTERY_THREAD_STACK_SIZE
 	int "Thread stack size"
@@ -24,4 +24,4 @@ module = APP_BATTERY
 module-str = Battery
 source "subsys/logging/Kconfig.template.log_config"
 
-endmenu # Sampler
+endmenu # Battery

app/src/modules/battery/battery.c

@@ -18,7 +18,6 @@
 #include "lp803448_model.h"
 #include "message_channel.h"
 #include "modules_common.h"
-#include "bat_object_encode.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(battery, CONFIG_APP_BATTERY_LOG_LEVEL);
@@ -89,7 +88,7 @@ static void state_init_entry(void *o);
 static void state_init_run(void *o);
 static void state_sampling_run(void *o);
 
-static struct s_object s_obj;
+static struct s_object battery_state_object;
 static const struct smf_state states[] = {
 	[STATE_INIT] =
 		SMF_CREATE_STATE(state_init_entry, state_init_run, NULL,
@@ -153,7 +152,7 @@ static void state_init_run(void *o)
 		if (time_status == TIME_AVAILABLE) {
 			LOG_DBG("Time available, sampling can start");
 
-			STATE_SET(STATE_SAMPLING);
+			STATE_SET(battery_state_object, STATE_SAMPLING);
 		}
 	}
 }
@@ -210,8 +209,6 @@ static void sample(int64_t *ref_time)
 	float temp;
 	float state_of_charge;
 	float delta;
-	struct bat_object bat_object = { 0 };
-	struct payload payload = { 0 };
 	int64_t system_time;
 
 	err = date_time_now(&system_time);
@@ -238,25 +235,7 @@ static void sample(int64_t *ref_time)
 	LOG_DBG("State of charge: %f", (double)roundf(state_of_charge));
 	LOG_DBG("The battery is %s", charging ? "charging" : "not charging");
 
-	bat_object.state_of_charge_m.bt = (int32_t)(system_time / 1000);
-	bat_object.state_of_charge_m.vi = (int32_t)(state_of_charge + 0.5f);
-	bat_object.voltage_m.vf = voltage;
-	bat_object.temperature_m.vf = temp;
-
-	err = cbor_encode_bat_object(payload.buffer, sizeof(payload.buffer),
-				     &bat_object, &payload.buffer_len);
-	if (err) {
-		LOG_ERR("Failed to encode env object, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
-	}
-
-	err = zbus_chan_pub(&PAYLOAD_CHAN, &payload, K_SECONDS(1));
-	if (err) {
-		LOG_ERR("zbus_chan_pub, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
-	}
+	/* No further use of the battery data is implemented */
 }
 
 static void task_wdt_callback(int channel_id, void *user_data)
@@ -279,7 +258,7 @@ static void battery_task(void)
 
 	task_wdt_id = task_wdt_add(wdt_timeout_ms, task_wdt_callback, (void *)k_current_get());
 
-	STATE_SET_INITIAL(STATE_INIT);
+	STATE_SET_INITIAL(battery_state_object, STATE_INIT);
 
 	while (true) {
 		err = task_wdt_feed(task_wdt_id);
@@ -298,7 +277,7 @@ static void battery_task(void)
 			return;
 		}
 
-		err = STATE_RUN();
+		err = STATE_RUN(battery_state_object);
 		if (err) {
 			LOG_ERR("handle_message, error: %d", err);
 			SEND_FATAL_ERROR();

app/src/modules/button/CMakeLists.txt

@@ -5,24 +5,3 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/button.c)
-
-# generate encoder code using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${CMAKE_CURRENT_SOURCE_DIR}/button_object.cddl
-	--encode # Generate encoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t button-object # Create a public API for decoding/encoding the "button-object" type from the cddl file
-	--output-cmake button_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/button_object.cmake)
-
-zephyr_link_libraries(button_object)
-target_link_libraries(button_object PRIVATE zephyr_interface)