applications: asset_tracker: Use application workqueue in modules

Use application workqueue in env_sensors, light_sensor and motion
module.

Jira:NCSDK-4422

Signed-off-by: Jon Helge Nistad <[email protected]>

Author: jhn-nordic

applications/asset_tracker/src/env_sensors/bsec.c

@@ -80,6 +80,8 @@ static u32_t data_send_interval_s = CONFIG_ENVIRONMENT_DATA_SEND_INTERVAL;
 static bool backoff_enabled;
 static bool initialized;
 
+static struct k_work_q *env_sensors_work_q;
+
 static int settings_set(const char *key, size_t len_rd,
 			settings_read_cb read_cb, void *cb_arg)
 {
@@ -242,8 +244,9 @@ int env_sensors_get_air_quality(env_sensor_data_t *sensor_data)
 
 static inline int submit_poll_work(const u32_t delay_s)
 {
-	return k_delayed_work_submit(&env_sensors_poller,
-				     K_SECONDS((u32_t)delay_s));
+	return k_delayed_work_submit_to_queue(env_sensors_work_q,
+					      &env_sensors_poller,
+					      K_SECONDS((u32_t)delay_s));
 }
 
 int env_sensors_poll(void)
@@ -266,11 +269,16 @@ static void env_sensors_poll_fn(struct k_work *work)
 		CONFIG_ENVIRONMENT_DATA_BACKOFF_TIME : data_send_interval_s);
 }
 
