Upmerge 2023.04.17

applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.h

@@ -148,7 +148,7 @@ int lwm2m_codec_helpers_set_neighbor_cell_data(struct cloud_data_neighbor_cells
 
 /** @brief Generate path lists with reference to objects.
  *	   This function outputs a list of paths that can be used to reference objects that should
- *	   be updated (sent to server) when calling the lwm2m_send() function.
+ *	   be updated (sent to server) when calling the lwm2m_send_cb() function.
  *
  *  @param[out] output Pointer to structure into which the input path list will be added.
  *  @param[in]  path List that contains LwM2M paths that will be

applications/asset_tracker_v2/src/cloud/lwm2m_integration/configuration_object.c

@@ -103,7 +103,7 @@ static struct lwm2m_engine_obj_inst *object_create(uint16_t obj_inst_id)
 	return &inst;
 }
 
-static int object_init(const struct device *dev)
+static int object_init(void)
 {
 	struct lwm2m_engine_obj_inst *obj_inst = NULL;
 	int ret = 0;

applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c

@@ -464,13 +464,14 @@ int cloud_wrap_data_send(char *buf, size_t len, bool ack, uint32_t id,
 {
 	ARG_UNUSED(buf);
 	ARG_UNUSED(len);
+	ARG_UNUSED(ack);
 	ARG_UNUSED(id);
 
 	int err;
 
-	err = lwm2m_send(&client, path_list, len, ack);
+	err = lwm2m_send_cb(&client, path_list, len, NULL);
 	if (err) {
-		LOG_ERR("lwm2m_send, error: %d", err);
+		LOG_ERR("lwm2m_send_cb, error: %d", err);
 		return err;
 	}
 
@@ -487,13 +488,14 @@ int cloud_wrap_ui_send(char *buf, size_t len, bool ack, uint32_t id,
 {
 	ARG_UNUSED(buf);
 	ARG_UNUSED(len);
+	ARG_UNUSED(ack);
 	ARG_UNUSED(id);
 
 	int err;
 
-	err = lwm2m_send(&client, path_list, len, ack);
+	err = lwm2m_send_cb(&client, path_list, len, NULL);
 	if (err) {
-		LOG_ERR("lwm2m_send, error: %d", err);
+		LOG_ERR("lwm2m_send_cb, error: %d", err);
 		return err;
 	}
 

applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c

@@ -57,12 +57,11 @@ static struct dfu_target_fmfu_fdev ext_flash_dev = {
 	.dev = DEVICE_DT_GET_ONE(jedec_spi_nor)
 };
 
-static int fmfu_and_modem_init(const struct device *dev)
+static int fmfu_and_modem_init(void)
 {
 	enum nrf_cloud_fota_type fota_type = NRF_CLOUD_FOTA_TYPE__INVALID;
 	int ret;
 
-	ARG_UNUSED(dev);
 
 	/* Check if a full modem FOTA job is pending */
 	ret = nrf_cloud_fota_pending_job_type_get(&fota_type);

applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c

@@ -81,7 +81,21 @@ static struct env_sensor accel_sensor_lp = {
 	.dev = DEVICE_DT_GET(DT_ALIAS(accelerometer)),
 };
 
+static struct sensor_trigger adxl362_sensor_trigger_motion = {
+		.chan = SENSOR_CHAN_ACCEL_XYZ,
+		.type = SENSOR_TRIG_MOTION
+};
+
+static struct sensor_trigger adxl362_sensor_trigger_stationary = {
+		.chan = SENSOR_CHAN_ACCEL_XYZ,
+		.type = SENSOR_TRIG_STATIONARY
+};
+
 #if defined(CONFIG_EXTERNAL_SENSORS_IMPACT_DETECTION)
+static struct sensor_trigger adxl372_sensor_trigger = {
+	.chan = SENSOR_CHAN_ACCEL_XYZ,
+	.type = SENSOR_TRIG_THRESHOLD
+};
 /** Sensor struct for the high-G accelerometer */
 static struct env_sensor accel_sensor_hg = {
 	.channel = SENSOR_CHAN_ACCEL_XYZ,
@@ -128,7 +142,7 @@ static void accelerometer_trigger_handler(const struct device *dev,
 
 		break;
 	default:
-		LOG_ERR("Unknown trigger");
+		LOG_ERR("Unknown trigger: %d", trig->type);
 	}
 }
 
@@ -221,13 +235,8 @@ int ext_sensors_init(ext_sensor_handler_t handler)
 		evt.type = EXT_SENSOR_EVT_ACCELEROMETER_ERROR;
 		evt_handler(&evt);
 	} else {
-		struct sensor_trigger trig = {
-			.chan = SENSOR_CHAN_ACCEL_XYZ,
-			.type = SENSOR_TRIG_THRESHOLD
-		};
-
 		int err = sensor_trigger_set(accel_sensor_hg.dev,
-					     &trig, impact_trigger_handler);
+					     &adxl372_sensor_trigger, impact_trigger_handler);
 		if (err) {
 			LOG_ERR("Could not set trigger for device %s, error: %d",
 				accel_sensor_hg.dev->name, err);
@@ -436,20 +445,15 @@ int ext_sensors_inactivity_timeout_set(double inact_time)
 int ext_sensors_accelerometer_trigger_callback_set(bool enable)
 {
 	int err;
-	struct sensor_trigger trig = {
-		.chan = SENSOR_CHAN_ACCEL_XYZ,
-		.type = SENSOR_TRIG_MOTION
-	};
 	struct ext_sensor_evt evt = {0};
 
 	sensor_trigger_handler_t handler = enable ? accelerometer_trigger_handler : NULL;
 
-	err = sensor_trigger_set(accel_sensor_lp.dev, &trig, handler);
+	err = sensor_trigger_set(accel_sensor_lp.dev, &adxl362_sensor_trigger_motion, handler);
 	if (err) {
 		goto error;
 	}
-	trig.type = SENSOR_TRIG_STATIONARY;
-	err = sensor_trigger_set(accel_sensor_lp.dev, &trig, handler);
+	err = sensor_trigger_set(accel_sensor_lp.dev, &adxl362_sensor_trigger_stationary, handler);
 	if (err) {
 		goto error;
 	}

applications/asset_tracker_v2/src/main.c

@@ -500,7 +500,7 @@ static void on_all_events(struct app_msg_data *msg)
 	}
 }
 
