diff options
| author | Marcel Hellwig | 2012-07-05 18:19:26 +0200 |
|---|---|---|
| committer | Michael Stapelberg | 2012-07-09 15:13:05 +0200 |
| commit | c01e87b2692bac03dffb07f3cf8e263758385910 (patch) | |
| tree | fb9a8fa5962afa571fb99145b57323506d5aedbc /src | |
| parent | Added condition, for red color, when battery-time is low, namely battery is d... (diff) | |
Added consumption to battery info
Diffstat (limited to 'src')
| -rw-r--r-- | src/print_battery_info.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c index 3e0c302..74d4460 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -37,6 +37,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char char percentagebuf[16]; char remainingbuf[256]; char emptytimebuf[256]; + char consumptionbuf[256]; const char *walk, *last; char *outwalk = buffer; int full_design = -1, @@ -48,6 +49,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char memset(percentagebuf, '\0', sizeof(percentagebuf)); memset(remainingbuf, '\0', sizeof(remainingbuf)); memset(emptytimebuf, '\0', sizeof(emptytimebuf)); + memset(consumptionbuf, '\0', sizeof(consumptionbuf)); INSTANCE(path); @@ -134,6 +136,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d", max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0)); + (void)snprintf(consumptionbuf, sizeof(consumptionbuf), "%1.2fW", + ((float)present_rate / 1000.0 / 1000.0)); + END_COLOR; } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) @@ -249,6 +254,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) { outwalk += sprintf(outwalk, "%s", emptytimebuf); walk += strlen("emptytime"); + } else if (strncmp(walk+1, "consumption", strlen("consumption")) == 0) { + outwalk += sprintf(outwalk, "%s", consumptionbuf); + walk += strlen("consumptionbuf"); } } |