Merge branch 'master' into master

This commit is contained in:
Thomas Göttgens
2022-09-09 21:39:29 +02:00
committed by GitHub
56 changed files with 780 additions and 820 deletions

View File

@@ -433,13 +433,8 @@ bool Power::axpChipInit()
//disable all axp chip interrupt
PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
if(config.power.charge_current == Config_PowerConfig_ChargeCurrent_MAUnset){
config.power.charge_current = Config_PowerConfig_ChargeCurrent_MA450;
}
// Set constant current charging current
PMU->setChargerConstantCurr(config.power.charge_current - 1);
PMU->setChargerConstantCurr(AXP1XX_CHARGE_CUR_450MA);
} else if (PMU->getChipModel() == XPOWERS_AXP2101) {