-void main(void)
+int main(void)
 {
 	int err;
 	struct app_msg_data msg = { 0 };
@@ -566,6 +566,7 @@ void main(void)
 
 		on_all_events(&msg);
 	}
+	return 0;
 }
 
 APP_EVENT_LISTENER(MODULE, app_event_handler);

applications/asset_tracker_v2/src/modules/ui_module.c

@@ -330,9 +330,8 @@ static void led_pattern_update_work_fn(struct k_work *work)
 	}
 }
 
-static int setup(const struct device *dev)
+static int setup(void)
 {
-	ARG_UNUSED(dev);
 
 	int err;
 

applications/asset_tracker_v2/src/modules/util_module.c

@@ -222,9 +222,8 @@ static void reboot_ack_check(uint32_t module_id)
 	}
 }
 
-static int setup(const struct device *dev)
+static int setup(void)
 {
-	ARG_UNUSED(dev);
 
 #if defined(CONFIG_WATCHDOG_APPLICATION)
 	int err = watchdog_init_and_start();

applications/asset_tracker_v2/tests/debug_module/src/debug_module_test.c

@@ -48,8 +48,9 @@ struct event_type __event_type_sensor_module_event;
 struct event_type __event_type_ui_module_event;
 struct event_type __event_type_util_module_event;
 
-/* The following is required because unity is using a different main signature
- * (returns int) and zephyr expects main to not return value.
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
  */
 extern int unity_main(void);
 
@@ -267,7 +268,8 @@ void test_memfault_software_watchdog_trigger_on_callback(void)
 	evt.type = WATCHDOG_EVT_FEED;
 }
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/location_module/src/location_module_test.c

@@ -71,8 +71,9 @@ struct event_type __event_type_modem_module_event;
 
 /* Dummy functions and objects - End.  */
 
-/* The following is required because unity is using a different main signature
- * (returns int) and zephyr expects main to not return value.
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
  */
 extern int unity_main(void);
 
@@ -522,7 +523,8 @@ void test_location_fail_init(void)
 	TEST_ASSERT_EQUAL(0, ret);
 }
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c

@@ -33,6 +33,10 @@
 /* Mon Dec 05 2022 09:38:04 */
 #define UNIX_TIMESTAMP_DUMMY 1670233084418
 
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
+ */
 extern int unity_main(void);
 
 /* Used to verify that the uut properly sets the value that is returned by date_time_now() to
@@ -853,7 +857,8 @@ void test_codec_helpers_object_path_list_generate_too_many_paths(void)
 									    ARRAY_SIZE(path_list)));
 }
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/lwm2m_integration/src/lwm2m_integration_test.c

@@ -48,6 +48,10 @@ static int init_security_callback_stub(struct lwm2m_ctx *ctx,
 static int init_firmware_cb_stub(lwm2m_firmware_event_cb_t cb,
 					   int no_of_calls);
 
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
+ */
 extern int unity_main(void);
 
 /* Setup and teardown functions. */
