patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

fuel_gauge: Fix desired current/voltage units

Browse source 
The desired current/voltage properties make use of milliamps/volts while
the present current/voltage properties make use of microamps/volts.

Fix the desired current/voltage properties to be consistent with the
present current/voltage properties where they're most likely to be used
with.

Signed-off-by: Aaron Massey <aaronmassey@google.com>
This commit is contained in:
Aaron Massey 2023-10-05 16:59:58 -06:00 committed by Johan Hedberg
parent 68365d5b67
commit 32b27384a6
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/fuel_gauge/bq27z746/bq27z746.c
View file

@ -175,11 +175,11 @@ static int bq27z746_get_prop(const struct device *dev, fuel_gauge_prop_t prop,
break; break;
case FUEL_GAUGE_CHARGE_VOLTAGE: case FUEL_GAUGE_CHARGE_VOLTAGE:
rc = bq27z746_read16(dev, BQ27Z746_CHARGINGVOLTAGE, &tmp_val); rc = bq27z746_read16(dev, BQ27Z746_CHARGINGVOLTAGE, &tmp_val);
val->chg_voltage = tmp_val; val->chg_voltage = tmp_val * 1000;
break; break;
case FUEL_GAUGE_CHARGE_CURRENT: case FUEL_GAUGE_CHARGE_CURRENT:
rc = bq27z746_read16(dev, BQ27Z746_CHARGINGCURRENT, &tmp_val); rc = bq27z746_read16(dev, BQ27Z746_CHARGINGCURRENT, &tmp_val);
val->chg_current = tmp_val; val->chg_current = tmp_val * 1000;
break; break;
case FUEL_GAUGE_STATUS: case FUEL_GAUGE_STATUS:
rc = bq27z746_read16(dev, BQ27Z746_BATTERYSTATUS, &tmp_val); rc = bq27z746_read16(dev, BQ27Z746_BATTERYSTATUS, &tmp_val);

4
drivers/fuel_gauge/sbs_gauge/sbs_gauge.c
View file

@ -127,11 +127,11 @@ static int sbs_gauge_get_prop(const struct device *dev, fuel_gauge_prop_t prop,
break; break;
case FUEL_GAUGE_CHARGE_CURRENT: case FUEL_GAUGE_CHARGE_CURRENT:
rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_CHG_CURRENT, &tmp_val); rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_CHG_CURRENT, &tmp_val);
val->chg_current = tmp_val; val->chg_current = tmp_val * 1000;
break; break;
case FUEL_GAUGE_CHARGE_VOLTAGE: case FUEL_GAUGE_CHARGE_VOLTAGE:
rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_CHG_VOLTAGE, &tmp_val); rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_CHG_VOLTAGE, &tmp_val);
val->chg_voltage = tmp_val; val->chg_voltage = tmp_val * 1000;
break; break;
case FUEL_GAUGE_STATUS: case FUEL_GAUGE_STATUS:
rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_FLAGS, &tmp_val); rc = sbs_cmd_reg_read(dev, SBS_GAUGE_CMD_FLAGS, &tmp_val);

8
include/zephyr/drivers/fuel_gauge.h
View file

@ -72,9 +72,9 @@ enum fuel_gauge_prop_type {
FUEL_GAUGE_VOLTAGE, FUEL_GAUGE_VOLTAGE,
/** Battery Mode (flags) */ /** Battery Mode (flags) */
FUEL_GAUGE_SBS_MODE, FUEL_GAUGE_SBS_MODE,
/** Battery desired Max Charging Current (mA) */ /** Battery desired Max Charging Current (uA) */
FUEL_GAUGE_CHARGE_CURRENT, FUEL_GAUGE_CHARGE_CURRENT,
/** Battery desired Max Charging Voltage (mV) */ /** Battery desired Max Charging Voltage (uV) */
FUEL_GAUGE_CHARGE_VOLTAGE, FUEL_GAUGE_CHARGE_VOLTAGE,
/** Alarm, Status and Error codes (flags) */ /** Alarm, Status and Error codes (flags) */
FUEL_GAUGE_STATUS, FUEL_GAUGE_STATUS,
@ -153,9 +153,9 @@ union fuel_gauge_prop_val {
/** FUEL_GAUGE_SBS_MODE */ /** FUEL_GAUGE_SBS_MODE */
uint16_t sbs_mode; uint16_t sbs_mode;
/** FUEL_GAUGE_CHARGE_CURRENT */ /** FUEL_GAUGE_CHARGE_CURRENT */
uint16_t chg_current; uint32_t chg_current;
/** FUEL_GAUGE_CHARGE_VOLTAGE */ /** FUEL_GAUGE_CHARGE_VOLTAGE */
uint16_t chg_voltage; uint32_t chg_voltage;
/** FUEL_GAUGE_STATUS */ /** FUEL_GAUGE_STATUS */
uint16_t fg_status; uint16_t fg_status;
/** FUEL_GAUGE_DESIGN_CAPACITY */ /** FUEL_GAUGE_DESIGN_CAPACITY */

4
tests/drivers/fuel_gauge/bq27z746/src/test_bq27z746.c
View file

@ -139,8 +139,8 @@ ZTEST_USER_F(bq27z746, test_get_props__returns_ok)
zassert_equal(vals[10].voltage, 1000); zassert_equal(vals[10].voltage, 1000);
zassert_equal(vals[11].sbs_at_rate, -2); zassert_equal(vals[11].sbs_at_rate, -2);
zassert_equal(vals[12].sbs_at_rate_time_to_empty, 1); zassert_equal(vals[12].sbs_at_rate_time_to_empty, 1);
zassert_equal(vals[13].chg_voltage, 1); zassert_equal(vals[13].chg_voltage, 1000);
zassert_equal(vals[14].chg_current, 1); zassert_equal(vals[14].chg_current, 1000);
zassert_equal(vals[15].fg_status, 1); zassert_equal(vals[15].fg_status, 1);
zassert_equal(vals[16].design_cap, 1); zassert_equal(vals[16].design_cap, 1);
#else #else