diff options
| -rw-r--r-- | board/corori/battery.c | 95 | ||||
| -rw-r--r-- | board/corori/board.h | 4 |
2 files changed, 20 insertions, 79 deletions
diff --git a/board/corori/battery.c b/board/corori/battery.c index 326ac93a6b..405a69751a 100644 --- a/board/corori/battery.c +++ b/board/corori/battery.c @@ -33,44 +33,16 @@ * address, mask, and disconnect value need to be provided. */ const struct board_batt_params board_battery_info[] = { - /* LGC AP18C8K Battery Information */ - [BATTERY_LGC_AP18C8K] = { + /* C21N2018 Battery Information + * TODO(b:196506846):Need to be verified on the Proto + */ + [BATTERY_C21N2018] = { .fuel_gauge = { - .manuf_name = "LGC KT0030G020", - .device_name = "AP18C8K", + .manuf_name = "AS3GXXD3KA", + .device_name = "C110160", .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, - }, - .fet = { - .reg_addr = 0x43, - .reg_mask = 0x0001, - .disconnect_val = 0x0, - .cfet_mask = 0x0002, - .cfet_off_val = 0x0000, - }, - }, - .batt_info = { - .voltage_max = 13050, - .voltage_normal = 11250, - .voltage_min = 9000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 75, - }, - }, - /* Murata AP18C4K Battery Information */ - [BATTERY_MURATA_AP18C4K] = { - .fuel_gauge = { - .manuf_name = "Murata KT00304012", - .device_name = "AP18C4K", - .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, + .reg_addr = 0x00, + .reg_data = { 0x0010, 0x0010 }, }, .fet = { .reg_addr = 0x0, @@ -81,48 +53,19 @@ const struct board_batt_params board_battery_info[] = { }, }, .batt_info = { - .voltage_max = 13200, - .voltage_normal = 11400, - .voltage_min = 9000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 75, - }, - }, - /* AP19B8M */ - [BATTERY_AP19B8M] = { - .fuel_gauge = { - .manuf_name = "LGC KT0030G024", - .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, - }, - .fet = { - .reg_addr = 0x43, - .reg_mask = 0x0001, - .disconnect_val = 0x0, - .cfet_mask = 0x0002, - .cfet_off_val = 0x0000, - } - }, - .batt_info = { - .voltage_max = 13350, - .voltage_normal = 11610, - .voltage_min = 9000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 75, + .voltage_max = 8800, + .voltage_normal = 7890, + .voltage_min = 6000, + .precharge_current = 256, + .start_charging_min_c = 0, + .start_charging_max_c = 45, + .charging_min_c = 0, + .charging_max_c = 60, + .discharging_min_c = -20, + .discharging_max_c = 60, }, }, }; BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_LGC_AP18C8K; +const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_C21N2018; diff --git a/board/corori/board.h b/board/corori/board.h index af90d465bf..a45bd6ca4e 100644 --- a/board/corori/board.h +++ b/board/corori/board.h @@ -151,9 +151,7 @@ enum pwm_channel { }; enum battery_type { - BATTERY_AP19B8M, - BATTERY_LGC_AP18C8K, - BATTERY_MURATA_AP18C4K, + BATTERY_C21N2018, BATTERY_TYPE_COUNT, }; |