Merge branch 'dev' into release-candidate

DakotaMcCutch · Jan 16, 2022 · 830daa8 · 830daa8
2 parents 543402f + 32c92a8
commit 830daa8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/firmware/targets/f6/furi_hal/furi_hal_power.c b/firmware/targets/f6/furi_hal/furi_hal_power.c
@@ -42,8 +42,8 @@ const ParamCEDV cedv = {
             .IGNORE_SD = 1,
             .SME0 = 0,
         },
-    .full_charge_cap = 2100,
-    .design_cap = 2100,
+    .full_charge_cap = 2101,
+    .design_cap = 2101,
     .EDV0 = 3300,
     .EDV1 = 3321,
     .EDV2 = 3355,
@@ -388,4 +388,4 @@ void furi_hal_power_suppress_charge_exit() {
         bq25896_enable_charging(&furi_hal_i2c_handle_power);
         furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     }
-}
+}
diff --git a/firmware/targets/f7/furi_hal/furi_hal_power.c b/firmware/targets/f7/furi_hal/furi_hal_power.c
@@ -42,8 +42,8 @@ const ParamCEDV cedv = {
             .IGNORE_SD = 1,
             .SME0 = 0,
         },
-    .full_charge_cap = 2100,
-    .design_cap = 2100,
+    .full_charge_cap = 2101,
+    .design_cap = 2101,
     .EDV0 = 3300,
     .EDV1 = 3321,
     .EDV2 = 3355,
@@ -388,4 +388,4 @@ void furi_hal_power_suppress_charge_exit() {
         bq25896_enable_charging(&furi_hal_i2c_handle_power);
         furi_hal_i2c_release(&furi_hal_i2c_handle_power);
     }
-}
+}
diff --git a/lib/drivers/bq27220.c b/lib/drivers/bq27220.c
@@ -102,7 +102,7 @@ bool bq27220_init(FuriHalI2cBusHandle* handle, const ParamCEDV* cedv) {
     bq27220_set_parameter_u16(handle, AddressEDV1, cedv->EDV1);
     bq27220_set_parameter_u16(handle, AddressEDV2, cedv->EDV2);
 
-    bq27220_control(handle, Control_EXIT_CFG_UPDATE);
+    bq27220_control(handle, Control_EXIT_CFG_UPDATE_REINIT);
     delay_us(10000);
     design_cap = bq27220_get_design_capacity(handle);
     if(cedv->design_cap == design_cap) {