X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x2%2Fsrc%2Fawk%2Fexe%2Fbar.awk;h=0e81833bf07f388875045fa6ce1da67259c192bc;hb=fcc91548b828f5f4dcbaebe64c18cc6bb1df5a88;hp=97b520210e25e3e4b54e48247aa0e6904905eb50;hpb=887d3829ad6f00ac46bd3c861ba64dc56675022e;p=khatus.git

diff --git a/x2/src/awk/exe/bar.awk b/x2/src/awk/exe/bar.awk
index 97b5202..0e81833 100644
--- a/x2/src/awk/exe/bar.awk
+++ b/x2/src/awk/exe/bar.awk
@@ -152,17 +152,19 @@ function bar_make_status_disk_io_r(    src) {
 # Network
 # -----------------------------------------------------------------------------
 
-function bar_make_status_net_iface_status(interface,    addr) {
-    cache_get(addr, "khatus_sensor_net_addr_io", "addr" Kfs interface, 5)
-    if (!addr["is_expired"] && addr["value"])
-        return "up"
+function bar_make_status_net_iface_status(interface,    is_plugged_in) {
+    # TODO: Integrate connection/address status into the symbol somehow.
+    cache_get(is_plugged_in, "khatus_sensor_net_carrier", interface, 5)
+    if (!is_plugged_in["is_expired"] && is_plugged_in["value"])
+        return "<>"
     else
         return "--"
 }
 
 function bar_make_status_net_addr(interface,    src) {
     src = "khatus_sensor_net_addr_io"
-    return cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s", "")
+    addr = cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s")
+    return addr ? addr : "--"
 }
 
 function bar_make_status_net_io_w(interface,    src) {
@@ -180,6 +182,14 @@ function bar_make_status_net_wifi(interface,    src) {
     return cache_get_fmt_def(src, "status" Kfs interface, 10, "%s")
 }
 
+function bar_make_status_net_wifi_link(interface,    link) {
+    cache_get_fmt_def(link, "khatus_sensor_net_wifi_status", "link" Kfs interface, 10)
+    if (!link["is_expired"] && link["value"])
+        return sprintf("%d%%", link["value"])
+    else
+        return "--"
+}
+
 # -----------------------------------------------------------------------------
 # Bluetooth
 # -----------------------------------------------------------------------------