diff options
| author | Jasper Lievisse Adriaanse <jasper@humppa.nl> | 2013-10-03 12:59:37 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-10-14 10:13:40 +0200 |
| commit | 3a9bd434507fe056ae57ee104a8a915fa4925f76 (patch) | |
| tree | 614e77a4178e5d2f14426caf8110093076462b3b | |
| parent | b61f8a72e5c8c7ed570d7a08555142e877ea8374 (diff) | |
openbsd: recognize when battery is absent or fully charged
https://bugs.freedesktop.org/show_bug.cgi?id=70064
| -rw-r--r-- | src/openbsd/up-backend.c | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/src/openbsd/up-backend.c b/src/openbsd/up-backend.c index a94660c..5dbdb1b 100644 --- a/src/openbsd/up-backend.c +++ b/src/openbsd/up-backend.c @@ -305,7 +305,7 @@ static gboolean up_backend_update_battery_state(UpDevice* device) { gdouble percentage; - gboolean ret; + gboolean ret, is_present; struct sensordev sdev; UpDeviceState cur_state, new_state; gint64 cur_time_to_empty, new_time_to_empty; @@ -319,15 +319,48 @@ up_backend_update_battery_state(UpDevice* device) "state", &cur_state, "percentage", &percentage, "time-to-empty", &cur_time_to_empty, + "is-present", &is_present, (void*) NULL); /* XXX use acpibat0.raw0 if available */ + /* + * XXX: Stop having a split brain regarding + * up_backend_apm_get_battery_state_value(). Either move the state + * setting code below into that function, or inline that function here. + */ new_state = up_backend_apm_get_battery_state_value(a.battery_state); // if percentage/minutes goes down or ac is off, we're likely discharging.. if (percentage < a.battery_life || cur_time_to_empty < new_time_to_empty || a.ac_state == APM_AC_OFF) new_state = UP_DEVICE_STATE_DISCHARGING; + /* + * If we're on AC, we may either be charging, or the battery is already + * fully charged. Figure out which. + */ if (a.ac_state == APM_AC_ON) - new_state = UP_DEVICE_STATE_CHARGING; + if ((gdouble) a.battery_life >= 99.0) + new_state = UP_DEVICE_STATE_FULLY_CHARGED; + else + new_state = UP_DEVICE_STATE_CHARGING; + + if ((a.battery_state == APM_BATTERY_ABSENT) || + (a.battery_state == APM_BATT_UNKNOWN)) { + /* Reset some known fields which remain untouched below. */ + g_object_set(device, + "is-rechargeable", FALSE, + "energy", (gdouble) 0.0, + "energy-empty", (gdouble) 0.0, + "energy-full", (gdouble) 0.0, + "energy-full-design", (gdouble) 0.0, + "energy-rate", (gdouble) 0.0, + NULL); + is_present = FALSE; + if (a.battery_state == APM_BATTERY_ABSENT) + new_state = UP_DEVICE_STATE_EMPTY; + else + new_state = UP_DEVICE_STATE_UNKNOWN; + } else { + is_present = TRUE; + } // zero out new_time_to empty if we're not discharging or minutes_left is negative new_time_to_empty = (new_state == UP_DEVICE_STATE_DISCHARGING && a.minutes_left > 0 ? a.minutes_left : 0); @@ -340,6 +373,7 @@ up_backend_update_battery_state(UpDevice* device) "state", new_state, "percentage", (gdouble) a.battery_life, "time-to-empty", new_time_to_empty * 60, + "is-present", is_present, (void*) NULL); if(up_native_get_sensordev("acpibat0", &sdev)) up_backend_update_acpibat_state(device, sdev); |