diff options
| author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2016-03-30 08:53:55 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2016-03-30 08:53:55 +0200 |
| commit | c094f47b457104c267dd55782efc34c47f05cf9d (patch) | |
| tree | 2c566d2ee99597f73a2cf6bb49a0e2669ae84b38 /src/print_battery_info.c | |
| parent | dbc59d7376dd1c49b4948d17209910fad01b3560 (diff) | |
| parent | d59589bf9ea9b1c0f760077af0e849f6c369b446 (diff) | |
Merge pull request #117 from egroat/master
Added status_unk to battery_info
Diffstat (limited to 'src/print_battery_info.c')
| -rw-r--r-- | src/print_battery_info.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c index 9ce121e..7fb2ab5 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -34,7 +34,7 @@ * worn off your battery is. * */ -void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) { +void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_unk, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) { time_t empty_time; struct tm *empty_tm; char buf[1024]; @@ -64,7 +64,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char INSTANCE(batpath); #define BATT_STATUS_NAME(status) \ - (status == CS_CHARGING ? status_chr : (status == CS_DISCHARGING ? status_bat : status_full)) + (status == CS_CHARGING ? status_chr : (status == CS_DISCHARGING ? status_bat : (status == CS_UNKNOWN ? status_unk : status_full))) #if defined(LINUX) if (!slurp(batpath, buf, sizeof(buf))) { @@ -101,6 +101,10 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char status = CS_CHARGING; else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full")) status = CS_FULL; + else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Discharging")) + status = CS_DISCHARGING; + else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=")) + status = CS_UNKNOWN; else { /* The only thing left is the full capacity */ if (last_full_capacity) { |