Clean up battery status, fix wrong time estimate

[sysstatus.git] / sysstatus.c

diff --git a/sysstatus.c b/sysstatus.c
index 835f865452c539d226c989867ca2129805a81131..aed988c2fba5c6c91f7a4a33e828b6d66eea0f99 100644 (file)
--- a/sysstatus.c
+++ b/sysstatus.c
@@ -1,22 +1,16 @@
 #include <stdio.h>
-#include <fcntl.h>
 #include <stdlib.h>
-#include <unistd.h>
-//#include <ctype.h>
-//#include <memory.h>
-//#include <stdint.h>
-//#include <sys/socket.h>
-//#include <sys/un.h>
-#include "statuses/uptime.h"
-#include "statuses/memusage.h"
+#include "config.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/netif_named.h"
-#include "statuses/power.h"
 #include "statuses/volume_alsa.h"
 #include "statuses/temp.h"
-#include "statuses/datetime.h"
-#include "config.h"
+#include "statuses/uptime.h"
+
 
 void updatestatus()
 {
@@ -24,19 +18,25 @@ void updatestatus()
 
        status_cpuusage();
 
-       status_power();
+       status_battery("BAT0");
+       status_battery("BAT1");
 
        status_memusage();
 
-       //status_netif();
-       status_netif_named("eth0");
-       status_netif_named("eth1");
-       status_netif_named("wlan0");
-       status_netif_named("wlan1");
-       status_netif_named("ppp0");
+       status_netif("eth0");
+       //status_netif("eth1");
+       //status_netif("eth2");
+       status_netif("wlan0");
+       //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("CPU: ", "/sys/devices/platform/coretemp.0/temp1_input");
 
-       status_temp("GPU: ", "/sys/class/hwmon/hwmon0/device/temp4_input");
-       status_temp("CPU: ", "/sys/class/hwmon/hwmon0/device/temp2_input");
+       status_fan("Fan: ", "/sys/devices/platform/thinkpad_hwmon/fan1_input");
 
        status_volume_alsa("default", "Master", 0);
 
@@ -50,16 +50,14 @@ int main()
 {
        struct timeval tv;
 
-       updatestatus();
-
        for(;;)
        {
+               updatestatus();
+
                tv.tv_sec = UPDATE_SECS;
                tv.tv_usec = 0;
 
                select(0, NULL, NULL, NULL, &tv);
-
-               updatestatus();
        }
 
        return 0;