fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-08 08:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

openbsd: improve logic wrt sensor type

Browse source 
in case some sensors are in AMPHOUR/AMPS and others in WATTHOUR/WATTS,
don't assume they are all the same type. As a benefit, shrinks the
code a bit.

Signed-off-by: Richard Hughes <richard@hughsie.com>
This commit is contained in:
Landry Breuil 2012-01-04 11:39:25 +01:00 • committed by Richard Hughes
parent 37ff0d4ddb
commit 3dfc0598f8
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/openbsd/up-backend.c
View file

@ -345,7 +345,7 @@ up_backend_update_battery_state(UpDevice* device)
static void
up_backend_update_acpibat_state(UpDevice* device, struct sensordev s)
{
enum sensor_type type, typev = SENSOR_INTEGER;
enum sensor_type type;
int numt;
gdouble bst_volt, bst_rate, bif_lastfullcap, bst_cap, bif_lowcap;
/* gdouble bif_dvolt, bif_dcap, capacity; */
@ -364,20 +364,16 @@ up_backend_update_acpibat_state(UpDevice* device, struct sensordev s)
if (sens.type == SENSOR_VOLTS_DC && !strcmp(sens.desc, "current voltage"))
bst_volt = sens.value / 1000000.0f;
if ((sens.type == SENSOR_AMPHOUR || sens.type == SENSOR_WATTHOUR) && !strcmp(sens.desc, "last full capacity")) {
typev = sens.type;
bif_lastfullcap = sens.value / 1000000.0f;
bif_lastfullcap = (sens.type == SENSOR_AMPHOUR ? bst_volt : 1) * sens.value / 1000000.0f;
}
if ((sens.type == SENSOR_AMPHOUR || sens.type == SENSOR_WATTHOUR) && !strcmp(sens.desc, "low capacity")) {
typev = sens.type;
bif_lowcap = sens.value / 1000000.0f;
bif_lowcap = (sens.type == SENSOR_AMPHOUR ? bst_volt : 1) * sens.value / 1000000.0f;
}
if ((sens.type == SENSOR_AMPHOUR || sens.type == SENSOR_WATTHOUR) && !strcmp(sens.desc, "remaining capacity")) {
typev = sens.type;
bst_cap = sens.value / 1000000.0f;
bst_cap = (sens.type == SENSOR_AMPHOUR ? bst_volt : 1) * sens.value / 1000000.0f;
}
if ((sens.type == SENSOR_AMPS || sens.type == SENSOR_WATTS) && !strcmp(sens.desc, "rate")) {
typev = sens.type;
bst_rate = sens.value / 1000000.0f;
bst_rate = (sens.type == SENSOR_AMPS ? bst_volt : 1) * sens.value / 1000000.0f;
}
/*
bif_dvolt = "voltage" = unused ?
@ -388,12 +384,6 @@ up_backend_update_acpibat_state(UpDevice* device, struct sensordev s)
}
}
}
if (typev == SENSOR_AMPHOUR || typev == SENSOR_AMPS) {
bst_cap *= bst_volt;
bif_lowcap *= bst_volt;
bif_lastfullcap *= bst_volt;
bst_rate *= bst_volt;
}
g_object_set (device,
"energy", bst_cap,
"energy-full", bif_lastfullcap,