samples: npm2100_fuel_gauge: Add 2SAA and 2SAAA battery models

Add Alkaline 2SAA and 2SAAA batteries from fuel gauge library
to the sample. These are AA and AAA batteries connected
two in series (2S configuration).

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

Author: nordic-auko

samples/pmic/native/npm2100_fuel_gauge/Kconfig

@@ -27,6 +27,16 @@ config BATTERY_MODEL_ALKALINE_AAA
 	help
 	  Alkaline AAA cylindrical battery.
 
+config BATTERY_MODEL_ALKALINE_2SAA
+	bool "Alkaline 2SAA"
+	help
+	  Two Alkaline AA cylindrical batteries in series.
+
+config BATTERY_MODEL_ALKALINE_2SAAA
+	bool "Alkaline 2SAAA"
+	help
+	  Two Alkaline AAA cylindrical batteries in series.
+
 config BATTERY_MODEL_ALKALINE_LR44
 	bool "Alkaline LR44"
 	help

samples/pmic/native/npm2100_fuel_gauge/README.rst

@@ -23,7 +23,7 @@ Overview
 
 This sample allows the calculation of state of charge from a battery connected to the nPM2100 PMIC.
 
-Battery models for Alkaline AA, AAA, LR44, and Lithium-manganese dioxide coin cell CR2032 batteries are included.
+Battery models for Alkaline AA (1S and 2S configuration), AAA (1S and 2S configuration), LR44, and Lithium-manganese dioxide coin cell CR2032 batteries are included.
 You can change the active battery model using a shell command, as illustrated in `Testing`_.
 You can also change the battery model at compile time using the :kconfig:option:`CONFIG_BATTERY_MODEL` Kconfig option.
 

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

@@ -25,6 +25,12 @@ static const struct battery_model_primary battery_models[] = {
 	[BATTERY_TYPE_ALKALINE_AAA] = {
 		#include <battery_models/primary_cell/AAA_Alkaline.inc>
 	},
+	[BATTERY_TYPE_ALKALINE_2SAA] = {
+		#include <battery_models/primary_cell/2SAA_Alkaline.inc>
+	},
+	[BATTERY_TYPE_ALKALINE_2SAAA] = {
+		#include <battery_models/primary_cell/2SAAA_Alkaline.inc>
+	},
 	[BATTERY_TYPE_ALKALINE_LR44] = {
 		#include <battery_models/primary_cell/LR44.inc>
 	},
@@ -39,6 +45,8 @@ static const struct battery_model_primary battery_models[] = {
 static const float battery_current[] = {
 	[BATTERY_TYPE_ALKALINE_AA] = 5e-3f,
 	[BATTERY_TYPE_ALKALINE_AAA] = 5e-3f,
+	[BATTERY_TYPE_ALKALINE_2SAA] = 5e-3f,
+	[BATTERY_TYPE_ALKALINE_2SAAA] = 5e-3f,
 	[BATTERY_TYPE_ALKALINE_LR44] = 1.5e-3f,
 	[BATTERY_TYPE_LITHIUM_CR2032] = 1.5e-3f,
 };

samples/pmic/native/npm2100_fuel_gauge/src/fuel_gauge.h

@@ -11,6 +11,10 @@ enum battery_type {
 	BATTERY_TYPE_ALKALINE_AA,
 	/* Cylindrical non-rechargeable Alkaline AAA */
 	BATTERY_TYPE_ALKALINE_AAA,
+	/* Cylindrical non-rechargeable Alkaline 2SAA (2 x AA in series) */
+	BATTERY_TYPE_ALKALINE_2SAA,
+	/* Cylindrical non-rechargeable Alkaline 2SAAA (2 x AAA in series) */
+	BATTERY_TYPE_ALKALINE_2SAAA,
 	/* Alkaline coin cell LR44 */
 	BATTERY_TYPE_ALKALINE_LR44,
 	/* Lithium-manganese dioxide coin cell CR2032 */

samples/pmic/native/npm2100_fuel_gauge/src/main.c

@@ -29,6 +29,10 @@ int main(void)
 		battery_model = BATTERY_TYPE_ALKALINE_AA;
 	} else if (IS_ENABLED(CONFIG_BATTERY_MODEL_ALKALINE_AAA)) {
 		battery_model = BATTERY_TYPE_ALKALINE_AAA;
+	} else if (IS_ENABLED(CONFIG_BATTERY_MODEL_ALKALINE_2SAA)) {
+		battery_model = BATTERY_TYPE_ALKALINE_2SAA;
+	} else if (IS_ENABLED(CONFIG_BATTERY_MODEL_ALKALINE_2SAAA)) {
+		battery_model = BATTERY_TYPE_ALKALINE_2SAAA;
 	} else if (IS_ENABLED(CONFIG_BATTERY_MODEL_ALKALINE_LR44)) {
 		battery_model = BATTERY_TYPE_ALKALINE_LR44;
 	} else if (IS_ENABLED(CONFIG_BATTERY_MODEL_LITHIUM_CR2032)) {
@@ -75,6 +79,10 @@ static int cmd_battery_model_set(const struct shell *sh, size_t argc, char **arg
 		battery_model = BATTERY_TYPE_ALKALINE_AA;
 	} else if (strcmp(argv[0], "Alkaline_AAA") == 0) {
 		battery_model = BATTERY_TYPE_ALKALINE_AAA;
+	} else if (strcmp(argv[0], "Alkaline_2SAA") == 0) {
+		battery_model = BATTERY_TYPE_ALKALINE_2SAA;
+	} else if (strcmp(argv[0], "Alkaline_2SAAA") == 0) {
+		battery_model = BATTERY_TYPE_ALKALINE_2SAAA;
 	} else if (strcmp(argv[0], "Alkaline_LR44") == 0) {
 		battery_model = BATTERY_TYPE_ALKALINE_LR44;
 	} else if (strcmp(argv[0], "Lithium_CR2032") == 0) {

west.yml

@@ -144,7 +144,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: pull/1686/head
+      revision: 9dd7e81d59a86c6e85508afb78068a425fc2bbd6
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m