mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-24 09:26:52 +00:00
Merge pull request #4646 from gitbisector/batt_stat
Report PWD when no battery present.
This commit is contained in:
commit
8e88b9e819
@ -100,8 +100,9 @@ meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
|
|||||||
#if ARCH_PORTDUINO
|
#if ARCH_PORTDUINO
|
||||||
t.variant.device_metrics.battery_level = MAGIC_USB_BATTERY_LEVEL;
|
t.variant.device_metrics.battery_level = MAGIC_USB_BATTERY_LEVEL;
|
||||||
#else
|
#else
|
||||||
t.variant.device_metrics.battery_level =
|
t.variant.device_metrics.battery_level = (!powerStatus->getHasBattery() || powerStatus->getIsCharging())
|
||||||
powerStatus->getIsCharging() ? MAGIC_USB_BATTERY_LEVEL : powerStatus->getBatteryChargePercent();
|
? MAGIC_USB_BATTERY_LEVEL
|
||||||
|
: powerStatus->getBatteryChargePercent();
|
||||||
#endif
|
#endif
|
||||||
t.variant.device_metrics.channel_utilization = airTime->channelUtilizationPercent();
|
t.variant.device_metrics.channel_utilization = airTime->channelUtilizationPercent();
|
||||||
t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
|
t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
|
||||||
|
Loading…
Reference in New Issue
Block a user