Merge pull request #16 from tmobile/tmo-Fix-charger-related-issues

Fix charger-related issues

Author: johnlange2

samples/tmo_shell/CMakeLists.txt

@@ -26,7 +26,7 @@ target_sources(app PRIVATE src/led_test.c)
 target_sources(app PRIVATE src/misc_test.c)
 target_sources(app PRIVATE src/tmo_file.c)
 target_sources(app PRIVATE src/tmo_adc.c)
-target_sources(app PRIVATE src/tmo_batt_charger.c)
+target_sources(app PRIVATE src/tmo_bq24250.c)
 target_sources(app PRIVATE src/tmo_battery_ctrl.c)
 target_sources(app PRIVATE src/tmo_sntp.c)
 target_sources_ifdef(CONFIG_WIFI app PRIVATE src/tmo_wifi.c)

samples/tmo_shell/src/tmo_adc.c

@@ -69,8 +69,30 @@ void initADC (void)
 }
 
 /***************************************************************************
- * @brief  This function writes the amount of battery charge remaing (to the
- *         nearest 1%) in bv.
+ * @brief  Exponential filter for battery level
+ ***************************************************************************/
+static void apply_filter(float *bv)
+{
+	static float s_filtered_capacity = -1;
+	static bool s_battery_is_charging = false;
+	bool battery_is_charging;
+
+	// If there has been a switch between charger and battery, reset the filter
+	battery_is_charging = is_battery_charging();
+	if (s_battery_is_charging != battery_is_charging) {
+		s_battery_is_charging = battery_is_charging;
+		s_filtered_capacity = -1;
+	}
+
+	if (s_filtered_capacity < 0) {
+		s_filtered_capacity = *bv;
+	}
+	*bv = s_filtered_capacity = s_filtered_capacity * 0.95 + (*bv) * 0.05;
+}
+
+/***************************************************************************
+ * @brief  This function writes the amount of battery charge remaining
+ *         (to the nearest 1%) in bv.
  *         It returns true if successful, or false if there is an issue
  ***************************************************************************/
 bool millivolts_to_percent(uint32_t millivolts, uint8_t *percent) {
@@ -87,6 +109,7 @@ int read_battery_voltage(void)
 {
 	uint32_t sample;
 	uint32_t millivolts;
+	float millivolts_f;
 	// Start ADC conversion
 	k_sem_take(&adc_sem, K_MSEC(500));
 	ADC_Start(ADC0, adcStartSingle);
@@ -100,11 +123,11 @@ int read_battery_voltage(void)
 	k_sem_give(&adc_sem);
 
 	// Calculate input voltage in mV
-	millivolts = (sample * 2500) / 4096;
+	millivolts_f = (sample * 2500.0) / 4096.0;
 
 	// On the 2nd generation dev edge, voltage on PA2 is
 	// one third the actual battery voltage
-	millivolts = 3 * millivolts;
+	millivolts = (uint32_t) (3.0 * millivolts_f + 0.5);
 
 	return (millivolts);
 }

samples/tmo_shell/src/tmo_battery_ctrl.c

@@ -7,18 +7,22 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <devicetree.h>
+
+#if DT_NODE_EXISTS(DT_NODELABEL(bq24250))
+#include "tmo_bq24250.h"
+#endif
 
 #include "tmo_battery_ctrl.h"
 
 #define TABLE_LEN 11
 #define TABLE_VOLTAGE 0
-#define TABLE_PERCENTAGE 1
-
-/** According to NSEP-720 Jm-battery-modeling.xlsx **/
+#define TABLE_PERCENT 1
 
 // 100% value based on actual new battery measurement
 static float battery_discharging_tbl [TABLE_LEN][2] = {
-	{4.160, 100.0 },
+	{4.145, 100.0 },
 	{4.072, 90.0  },
 	{3.992, 80.0  },
 	{3.923, 70.0  },
@@ -31,9 +35,8 @@ static float battery_discharging_tbl [TABLE_LEN][2] = {
 	{3.632,  0.0  }};
 
 // 100% value based on actual new battery measurement
-// 90% value based on an old dev board only getting to 4.135V fully charged
 static float battery_charging_tbl [TABLE_LEN][2] = {
-	{4.180, 100.0 },
+	{4.175, 100.0 },
 	{4.130, 90.0  },
 	{4.071, 80.0  },
 	{4.005, 70.0  },
@@ -45,8 +48,16 @@ static float battery_charging_tbl [TABLE_LEN][2] = {
 	{3.741, 10.0  },
 	{3.597,  0.0  }};
 
-// extern bool battery_is_charging; The following line needs to be placed in the battery charging code
-bool battery_is_charging = false;
+bool is_battery_charging()
+{
+	uint8_t charging;
+	uint8_t vbus;
+	uint8_t attached;
+	uint8_t fault;
+
+	get_battery_charging_status(&charging, &vbus, &attached, &fault);
+	return (vbus && charging);
+}
 
 float get_remaining_capacity(float battery_voltage)
 {
@@ -55,7 +66,7 @@ float get_remaining_capacity(float battery_voltage)
 	float low_voltage = 0.0;
 	uint32_t i;
 
-	if (battery_is_charging)
+	if (is_battery_charging())
 		voltage_capacity_table = &battery_charging_tbl;
 	else
 		voltage_capacity_table = &battery_discharging_tbl;
@@ -85,26 +96,24 @@ float get_remaining_capacity(float battery_voltage)
 		return 0.0;
 	}
 
-	// make sure the averaging algorithm zeros the return value if
-	// the voltage capacity is less than 10 percent
-
-	float pct_gap = (float) (*voltage_capacity_table)[i-1][TABLE_PERCENTAGE] - (*voltage_capacity_table)[i][TABLE_PERCENTAGE];
-	return ((battery_voltage - low_voltage) / (high_voltage - low_voltage) * pct_gap) + (*voltage_capacity_table)[i][TABLE_PERCENTAGE];
+	float pct_gap = (float) (*voltage_capacity_table)[i-1][TABLE_PERCENT] - (*voltage_capacity_table)[i][TABLE_PERCENT];
+	return ((battery_voltage - low_voltage) / (high_voltage - low_voltage) * pct_gap) + (*voltage_capacity_table)[i][TABLE_PERCENT];
 }
 
-void apply_filter(float *bv)
+#if DT_NODE_EXISTS(DT_NODELABEL(pmic))
+extern int get_pmic_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault, uint8_t *charge_status);
+#endif
+
+int get_battery_charging_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault)
 {
-	static float s_filtered_capacity = -1;
-	static bool s_battery_is_charging = false;
+#if DT_NODE_EXISTS(DT_NODELABEL(bq24250))
+	int status = get_bq24250_status(charging, vbus, attached, fault);
+#endif
 
-	// If there has been a switch between charger and battery, reset the filter
-	if (s_battery_is_charging != battery_is_charging) {
-		s_battery_is_charging = battery_is_charging;
-		s_filtered_capacity = -1;
-	}
+#if DT_NODE_EXISTS(DT_NODELABEL(pmic))
+	uint8_t charge_status;
+	int status = get_pmic_status(charging, vbus, attached, fault, &charge_status);
+#endif
 
-	if (s_filtered_capacity < 0) {
-		s_filtered_capacity = *bv;
-	}
-	*bv = s_filtered_capacity = s_filtered_capacity * 0.95 + (*bv) * 0.05;
+	return status;
 }

