Also change power reading to work on newer kernels.
RES=$(xrandr --prop | sed "s/Screen 0:[^,]*, current \(.*\) x \(.*\),.*/\1,\2/g;te;d;:e")
RESX=${RES%%,*}
RESY=${RES##*,}
FONT="-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso8859-1"
#FONT="-*-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-*-*"
RES=$(xrandr --prop | sed "s/Screen 0:[^,]*, current \(.*\) x \(.*\),.*/\1,\2/g;te;d;:e")
RESX=${RES%%,*}
RESY=${RES##*,}
FONT="-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso8859-1"
#FONT="-*-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-*-*"
-if [ $((RESX)) -gt 1920 ]
+if [ $((RESX)) -gt $((MAXRESX)) ]
-STATUSES=battery.o cpuusage.o datetime.o memusage.o netif.o temp.o uptime.o volume_alsa.o
+STATUSES=battery.o cpuusage.o datetime.o fan.o memusage.o netif.o temp.o uptime.o volume_alsa.o
OTHERS=tools.o
all: *.c *.h ../config.h Makefile $(STATUSES) $(OTHERS)
OTHERS=tools.o
all: *.c *.h ../config.h Makefile $(STATUSES) $(OTHERS)
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include "string.h"
#include "battery.h"
#include "string.h"
#include "battery.h"
int batt_full = -1;
int batt_percent = -1;
int batt_current = 1;
int batt_full = -1;
int batt_percent = -1;
int batt_current = 1;
int batt_voltage = 0;
float batt_time = -1;
float batt_watts = -1;
int batt_voltage = 0;
float batt_time = -1;
float batt_watts = -1;
strcat(batpath, batname);
strcat(batpath, batname);
+ // Is the battery present?
+ if (access(batpath, F_OK))
+ {
+ //printf(" ^fg(grey)[%s] ", batname);
+ return;
+ }
+
+
// Get info
strcpy(&batpath[batpathlen], "/energy_now");
stlen = fileRead(stline, sizeof(stline), batpath);
// Get info
strcpy(&batpath[batpathlen], "/energy_now");
stlen = fileRead(stline, sizeof(stline), batpath);
if (stlen > 0)
batt_full = atoi(stline);
if (stlen > 0)
batt_full = atoi(stline);
- strcpy(&batpath[batpathlen], "/current_now");
+ strcpy(&batpath[batpathlen], "/power_now");
stlen = fileRead(stline, sizeof(stline), batpath);
if (stlen > 0)
stlen = fileRead(stline, sizeof(stline), batpath);
if (stlen > 0)
- batt_current = atoi(stline);
+ batt_power = atoi(stline);
strcpy(&batpath[batpathlen], "/voltage_now");
stlen = fileRead(stline, sizeof(stline), batpath);
strcpy(&batpath[batpathlen], "/voltage_now");
stlen = fileRead(stline, sizeof(stline), batpath);
fputs("^fg(green)", stdout);
}
fputs("^fg(green)", stdout);
}
+ batt_current = ((float)batt_power * 100) / ((float)batt_voltage / 100000);
batt_time = (float)batt_now / (float)batt_current;
batt_time = (float)batt_now / (float)batt_current;
- batt_watts = ((float)batt_voltage / 1000000) * ((float)batt_current / 10000000);
+ batt_watts = ((float)batt_power / 1000000);
if (batt_watts == 0) // fully charged and not in use
printf(" %s: %d%% _ _ ", batname, batt_percent);
if (batt_watts == 0) // fully charged and not in use
printf(" %s: %d%% _ _ ", batname, batt_percent);
//fputs("^fg(red)", stdout);
return;
}
//fputs("^fg(red)", stdout);
return;
}
}
strcpy(&ifpath[ifpathlen], "/statistics/rx_bytes");
}
strcpy(&ifpath[ifpathlen], "/statistics/rx_bytes");
#include "statuses/battery.h"
#include "statuses/cpuusage.h"
#include "statuses/datetime.h"
#include "statuses/battery.h"
#include "statuses/cpuusage.h"
#include "statuses/datetime.h"
+#include "statuses/fan.h"
#include "statuses/memusage.h"
#include "statuses/netif.h"
#include "statuses/volume_alsa.h"
#include "statuses/memusage.h"
#include "statuses/netif.h"
#include "statuses/volume_alsa.h"
status_cpuusage();
status_battery("BAT0");
status_cpuusage();
status_battery("BAT0");
+ status_battery("BAT1");
status_memusage();
status_netif("eth0");
status_memusage();
status_netif("eth0");
+ //status_netif("eth1");
+ //status_netif("eth2");
+ //status_netif("wlan1");
+ //status_netif("usb0");
- status_temp("GPU: ", "/sys/class/hwmon/hwmon0/device/temp4_input");
- status_temp("CPU: ", "/sys/class/hwmon/hwmon0/device/temp2_input");
+ //status_temp("GPU: ", "/sys/class/hwmon/hwmon0/device/temp4_input");
+ //status_temp("CPU: ", "/sys/class/hwmon/hwmon0/device/temp2_input");
+ status_temp("CPU: ", "/sys/class/hwmon/hwmon1/device/temp1_input");
+
+ status_fan("Fan: ", "/sys/class/hwmon/hwmon2/device/fan1_input");
status_volume_alsa("default", "Master", 0);
status_volume_alsa("default", "Master", 0);