azalea/WearSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[O] Use current in battery info instead of voltage

Browse Source
This commit is contained in:
Azalea Gui
2023-01-24 10:26:11 -05:00
parent c7030af398
commit 9a992a310a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/hydev/wearsync/BatteryInfo.kt
+4 -4
View File
@@ -9,18 +9,18 @@ import com.influxdb.annotations.Measurement
data class BatteryInfo( data class BatteryInfo(
@Column val percent: Double, // Percent @Column val percent: Double, // Percent
@Column val temperature: Double, // Celsius @Column val temperature: Double, // Celsius
@Column val voltage: Double, // Volts @Column val current: Double, // mA
@Column val status: String?, @Column val status: String?,
@Column val health: String?, @Column val health: String?,
@Column val powerSource: String?, @Column val powerSource: String?,
) { ) {
companion object { companion object {
fun Intent.batteryInfo(): BatteryInfo fun Intent.batteryInfo(bm: BatteryManager): BatteryInfo
{ {
val level = getIntExtra(BatteryManager.EXTRA_LEVEL, -1) val level = getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
val scale = getIntExtra(BatteryManager.EXTRA_SCALE, -1) val scale = getIntExtra(BatteryManager.EXTRA_SCALE, -1)
val temp = getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1) val temp = getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1)
val voltage = getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1) val current = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
val status = getIntExtra(BatteryManager.EXTRA_STATUS, -1) val status = getIntExtra(BatteryManager.EXTRA_STATUS, -1)
val health = getIntExtra(BatteryManager.EXTRA_HEALTH, -1) val health = getIntExtra(BatteryManager.EXTRA_HEALTH, -1)
val chargePlug = getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) val chargePlug = getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)
@@ -57,7 +57,7 @@ data class BatteryInfo(
return BatteryInfo( return BatteryInfo(
percent = level.toDouble() / scale, percent = level.toDouble() / scale,
temperature = temp / 10.0, temperature = temp / 10.0,
voltage = voltage / 1000.0, current = current / 1000.0,
status = statusStr, status = statusStr,
health = healthStr, health = healthStr,
powerSource = powerSource powerSource = powerSource