Minor fixes...

[sysstatus.git] / sysstatus.c

diff --git a/sysstatus.c b/sysstatus.c
index bbdb2feebbc40069d0f634c5a353cc549f7951e8..cac8333056b29a66689ccc0c2a0a6fc674c0cb64 100644 (file)
--- a/sysstatus.c
+++ b/sysstatus.c
@@ -1,16 +1,15 @@
 #include <stdio.h>
-#include <fcntl.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include "statuses/uptime.h"
-#include "statuses/memusage.h"
+#include "config.h"
+#include "statuses/battery.h"
 #include "statuses/cpuusage.h"
-#include "statuses/netif_named.h"
-#include "statuses/power.h"
+#include "statuses/datetime.h"
+#include "statuses/memusage.h"
+#include "statuses/netif.h"
 #include "statuses/volume_alsa.h"
 #include "statuses/temp.h"
-#include "statuses/datetime.h"
-#include "config.h"
+#include "statuses/uptime.h"
+
 
 void updatestatus()
 {
@@ -18,15 +17,15 @@ void updatestatus()
 
        status_cpuusage();
 
-       status_power();
+       status_battery("BAT0");
 
        status_memusage();
 
-       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("wlan0");
+       status_netif("wlan1");
+       status_netif("ppp0");
 
        status_temp("GPU: ", "/sys/class/hwmon/hwmon0/device/temp4_input");
        status_temp("CPU: ", "/sys/class/hwmon/hwmon0/device/temp2_input");
@@ -43,16 +42,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;