mirror of
https://github.com/meshtastic/firmware.git
synced 2025-02-12 23:51:25 +00:00
Lock Portduino to MAGIC_USB_BATTERY_LEVEL for now (#3894)
This commit is contained in:
parent
300b26c6b5
commit
84d3117a7a
@ -69,8 +69,12 @@ meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
|
|||||||
t.time = getTime();
|
t.time = getTime();
|
||||||
t.which_variant = meshtastic_Telemetry_device_metrics_tag;
|
t.which_variant = meshtastic_Telemetry_device_metrics_tag;
|
||||||
t.variant.device_metrics.air_util_tx = airTime->utilizationTXPercent();
|
t.variant.device_metrics.air_util_tx = airTime->utilizationTXPercent();
|
||||||
|
#if ARCH_PORTDUINO
|
||||||
|
t.variant.device_metrics.battery_level = MAGIC_USB_BATTERY_LEVEL;
|
||||||
|
#else
|
||||||
t.variant.device_metrics.battery_level =
|
t.variant.device_metrics.battery_level =
|
||||||
powerStatus->getIsCharging() ? MAGIC_USB_BATTERY_LEVEL : powerStatus->getBatteryChargePercent();
|
powerStatus->getIsCharging() ? MAGIC_USB_BATTERY_LEVEL : powerStatus->getBatteryChargePercent();
|
||||||
|
#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;
|
||||||
t.variant.device_metrics.uptime_seconds = getUptimeSeconds();
|
t.variant.device_metrics.uptime_seconds = getUptimeSeconds();
|
||||||
@ -100,4 +104,4 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
|
|||||||
service.sendToMesh(p, RX_SRC_LOCAL, true);
|
service.sendToMesh(p, RX_SRC_LOCAL, true);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user