diff options
author | Bruce <Bruce.Wan@quantatw.com> | 2017-01-10 19:57:20 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-10 21:35:22 -0800 |
commit | 67c708142564ca23ee303472b4c50f8928da0eb4 (patch) | |
tree | 08c774020d26d78d8d0576f233283389d5099cf2 | |
parent | ed971ed82eb79aa2bf32b327d9f47d7defc50a75 (diff) | |
download | chrome-ec-67c708142564ca23ee303472b4c50f8928da0eb4.tar.gz |
snappy: modify battery temps setting by follow snappy spec.
Let unit can't charge when battery temperature is over than 45
degree by follow snappy spec.
BUG=none
BRANCH=reef
TEST=check temp is over than 45 degree, the unit can't charge.
Change-Id: Ic6d5f94790bb528b96980681dd223724b5a98359
Signed-off-by: Bruce.Wan <Bruce.Wan@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/426281
Commit-Ready: Bruce Wan <Bruce.Wan@quantatw.com>
Tested-by: Bruce Wan <Bruce.Wan@quantatw.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r-- | board/snappy/battery.c | 151 | ||||
-rw-r--r-- | board/snappy/board.h | 1 |
2 files changed, 13 insertions, 139 deletions
diff --git a/board/snappy/battery.c b/board/snappy/battery.c index c192edc2b1..7dcff42cdd 100644 --- a/board/snappy/battery.c +++ b/board/snappy/battery.c @@ -31,9 +31,9 @@ static const struct battery_info info = { .voltage_min = 6100, .precharge_current = 256, /* mA */ .start_charging_min_c = 0, - .start_charging_max_c = 46, + .start_charging_max_c = 45, .charging_min_c = 0, - .charging_max_c = 60, + .charging_max_c = 45, .discharging_min_c = 0, .discharging_max_c = 60, }; @@ -119,8 +119,6 @@ enum battery_disconnect_state battery_get_disconnect_state(void) #ifdef CONFIG_CHARGER_PROFILE_OVERRIDE -static int fast_charging_allowed = 1; - static int charger_should_discharge_on_ac(struct charge_state_data *curr) { /* can not discharge on AC without battery */ @@ -172,25 +170,12 @@ static int charger_should_discharge_on_ac(struct charge_state_data *curr) int charger_profile_override(struct charge_state_data *curr) { + const struct battery_info *batt_info; + /* temp in 0.1 deg C */ int temp_c = curr->batt.temperature - 2731; - /* keep track of last temperature range for hysteresis */ - static enum { - TEMP_RANGE_1, - TEMP_RANGE_2, - TEMP_RANGE_3, - TEMP_RANGE_4, - TEMP_RANGE_5, - } temp_range = TEMP_RANGE_3; - /* keep track of last voltage range for hysteresis */ - static enum { - VOLTAGE_RANGE_LOW, - VOLTAGE_RANGE_HIGH, - } voltage_range = VOLTAGE_RANGE_LOW; /* Current and previous battery voltage */ - int batt_voltage; - static int prev_batt_voltage; int disch_on_ac = charger_should_discharge_on_ac(curr); charger_discharge_on_ac(disch_on_ac); @@ -200,104 +185,15 @@ int charger_profile_override(struct charge_state_data *curr) return 0; } - /* - * Determine temperature range. The five ranges are: - * < 10C - * 10-15C - * 15-23C - * 23-45C - * > 45C - * - * Add 0.2 degrees of hysteresis. - * If temp reading was bad, use last range. - */ - if (!(curr->batt.flags & BATT_FLAG_BAD_TEMPERATURE)) { - if (temp_c < 99) - temp_range = TEMP_RANGE_1; - else if (temp_c > 101 && temp_c < 149) - temp_range = TEMP_RANGE_2; - else if (temp_c > 151 && temp_c < 229) - temp_range = TEMP_RANGE_3; - else if (temp_c > 231 && temp_c < 449) - temp_range = TEMP_RANGE_4; - else if (temp_c > 451) - temp_range = TEMP_RANGE_5; - } - - /* - * If battery voltage reading is bad, use the last reading. Otherwise, - * determine voltage range with hysteresis. - */ - if (curr->batt.flags & BATT_FLAG_BAD_VOLTAGE) { - batt_voltage = prev_batt_voltage; - } else { - batt_voltage = prev_batt_voltage = curr->batt.voltage; - if (batt_voltage < 8200) - voltage_range = VOLTAGE_RANGE_LOW; - else if (batt_voltage > 8300) - voltage_range = VOLTAGE_RANGE_HIGH; + batt_info = battery_get_info(); + /* Don't charge if outside of allowable temperature range */ + if (temp_c >= batt_info->charging_max_c * 10 || + temp_c < batt_info->charging_min_c * 10) { + curr->requested_current = 0; + curr->requested_voltage = 0; + curr->batt.flags &= ~BATT_FLAG_WANT_CHARGE; + curr->state = ST_IDLE; } - - /* - * If we are not charging or we aren't using fast charging profiles, - * then do not override desired current and voltage. - */ - if (curr->state != ST_CHARGE || !fast_charging_allowed) - return 0; - - /* - * Okay, impose our custom will: - * When battery is 0-10C: - * CC at 486mA @ 8.7V - * CV at 8.7V - * - * When battery is <15C: - * CC at 1458mA @ 8.7V - * CV at 8.7V - * - * When battery is <23C: - * CC at 3402mA until 8.3V @ 8.7V - * CC at 2430mA @ 8.7V - * CV at 8.7V - * - * When battery is <45C: - * CC at 4860mA until 8.3V @ 8.7V - * CC at 2430mA @ 8.7V - * CV at 8.7V until current drops to 450mA - * - * When battery is >45C: - * CC at 2430mA @ 8.3V - * CV at 8.3V (when battery is hot we don't go to fully charged) - */ - switch (temp_range) { - case TEMP_RANGE_1: - curr->requested_current = 486; - curr->requested_voltage = 8700; - break; - case TEMP_RANGE_2: - curr->requested_current = 1458; - curr->requested_voltage = 8700; - break; - case TEMP_RANGE_3: - curr->requested_voltage = 8700; - if (voltage_range == VOLTAGE_RANGE_HIGH) - curr->requested_current = 2430; - else - curr->requested_current = 3402; - break; - case TEMP_RANGE_4: - curr->requested_voltage = 8700; - if (voltage_range == VOLTAGE_RANGE_HIGH) - curr->requested_current = 2430; - else - curr->requested_current = 4860; - break; - case TEMP_RANGE_5: - curr->requested_current = 2430; - curr->requested_voltage = 8300; - break; - } - return 0; } @@ -307,37 +203,14 @@ int charger_profile_override(struct charge_state_data *curr) enum ec_status charger_profile_override_get_param(uint32_t param, uint32_t *value) { - if (param == PARAM_FASTCHARGE) { - *value = fast_charging_allowed; - return EC_RES_SUCCESS; - } return EC_RES_INVALID_PARAM; } enum ec_status charger_profile_override_set_param(uint32_t param, uint32_t value) { - if (param == PARAM_FASTCHARGE) { - fast_charging_allowed = value; - return EC_RES_SUCCESS; - } return EC_RES_INVALID_PARAM; } - -static int command_fastcharge(int argc, char **argv) -{ - if (argc > 1 && !parse_bool(argv[1], &fast_charging_allowed)) - return EC_ERROR_PARAM1; - - ccprintf("fastcharge %s\n", fast_charging_allowed ? "on" : "off"); - - return EC_SUCCESS; -} - -DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge, - "[on|off]", - "Get or set fast charging profile"); - #endif /* CONFIG_CHARGER_PROFILE_OVERRIDE */ /* diff --git a/board/snappy/board.h b/board/snappy/board.h index 8995dd5044..9e454afe3a 100644 --- a/board/snappy/board.h +++ b/board/snappy/board.h @@ -63,6 +63,7 @@ #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 #define CONFIG_CHARGER_MAINTAIN_VBAT #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 +#define CONFIG_CHARGER_PROFILE_OVERRIDE #define CONFIG_USB_CHARGER #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT |