Clean up battery status, fix wrong time estimate

[sysstatus.git] / sysstatus.c

diff --git a/sysstatus.c b/sysstatus.c
index cac8333056b29a66689ccc0c2a0a6fc674c0cb64..aed988c2fba5c6c91f7a4a33e828b6d66eea0f99 100644 (file)
--- a/sysstatus.c
+++ b/sysstatus.c
@@ -4,6 +4,7 @@
 #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"
@@ -18,17 +19,24 @@ void updatestatus()
        status_cpuusage();
 
        status_battery("BAT0");
+       status_battery("BAT1");
 
        status_memusage();
 
        status_netif("eth0");
-       status_netif("eth1");
+       //status_netif("eth1");
+       //status_netif("eth2");
        status_netif("wlan0");
-       status_netif("wlan1");
+       //status_netif("wlan1");
+        status_netif("wlan2");
+       //status_netif("usb0");
        status_netif("ppp0");
 
-       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/devices/platform/coretemp.0/temp1_input");
+
+       status_fan("Fan: ", "/sys/devices/platform/thinkpad_hwmon/fan1_input");
 
        status_volume_alsa("default", "Master", 0);