samples/tmo_shell/src/tmo_battery_ctrl.h

@@ -32,7 +32,8 @@
 #define CUR_STAT_FAULT        40
 
 bool getBatteryPercent(uint8_t *bv);
-void apply_filter(float *bv);
 float get_remaining_capacity(float battery_voltage);
+bool is_battery_charging(void);
+int get_battery_charging_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault);
 
 #endif

samples/tmo_shell/src/tmo_ble_demo.c

@@ -36,13 +36,13 @@
 #include "tmo_gnss.h"
 #include "tmo_smp.h"
 #include "tmo_shell.h"
+#include "tmo_battery_ctrl.h"
 
 #define ON_CHARGER_POWER 0
 #define ON_BATTERY_POWER 1
 
 static inline void strupper(char *p) { while (*p) *p++ &= 0xdf;}
 #define uuid128(...) BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(__VA_ARGS__))
-extern bool battery_is_charging;
 
 extern struct bt_conn *get_acl_conn(int i);
 extern int get_active_le_conns();
@@ -195,15 +195,16 @@ static ssize_t battery_voltage_get(struct bt_conn *conn,
         uint8_t charging = 0;
         uint8_t vbus = 0;
         uint8_t fault = 0;
-        set_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
+
+        get_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
 
         /* flush the fault status out by reading again */
         if (fault) {
-                set_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
+                get_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
         }
-        /* there can be 2 of these 2 flush */
+        /* there can be 2 of these to flush */
         if (fault) {
-                set_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
+                get_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
         }
 
         if (battery_attached) {
@@ -220,8 +221,8 @@ static ssize_t battery_power_source_get(struct bt_conn *conn,
 	uint8_t power_source;
 	uint8_t charging, vbus, battery_attached, fault;
 
-	set_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
-	if (charging || !battery_attached) {
+	get_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
+	if (vbus) {
 		power_source = ON_CHARGER_POWER;
 	} else {
 		power_source = ON_BATTERY_POWER;
@@ -235,7 +236,6 @@ static void dummy_ccc_cfg_changed(const struct bt_gatt_attr *attr,
 	printf("CCC: %2x\n", value);
 }
 
-
 /**
  * @brief Acceleration CCC callback
  *
@@ -825,7 +825,7 @@ void ble_notif_thread(void *a, void *b, void *c)
 		}
 		uint8_t charging, vbus, battery_attached, fault, percent;
 
-		set_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
+		get_battery_charging_status(&charging, &vbus, &battery_attached, &fault);
 		if (battery_attached) {
 			uint32_t millivolts = read_battery_voltage();
 			millivolts_to_percent(millivolts, &percent);
@@ -837,7 +837,6 @@ void ble_notif_thread(void *a, void *b, void *c)
 	}
 }
 
-
 #define BLE_NOTIF_THREAD_STACK_SIZE 2048
 #define BLE_NOTIF_THREAD_PRIORITY CONFIG_MAIN_THREAD_PRIORITY
 

samples/tmo_shell/src/tmo_batt_charger.c renamed to samples/tmo_shell/src/tmo_bq24250.c

@@ -10,7 +10,9 @@
 #include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <sys/byteorder.h>
-#include "tmo_batt_charger.h"
+#include "tmo_bq24250.h"
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(bq24250), okay)
 
 #define BQ_GPIO_F_NAME               "GPIO_F"
 #define BQ_CHARGE_INT                12      /* PF12 - configured here */
@@ -46,9 +48,9 @@ static const struct device *i2c1_dev = DEVICE_DT_GET(DT_NODELABEL(i2c1));
 static struct gpio_callback gpio_batt_chrg_cb;
 int bq_battery_charge_int_isr_count = 0;
 bool bq_battery_charge_int_state_change = false;
-
 uint8_t i2c_read_data[20];
-static int i2c_read_to_buffer( uint8_t dev_addr, int reg_addr, uint8_t *buf, uint8_t buf_length)
+
+static int i2c_read_to_buffer(uint8_t dev_addr, int reg_addr, uint8_t *buf, uint8_t buf_length)
 {
 	const struct device *dev;
 	uint8_t reg_addr_buf[MAX_BYTES_FOR_REGISTER_INDEX];
@@ -72,11 +74,10 @@ static int i2c_read_to_buffer( uint8_t dev_addr, int reg_addr, uint8_t *buf, uin
 		printf("Failed to read from device: 0x%x", dev_addr);
 		return -EIO;
 	}
-
 	return 0;
 }
 
-int get_bq24250_charger_vbus_status (uint8_t * charging, uint8_t * vbus, uint8_t * attached, uint8_t * fault)
+int get_bq24250_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault)
 {
 	int ret = 0;
 	uint8_t bq_addr = 0x6a;
@@ -93,40 +94,38 @@ int get_bq24250_charger_vbus_status (uint8_t * charging, uint8_t * vbus, uint8_t
 	uint8_t charger_status = ((bq_reg_0x00_data & 0x30) >> 4);
 	uint8_t charge_fault_status = (bq_reg_0x00_data & 0x0F);
 
+	*vbus = 0;
+	*charging = 0;
+	*attached = 0;
+	*fault = 0;
 
-        *vbus = 0;
-        *charging = 0;
-        *attached = 0;
-        *fault = 0;
-
-        if ((charger_status == 3) && (charge_fault_status > 0 )) {
-                *vbus = 0;
-                *charging = 0;
-                if (charge_fault_status == 8) {
-                        *attached = 0;
-                }
-                else {
-                        *attached = 1;
-                        *fault = 1;
-                }
-        }
-        else {
-                if ((charger_status == 1) && (charge_fault_status == 0)) {
-                        *vbus = 1;
-                        *charging = 1;
-                        *attached = 1;
-                }
-                else {
-                        *vbus = 1;
-                        *charging = 0;
-                        *attached = 1;
-                }
-        }
-
-        return ret;
+	if ((charger_status == 3) && (charge_fault_status > 0 )) {
+		*vbus = 0;
+		*charging = 0;
+		if (charge_fault_status == 8) {
+			*attached = 0;
+		}
+		else {
+			*attached = 1;
+			*fault = 1;
+		}
+	}
+	else {
+		if ((charger_status == 1) && (charge_fault_status == 0)) {
+			*vbus = 1;
+			*charging = 1;
+			*attached = 1;
+		}
+		else {
+			*vbus = 1;
+			*charging = 0;
+			*attached = 1;
+		}
+	}
+	return ret;
 }
 
-static int check_battery_charger_regs (void)
+static int check_battery_charger_regs(void)
 {
 	int ret = 0;
 
@@ -240,18 +239,17 @@ static int check_battery_charger_regs (void)
 				break;
 		}
 	}
-
 	return ret;
 }
 
-void bq_intr_callback(const struct device *port,
+static void bq_intr_callback(const struct device *port,
 		struct gpio_callback *cb, uint32_t pins)
 {
 	bq_battery_charge_int_isr_count++;
 	bq_battery_charge_int_state_change = true;
 }
 
-void bq_thread(void *a, void *b, void *c)
+static void bq_thread(void *a, void *b, void *c)
 {
 	ARG_UNUSED(a);
 	ARG_UNUSED(b);
@@ -330,7 +328,6 @@ void bq_thread(void *a, void *b, void *c)
 #define BQ_NOTIF_THREAD_STACK_SIZE 2048
 #define BQ_NOTIF_THREAD_PRIORITY CONFIG_MAIN_THREAD_PRIORITY
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(bq24250), okay)
 K_THREAD_DEFINE(bq_tid, BQ_NOTIF_THREAD_STACK_SIZE,
 		bq_thread, NULL, NULL, NULL,
 		BQ_NOTIF_THREAD_PRIORITY, 0, 0);

samples/tmo_shell/src/tmo_batt_charger.h renamed to samples/tmo_shell/src/tmo_bq24250.h

@@ -7,6 +7,6 @@
 #ifndef TMO_BATT_CHARGER_H
 #define TMO_BATT_CHARGER_H
 
-int get_bq24250_charger_vbus_status(uint8_t * charging , uint8_t * vbus , uint8_t * attached, uint8_t *fault);
+int get_bq24250_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault);
 
 #endif