modules: power: Add events for VBUS detected

Add events for VBUS detection. Will be used to
disable/enable UART.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/src/main.c

@@ -26,9 +26,9 @@
 #include "environmental.h"
 #endif /* CONFIG_APP_ENVIRONMENTAL */
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 #include "power.h"
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 /* Register log module */
 LOG_MODULE_REGISTER(app, CONFIG_APP_LOG_LEVEL);
@@ -238,7 +238,7 @@ static void sensor_and_poll_triggers_send(void)
 	}
 #endif /* CONFIG_APP_REQUEST_NETWORK_QUALITY */
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 	struct power_msg power_msg = {
 		.type = POWER_BATTERY_PERCENTAGE_SAMPLE_REQUEST,
 	};
@@ -249,7 +249,7 @@ static void sensor_and_poll_triggers_send(void)
 		SEND_FATAL_ERROR();
 		return;
 	}
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 #if defined(CONFIG_APP_ENVIRONMENTAL)
 	struct environmental_msg environmental_msg = {

app/src/modules/cloud/cloud_module.c

@@ -22,9 +22,9 @@
 #include "message_channel.h"
 #include "network.h"
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 #include "power.h"
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 #if defined(CONFIG_APP_ENVIRONMENTAL)
 #include "environmental.h"
@@ -36,11 +36,11 @@ LOG_MODULE_REGISTER(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);
 #define CUSTOM_JSON_APPID_VAL_CONEVAL "CONEVAL"
 #define CUSTOM_JSON_APPID_VAL_BATTERY "BATTERY"
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 #define BAT_MSG_SIZE	sizeof(struct power_msg)
 #else
 #define BAT_MSG_SIZE	0
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 #if defined(CONFIG_APP_ENVIRONMENTAL)
 #define ENV_MSG_SIZE	sizeof(struct environmental_msg)
@@ -68,9 +68,9 @@ ZBUS_CHAN_ADD_OBS(CLOUD_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(ENVIRONMENTAL_CHAN, cloud, 0);
 #endif /* CONFIG_APP_ENVIRONMENTAL */
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 ZBUS_CHAN_ADD_OBS(POWER_CHAN, cloud, 0);
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 /* Define channels provided by this module */
 
@@ -567,7 +567,7 @@ static void state_connected_ready_run(void *o)
 		}
 	}
 
-#if defined(CONFIG_APP_BATTERY)
+#if defined(CONFIG_APP_POWER)
 	if (state_object->chan == &POWER_CHAN) {
 		struct power_msg msg = MSG_TO_POWER_MSG(state_object->msg_buf);
 
@@ -588,7 +588,7 @@ static void state_connected_ready_run(void *o)
 			return;
 		}
 	}
-#endif /* CONFIG_APP_BATTERY */
+#endif /* CONFIG_APP_POWER */
 
 #if defined(CONFIG_APP_ENVIRONMENTAL)
 	if (state_object->chan == &ENVIRONMENTAL_CHAN) {

app/src/modules/power/power.c

@@ -8,6 +8,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/zbus/zbus.h>
 #include <zephyr/drivers/sensor/npm1300_charger.h>
+#include <zephyr/drivers/mfd/npm1300.h>
 #include <zephyr/sys/util.h>
 #include <nrf_fuel_gauge.h>
 #include <date_time.h>
@@ -54,8 +55,10 @@ BUILD_ASSERT(CONFIG_APP_POWER_WATCHDOG_TIMEOUT_SECONDS >
 #define NPM1300_CHG_STATUS_CV_MASK BIT(4)
 
 static const struct device *charger = DEVICE_DT_GET(DT_NODELABEL(npm1300_charger));
+static const struct device *pmic = DEVICE_DT_GET(DT_NODELABEL(pmic_main));
 
 /* Forward declarations */
+static int subscribe_to_vsbus_events(const struct device *pmic, struct gpio_callback *event_cb);
 static int charger_read_sensors(float *voltage, float *current, float *temp, int32_t *chg_status);
 static void sample(int64_t *ref_time);
 
@@ -107,13 +110,21 @@ static void state_running_entry(void *o)
 	};
 	int32_t chg_status;
 	struct power_state *state_object = o;
+	static struct gpio_callback event_cb;
 
 	if (!device_is_ready(charger)) {
 		LOG_ERR("Charger device not ready.");
 		SEND_FATAL_ERROR();
 		return;
 	}
 
+	err = subscribe_to_vsbus_events(pmic, &event_cb);
+	if (err) {
+		LOG_ERR("subscribe_to_vsbus_events, error: %d", err);
+		SEND_FATAL_ERROR();
+		return;
+	}
+
 	err = charger_read_sensors(&parameters.v0, &parameters.i0, &parameters.t0, &chg_status);
 	if (err < 0) {
 		LOG_ERR("charger_read_sensors, error: %d", err);
@@ -154,6 +165,33 @@ static void state_running_run(void *o)
 
 /* End of state handling */
 
+static void event_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	if (pins & BIT(NPM1300_EVENT_VBUS_DETECTED)) {
+		LOG_WRN("Vbus detected");
+	}
+
+	if (pins & BIT(NPM1300_EVENT_VBUS_REMOVED)) {
+		LOG_WRN("Vbus removed");
+	}
+}
+
+static int subscribe_to_vsbus_events(const struct device *pmic, struct gpio_callback *event_cb)
+{
+	int err;
+
+	gpio_init_callback(event_cb, event_callback, BIT(NPM1300_EVENT_VBUS_DETECTED) |
+						      BIT(NPM1300_EVENT_VBUS_REMOVED));
+
+	err = mfd_npm1300_add_callback(pmic, event_cb);
+	if (err) {
+		LOG_ERR("mfd_npm1300_add_callback, error: %d", err);
+		return err;
+	}
+
+	return 0;
+}
+
 static int charger_read_sensors(float *voltage, float *current, float *temp, int32_t *chg_status)
 {
 	struct sensor_value value;

tests/module/main/CMakeLists.txt

@@ -60,7 +60,7 @@ target_compile_definitions(app PRIVATE
 	-DCONFIG_LTE_LC_PSM_MODULE=1
 	-DCONFIG_APP_MODULE_RECV_BUFFER_SIZE=1024
 	-DCOAP_CONTENT_FORMAT_APP_JSON=50
-	-DCONFIG_APP_BATTERY=1
+	-DCONFIG_APP_POWER=1
 	-DCONFIG_APP_ENVIRONMENTAL=1
 	-DZEPHYR_INCLUDE_SYS_REBOOT_H_
 	-DCONFIG_APP_REQUEST_NETWORK_QUALITY=1