fix(pl18): add timeout to isChargerActive() to prevent hang (#7468)
This commit is contained in:
@@ -61,6 +61,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#define WCHARGER_LOW_CURRENT_DELAY_CNT 6000
|
#define WCHARGER_LOW_CURRENT_DELAY_CNT 6000
|
||||||
#define WCHARGER_HIGH_CURRENT_DELAY_CNT 24000
|
#define WCHARGER_HIGH_CURRENT_DELAY_CNT 24000
|
||||||
|
#define CHARGER_DETECTION_TIMEOUT 40 // 400ms
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -298,14 +299,16 @@ uint16_t get_battery_charge_state()
|
|||||||
bool isChargerActive()
|
bool isChargerActive()
|
||||||
{
|
{
|
||||||
#if defined(WIRELESS_CHARGER)
|
#if defined(WIRELESS_CHARGER)
|
||||||
while (!(uCharger.isChargerDetectionReady && wCharger.isChargerDetectionReady))
|
uint16_t timeout = CHARGER_DETECTION_TIMEOUT;
|
||||||
|
while (!(uCharger.isChargerDetectionReady && wCharger.isChargerDetectionReady) && timeout--)
|
||||||
{
|
{
|
||||||
get_battery_charge_state();
|
get_battery_charge_state();
|
||||||
delay_ms(10);
|
delay_ms(10);
|
||||||
}
|
}
|
||||||
return uCharger.hasCharger || wCharger.hasCharger;
|
return uCharger.hasCharger || wCharger.hasCharger;
|
||||||
#else
|
#else
|
||||||
while (!uCharger.isChargerDetectionReady)
|
uint16_t timeout = CHARGER_DETECTION_TIMEOUT;
|
||||||
|
while (!uCharger.isChargerDetectionReady && timeout--)
|
||||||
{
|
{
|
||||||
get_battery_charge_state();
|
get_battery_charge_state();
|
||||||
delay_ms(10);
|
delay_ms(10);
|
||||||
|
|||||||
Reference in New Issue
Block a user