@@ -178,7 +182,7 @@ void test_lwm2m_integration_data_send(void)
 		LWM2M_OBJ(4, 0, 7),
 	};
 
-	__cmock_lwm2m_send_ExpectAndReturn(&client, paths, PATH_LEN, true, 0);
+	__cmock_lwm2m_send_cb_ExpectAndReturn(&client, paths, PATH_LEN, NULL, 0);
 
 	TEST_ASSERT_EQUAL(0, cloud_wrap_data_send(NULL, PATH_LEN, true, 0, paths));
 }
@@ -194,7 +198,7 @@ void test_lwm2m_integration_ui_send(void)
 		LWM2M_OBJ(4, 0, 7),
 	};
 
-	__cmock_lwm2m_send_ExpectAndReturn(&client, paths, PATH_LEN, true, 0);
+	__cmock_lwm2m_send_cb_ExpectAndReturn(&client, paths, PATH_LEN, NULL, 0);
 
 	TEST_ASSERT_EQUAL(0, cloud_wrap_ui_send(NULL, PATH_LEN, true, 0, paths));
 }
@@ -381,7 +385,8 @@ void test_lwm2m_integration_fota_update_image_req(void)
 	TEST_ASSERT_EQUAL(UINT8_MAX, last_cb_type);
 }
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/nrf_cloud_codec/src/nrf_cloud_codec_test.c

@@ -627,13 +627,14 @@ void test_enc_batch_data_ui_toobig(void)
 }
 
 
-/* It is required to be added to each test. That is because unity is using
- * different main signature (returns int) and zephyr expects main which does
- * not return value.
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
  */
 extern int unity_main(void);
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/nrf_cloud_codec_mocked_cjson/src/nrf_cloud_codec_mocked_test.c

@@ -553,13 +553,14 @@ void test_enc_config_nomem1(void)
 	TEST_ASSERT_EQUAL(-ENOMEM, ret);
 }
 
-/* It is required to be added to each test. That is because unity is using
- * different main signature (returns int) and zephyr expects main which does
- * not return value.
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
  */
 extern int unity_main(void);
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/ui_module/src/ui_module_test.c

@@ -62,8 +62,9 @@ struct event_type __event_type_sensor_module_event;
 struct event_type __event_type_ui_module_event;
 struct event_type __event_type_util_module_event;
 
-/* The following is required because unity is using a different main signature
- * (returns int) and zephyr expects main to not return value.
+/* It is required to be added to each test. That is because unity's
+ * main may return nonzero, while zephyr's main currently must
+ * return 0 in all cases (other values are reserved).
  */
 extern int unity_main(void);
 
@@ -403,7 +404,8 @@ void test_mode_transition(void)
 	verify_publication(true);
 }
 
-void main(void)
+int main(void)
 {
 	(void)unity_main();
+	return 0;
 }

applications/asset_tracker_v2/tests/ui_module/src/ui_module_test.h

@@ -16,6 +16,6 @@
 /* Suppress linker that warns that setup() is not used. This is because the function is run
  * at SYS_INIT, which is now redefined.
  */
-static int setup(const struct device *dev) __attribute__((unused));
+static int setup(void) __attribute__((unused));
 
 #endif /* UI_MODULE_TEST */

applications/connectivity_bridge/src/main.c

@@ -28,11 +28,12 @@ uint8_t *usb_update_sn_string_descriptor(void)
 	return usb_serial_str;
 }
 
-void main(void)
+int main(void)
 {
 	if (app_event_manager_init()) {
 		LOG_ERR("Application Event Manager not initialized");
 	} else {
 		module_set_state(MODULE_STATE_READY);
 	}
+	return 0;
 }

applications/machine_learning/src/main.c

@@ -13,11 +13,12 @@
 LOG_MODULE_REGISTER(MODULE);
 
 
-void main(void)
+int main(void)
 {
 	if (app_event_manager_init()) {
 		LOG_ERR("Application Event Manager initialization failed");
 	} else {
 		module_set_state(MODULE_STATE_READY);
 	}
+	return 0;
 }