mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into release-candidate

Browse Source
This commit is contained in:
Aleksandr Kutuzov 2022-01-16 18:43:41 +03:00
commit 830daa8b51
No known key found for this signature in database
GPG Key ID: 0D0011717914BBCD
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/targets/f6/furi_hal/furi_hal_power.c
View File

@ -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);
}
}
}

6
firmware/targets/f7/furi_hal/furi_hal_power.c
View File

@ -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);
}
}
}

2
lib/drivers/bq27220.c
View File

@ -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) {