lib: nrf_fuel_gauge: Update nRF Fuel Gauge

Update nrfxlib nRF Fuel Gauge to v0.9.2,
and adjust sample and test accordingly.

Signed-off-by: Audun Korneliussen <audun.korneliussen@nordicsemi.no>

Author: nordic-auko

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -377,7 +377,9 @@ Peripheral samples
 PMIC samples
 ------------
 
-|no_changes_yet_note|
+* :ref:`npm1300_fuel_gauge` sample:
+
+  * Updated to accommodate API changes in the :ref:`nrfxlib:nrf_fuel_gauge`.
 
 Sensor samples
 --------------

samples/pmic/native/npm1300_fuel_gauge/prj.conf

@@ -3,7 +3,9 @@
 
 CONFIG_SHELL=y
 CONFIG_LOG=y
+CONFIG_LOG_CMDS=y
 CONFIG_GPIO=y
 CONFIG_REGULATOR=y
 CONFIG_SENSOR=y
+CONFIG_I2C_SHELL=y
 CONFIG_NRF_FUEL_GAUGE=y

samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c

@@ -10,9 +10,13 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/npm1300_charger.h>
 #include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
 #include "nrf_fuel_gauge.h"
 
+/* nPM1300 CHARGER.BCHGCHARGESTATUS.CONSTANTCURRENT register bitmask */
+#define NPM1300_CHG_STATUS_CC_MASK BIT_MASK(3)
+
 static float max_charge_current;
 static float term_charge_current;
 static int64_t ref_time;
@@ -21,7 +25,8 @@ static const struct battery_model battery_model = {
 #include "battery_model.inc"
 };
 
-static int read_sensors(const struct device *charger, float *voltage, float *current, float *temp)
+static int read_sensors(const struct device *charger,
+	float *voltage, float *current, float *temp, int32_t *chg_status)
 {
 	struct sensor_value value;
 	int ret;
@@ -40,16 +45,25 @@ static int read_sensors(const struct device *charger, float *voltage, float *cur
 	sensor_channel_get(charger, SENSOR_CHAN_GAUGE_AVG_CURRENT, &value);
 	*current = (float)value.val1 + ((float)value.val2 / 1000000);
 
+	sensor_channel_get(charger, SENSOR_CHAN_NPM1300_CHARGER_STATUS, &value);
+	*chg_status = value.val1;
+
 	return 0;
 }
 
 int fuel_gauge_init(const struct device *charger)
 {
 	struct sensor_value value;
-	struct nrf_fuel_gauge_init_parameters parameters = { .model = &battery_model };
+	struct nrf_fuel_gauge_init_parameters parameters = {
+		.model = &battery_model,
+		.opt_params = NULL,
+	};
+	int32_t chg_status;
 	int ret;
 
-	ret = read_sensors(charger, &parameters.v0, &parameters.i0, &parameters.t0);
+	printk("nRF Fuel Gauge version: %s\n", nrf_fuel_gauge_version);
+
+	ret = read_sensors(charger, &parameters.v0, &parameters.i0, &parameters.t0, &chg_status);
 	if (ret < 0) {
 		return ret;
 	}
@@ -75,19 +89,23 @@ int fuel_gauge_update(const struct device *charger)
 	float tte;
 	float ttf;
 	float delta;
+	int32_t chg_status;
+	bool cc_charging;
 	int ret;
 
-	ret = read_sensors(charger, &voltage, &current, &temp);
+	ret = read_sensors(charger, &voltage, &current, &temp, &chg_status);
 	if (ret < 0) {
 		printk("Error: Could not read from charger device\n");
 		return ret;
 	}
 
+	cc_charging = (chg_status & NPM1300_CHG_STATUS_CC_MASK) != 0;
+
 	delta = (float) k_uptime_delta(&ref_time) / 1000.f;
 
 	soc = nrf_fuel_gauge_process(voltage, current, temp, delta, NULL);
 	tte = nrf_fuel_gauge_tte_get();
-	ttf = nrf_fuel_gauge_ttf_get(-max_charge_current, -term_charge_current);
+	ttf = nrf_fuel_gauge_ttf_get(cc_charging, -term_charge_current);
 
 	printk("V: %.3f, I: %.3f, T: %.2f, ", voltage, current, temp);
 	printk("SoC: %.2f, TTE: %.0f, TTF: %.0f\n", soc, tte, ttf);

tests/lib/nrf_fuel_gauge/src/nrf_fuel_gauge_test.c

@@ -31,6 +31,7 @@ void test_nrf_fuel_gauge_init(void)
 		.i0 = 0.0f,
 		.t0 = 25.0f,
 		.model = &battery,
+		.opt_params = NULL,
 	};
 	float v0;
 	int err;
@@ -90,7 +91,7 @@ void test_nrf_fuel_gauge_sanity(void)
 		}
 
 		/* Don't expect time-to-full to be valid when discharging */
-		ttf = nrf_fuel_gauge_ttf_get(0.4f, 0.04f);
+		ttf = nrf_fuel_gauge_ttf_get(false, 0.04f);
 		TEST_ASSERT_TRUE(isnan(ttf));
 	}
 
@@ -134,8 +135,13 @@ void test_nrf_fuel_gauge_linking(void)
 	(void) nrf_fuel_gauge_process(4.2f, 0.07f, 25.0f, 60.0f, NULL);
 	(void) nrf_fuel_gauge_idle_set(4.2f, 25.0f, 0.0f);
 	(void) nrf_fuel_gauge_tte_get();
-	(void) nrf_fuel_gauge_ttf_get(0.0f, 0.0f);
-	(void) nrf_fuel_gauge_param_adjust(0.0f, 0.0f, 0.0f, 0.0f);
+	(void) nrf_fuel_gauge_ttf_get(false, 0.0f);
+	(void) nrf_fuel_gauge_param_adjust(&(struct nrf_fuel_gauge_runtime_parameters) {
+		.a = 0.0f,
+		.b = 0.0f,
+		.c = 0.0f,
+		.d = 0.0f,
+	});
 }
 
 extern int unity_main(void);

west.yml

@@ -141,7 +141,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: dcb888fd890fa409a15ce030ff10ffe2debd0d6c
+      revision: f61d074355d8adff09e1e0414d6a82652c08a126
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m