X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x4%2Fsanity_check;h=62a23eab2342ebc7c189e1604e0d9574fc87de35;hb=753f5ea7a8ab4abac3f0eae09a6311d2484c453b;hp=036d4b99bcabf475329154c008f0ecd0dc0d9c39;hpb=7c4d20a90d6b9ec4f3b11bdbc9d3930180b2b11e;p=khatus.git

diff --git a/x4/sanity_check b/x4/sanity_check
index 036d4b9..62a23ea 100755
--- a/x4/sanity_check
+++ b/x4/sanity_check
@@ -6,16 +6,25 @@ set -e
 
 dir="${prefix}/${host}"
 
-kill_all() {
+sensors_kill_all() {
     for pid_file in $(find $dir -type f -name pid)
     do
         kill -9 $(cat $pid_file) || true
         rm $pid_file
     done
-    pkill khatus_x4
+    pkill khatus_x4_sensor || true
 }
 
-read_sensor() {
+sensors_fork_all() {
+    ./bin/khatus_x4_sensor_datetime &
+    ./bin/khatus_x4_sensor_bluetooth&
+    ./bin/khatus_x4_sensor_mpd      &
+    ./bin/khatus_x4_sensor_energy   &
+    ./bin/khatus_x4_sensor_memory   &
+    ./bin/khatus_x4_sensor_loadavg  &
+}
+
+sensor_read_one() {
     if test -f "$1"
     then
         cat "$1"
@@ -24,18 +33,26 @@ read_sensor() {
     fi
 }
 
-kill_all
-
-./bin/khatus_x4_sensor_datetime &
-./bin/khatus_x4_sensor_mpd      &
-./bin/khatus_x4_sensor_energy   &
-
-while :
-do
-    battery_state="$(read_sensor ${dir}/khatus_x4_sensor_energy/out/battery_state)"
-    battery_percentage="$(read_sensor ${dir}/khatus_x4_sensor_energy/out/battery_percentage)"
-    datetime="$(read_sensor ${dir}/khatus_x4_sensor_datetime/out/datetime)"
-    mpd="$(read_sensor ${dir}/khatus_x4_sensor_mpd/out/status)"
-    echo "E[${battery_state} ${battery_percentage}] [${mpd}] ${datetime}"
-    sleep 1
-done
+sensors_read_all() {
+    while :
+    do
+        battery_state="$(sensor_read_one ${dir}/khatus_x4_sensor_energy/out/battery_state)"
+        battery_percentage="$(sensor_read_one ${dir}/khatus_x4_sensor_energy/out/battery_percentage)"
+        bluetooth_controllers="$(sensor_read_one ${dir}/khatus_x4_sensor_bluetooth/out/count_powered_controllers)"
+        bluetooth_devices="$(sensor_read_one ${dir}/khatus_x4_sensor_bluetooth/out/count_connected_devices)"
+        datetime="$(sensor_read_one ${dir}/khatus_x4_sensor_datetime/out/datetime)"
+        mpd="$(sensor_read_one ${dir}/khatus_x4_sensor_mpd/out/status)"
+        mem="$(sensor_read_one ${dir}/khatus_x4_sensor_memory/out/percent_used)"
+        load="$(sensor_read_one ${dir}/khatus_x4_sensor_loadavg/out/load_avg_1min)"
+        echo "E[${battery_state} ${battery_percentage}] M:${mem}% L:${load} [${mpd}] [$bluetooth_controllers $bluetooth_devices] ${datetime}"
+        sleep 1
+    done
+}
+
+main() {
+    sensors_kill_all
+    sensors_fork_all
+    sensors_read_all
+}
+
+main