Skip to content

fix(pl18): add timeout to isChargerActive() to prevent hang when batt… #7468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pfeerick merged 2 commits into from
Jun 18, 2026
Merged

fix(pl18): add timeout to isChargerActive() to prevent hang when batt… #7468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e0052
fix(pl18): add timeout to isChargerActive() to prevent hang when batt…
richardclli Jun 17, 2026
7eeec56
Update timeout to 400ms
richardclli Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions radio/src/targets/pl18/battery_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#endif
#define WCHARGER_LOW_CURRENT_DELAY_CNT 6000
#define WCHARGER_HIGH_CURRENT_DELAY_CNT 24000
#define CHARGER_DETECTION_TIMEOUT 40 // 400ms

typedef struct
{
Expand Down Expand Up @@ -298,14 +299,16 @@ uint16_t get_battery_charge_state()
bool isChargerActive()
{
#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();
delay_ms(10);
}
return uCharger.hasCharger || wCharger.hasCharger;
#else
while (!uCharger.isChargerDetectionReady)
uint16_t timeout = CHARGER_DETECTION_TIMEOUT;
while (!uCharger.isChargerDetectionReady && timeout--)
{
get_battery_charge_state();
delay_ms(10);
Expand Down