-int env_sensors_init_and_start(const env_sensors_data_ready_cb cb)
+int env_sensors_init_and_start(struct k_work_q *work_q,
+			       const env_sensors_data_ready_cb cb)
 {
 	return_values_init bsec_ret;
 	int ret;
 
+	if ((work_q == NULL) || (cb == NULL)) {
+		return -EINVAL;
+	}
+
 	i2c_master = device_get_binding("I2C_2");
 	if (!i2c_master) {
 		LOG_ERR("cannot bind to BME680");
@@ -298,6 +306,8 @@ int env_sensors_init_and_start(const env_sensors_data_ready_cb cb)
 
 	data_ready_cb = cb;
 
+	env_sensors_work_q = work_q;
+
 	k_delayed_work_init(&env_sensors_poller, env_sensors_poll_fn);
 
 	initialized = true;

applications/asset_tracker/src/env_sensors/env_sensors.c

@@ -17,6 +17,8 @@ LOG_MODULE_REGISTER(env_sensors, CONFIG_ASSET_TRACKER_LOG_LEVEL);
 #define ENV_INIT_DELAY_S (5) /* Polling delay upon initialization */
 #define MAX_INTERVAL_S   (INT_MAX/MSEC_PER_SEC)
 
+static struct k_work_q *env_sensors_work_q;
+
 struct env_sensor {
 	env_sensor_data_t sensor;
 	enum sensor_channel channel;
@@ -67,8 +69,9 @@ static bool initialized;
 
 static inline int submit_poll_work(const u32_t delay_s)
 {
-	return k_delayed_work_submit(&env_sensors_poller,
-				     K_SECONDS((u32_t)delay_s));
+	return k_delayed_work_submit_to_queue(env_sensors_work_q,
+					      &env_sensors_poller,
+					      K_SECONDS((u32_t)delay_s));
 }
 
 int env_sensors_poll(void)
@@ -126,15 +129,22 @@ static void env_sensors_poll_fn(struct k_work *work)
 }
 
 /**@brief Initialize environment sensors. */
-int env_sensors_init_and_start(const env_sensors_data_ready_cb cb)
+int env_sensors_init_and_start(struct k_work_q *work_q,
+			       const env_sensors_data_ready_cb cb)
 {
+	if ((work_q == NULL) || (cb == NULL)) {
+		return -EINVAL;
+	}
+
 	for (int i = 0; i < ARRAY_SIZE(env_sensors); i++) {
 		env_sensors[i]->dev =
 			device_get_binding(env_sensors[i]->dev_name);
 		__ASSERT(env_sensors[i]->dev, "Could not get device %s\n",
 			env_sensors[i]->dev_name);
 	}
 
+	env_sensors_work_q = work_q;
+
 	data_ready_cb = cb;
 
 	k_delayed_work_init(&env_sensors_poller, env_sensors_poll_fn);

applications/asset_tracker/src/env_sensors/env_sensors.h

@@ -89,7 +89,8 @@ int env_sensors_get_air_quality(env_sensor_data_t *sensor_data);
  *
  * @return 0 if the operation was successful, otherwise a (negative) error code.
  */
-int env_sensors_init_and_start(const env_sensors_data_ready_cb cb);
+int env_sensors_init_and_start(struct k_work_q *work_q,
+			       const env_sensors_data_ready_cb cb);
 
 /**
  * @brief Set environmental sensor's poll/send interval.

applications/asset_tracker/src/light_sensor/light_sensor.c

@@ -43,28 +43,36 @@ static struct ls_ch_data *ls_data[LS_CH__END] = { [LS_CH_RED] = &ls_ch_red,
 						  [LS_CH_IR] = &ls_ch_ir };
 static light_sensor_data_ready_cb ls_cb;
 static struct k_delayed_work ls_poller;
+static struct k_work_q *ls_work_q;
 static u32_t data_send_interval_s = CONFIG_LIGHT_SENSOR_DATA_SEND_INTERVAL;
 static bool initialized;
 
 static void light_sensor_poll_fn(struct k_work *work);
 
 static inline int submit_poll_work(const u32_t delay_s)
 {
-	return k_delayed_work_submit(&ls_poller, K_SECONDS((u32_t)delay_s));
+	return k_delayed_work_submit_to_queue(ls_work_q, &ls_poller,
+					      K_SECONDS((u32_t)delay_s));
 }
 
-int light_sensor_init_and_start(const light_sensor_data_ready_cb cb)
+int light_sensor_init_and_start(struct k_work_q *work_q,
+				const light_sensor_data_ready_cb cb)
 {
 	if (!IS_ENABLED(CONFIG_LIGHT_SENSOR)) {
 		return -ENXIO;
 	}
 
+	if ((work_q == NULL) || (cb == NULL)) {
+		return -EINVAL;
+	}
+
 	ls_dev = device_get_binding(ls_dev_name);
 
 	if (ls_dev == NULL) {
 		return -ENODEV;
 	}
 
+	ls_work_q = work_q;
 	ls_cb = cb;
 
 	k_delayed_work_init(&ls_poller, light_sensor_poll_fn);

applications/asset_tracker/src/light_sensor/light_sensor.h

@@ -38,7 +38,8 @@ typedef void (*light_sensor_data_ready_cb)(void);
  *
  * @return 0 if the operation was successful, otherwise a (negative) error code.
  */
-int light_sensor_init_and_start(const light_sensor_data_ready_cb cb);
+int light_sensor_init_and_start(struct k_work_q *work_q,
+				const light_sensor_data_ready_cb cb);
 
 /**
  * @brief Get latest sampled light data.

applications/asset_tracker/src/main.c

@@ -1029,17 +1029,18 @@ static void sensors_init(void)
 {
 	int err;
 
-	err = motion_init_and_start(motion_handler);
+	err = motion_init_and_start(&application_work_q, motion_handler);
 	if (err) {
 		LOG_ERR("motion module init failed, error: %d", err);
 	}
 
-	err = env_sensors_init_and_start(env_data_send);
+	err = env_sensors_init_and_start(&application_work_q, env_data_send);
 	if (err) {
 		LOG_ERR("Environmental sensors init failed, error: %d", err);
 	}
 #if CONFIG_LIGHT_SENSOR
-	err = light_sensor_init_and_start(light_sensor_data_send);
+	err = light_sensor_init_and_start(&application_work_q,
+					  light_sensor_data_send);
 	if (err) {
 		LOG_ERR("Light sensor init failed, error: %d", err);
 	}

applications/asset_tracker/src/motion/motion.c

@@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(motion, CONFIG_ASSET_TRACKER_LOG_LEVEL);
 
 motion_handler_t handler;
 static struct device *accel_dev;
+static struct k_work_q *motion_work_q;
+static struct k_delayed_work motion_work;
 
 #define FLIP_ACCELERATION_THRESHOLD	5.0
 
@@ -99,6 +101,12 @@ static void sensor_trigger_handler(struct device *dev,
 	ARG_UNUSED(dev);
 	ARG_UNUSED(trigger);
 
+	k_delayed_work_submit_to_queue(motion_work_q, &motion_work, K_NO_WAIT);
+}
+
+/**@brief Workqueue handler that runs the callback provided by application.*/
+static void motion_work_q_handler(struct k_work *work)
+{
 	motion_data_t motion_data;
 
 	if (accelerometer_poll(&motion_data.acceleration) == 0) {
@@ -142,15 +150,19 @@ static int accelerometer_init(void)
 }
 
 /**@brief Initialize motion module. */
-int motion_init_and_start(motion_handler_t motion_handler)
+int motion_init_and_start(struct k_work_q *work_q,
+			  motion_handler_t motion_handler)
 {
-	if (motion_handler == NULL) {
+	if ((work_q == NULL) || (motion_handler == NULL)) {
 		return -EINVAL;
 	}
 
 	int err;
 
+	motion_work_q = work_q;
 	handler = motion_handler;
+
+	k_delayed_work_init(&motion_work, motion_work_q_handler);
 	err = accelerometer_init();
 
 	if (err) {

applications/asset_tracker/src/motion/motion.h

@@ -51,7 +51,8 @@ typedef void (*motion_handler_t)(motion_data_t  motion_data);
  *
  * @return 0 if the operation was successful, otherwise a (negative) error code.
  */
-int motion_init_and_start(motion_handler_t motion_handler);
+int motion_init_and_start(struct k_work_q *work_q,
+			  motion_handler_t motion_handler);
 
 /**
  * @brief Manually trigger the motion module to fetch data.