Pass ttl explicitly

[khatus.git] / bin / khatus_bar

diff --git a/bin/khatus_bar b/bin/khatus_bar
index e2e505c..d62f5d5 100755 (executable)
--- a/bin/khatus_bar
+++ b/bin/khatus_bar
@@ -23,9 +23,6 @@ $2 == "khatus_sensor_datetime" {
     print_msg_ok("status_bar", make_status_bar())
 }
 
-# Let everything else through
-//
-
 # -----------------------------------------------------------------------------
 # Data
 # -----------------------------------------------------------------------------
@@ -50,11 +47,12 @@ function Data_update(    src, key, val, len_line, len_head, len_val, time) {
     }
 }
 
-function Data_get(src, key, age_max,    time, age, is_expired) {
+function Data_get(src, key, ttl,    time, age, is_expired) {
     time = Data_get_time()
     A_time[src, key] = time
     age = time - M_time[src, key]
-    is_expired = age_max && age > age_max
+    # ttl = 0 => forever
+    is_expired = ttl && age > ttl
     return is_expired ? "" : Data[src, key]
 }
 
@@ -117,8 +115,8 @@ function make_status_bar(    position, bar, sep, i, j) {
 }
 
 function make_status_energy(    state, charge, direction_of_change) {
-    state  = Data_get("khatus_sensor_energy", "battery_state")
-    charge = Data_get("khatus_sensor_energy", "battery_percentage")
+    state  = Data_get("khatus_sensor_energy", "battery_state"     , 0)
+    charge = Data_get("khatus_sensor_energy", "battery_percentage", 0)
 
     if (state == "discharging") {
         direction_of_change = "<"