Shift X2 status from legacy to archived

[khatus.git] / x4 / sanity_check

diff --git a/x4/sanity_check b/x4/sanity_check
index 61e28ec..ea8837a 100755 (executable)
--- a/x4/sanity_check
+++ b/x4/sanity_check
@@ -12,18 +12,20 @@ sensors_kill_all() {
         kill -9 $(cat $pid_file) || true
         rm $pid_file
     done
-    pkill khatus_x4_sensor || true
+    pkill khatus_x4 || true
 }
 
 sensors_fork_all() {
-    ./bin/khatus_x4_sensor_datetime  -i 1 &
-    ./bin/khatus_x4_sensor_bluetooth -i 1 &
-    ./bin/khatus_x4_sensor_mpd       -i 1 &
-    ./bin/khatus_x4_sensor_energy    -i 1 &
-    ./bin/khatus_x4_sensor_memory    -i 1 &
-    ./bin/khatus_x4_sensor_loadavg   -i 1 &
-    ./bin/khatus_x4_sensor_temp      -i 1 -- -z 0 &
-    ./bin/khatus_x4_sensor_disk      -i 1 -- -f / &
+    ./bin/khatus_x4_sensor_datetime  -d -i 1
+    ./bin/khatus_x4_sensor_bluetooth -d -i 1
+    ./bin/khatus_x4_sensor_mpd       -d -i 1
+    ./bin/khatus_x4_sensor_energy    -d
+    ./bin/khatus_x4_sensor_energy_poller -d -i 1
+    ./bin/khatus_x4_sensor_memory    -d -i 1
+    ./bin/khatus_x4_sensor_loadavg   -d -i 1
+    ./bin/khatus_x4_sensor_temp      -d -i 1 -- -z 0
+    ./bin/khatus_x4_sensor_disk      -d -i 1 -- -f /
+    ./bin/khatus_x4_sensor_volume    -d -i 1
 }
 
 sensor_read_one() {
@@ -39,7 +41,9 @@ sensors_read_all() {
     while :
     do
         battery_state="$(sensor_read_one ${dir}/khatus_x4_sensor_energy/out/battery_state)"
+        battery_state_poll="$(sensor_read_one ${dir}/khatus_x4_sensor_energy_poller/out/battery_state)"
         battery_percentage="$(sensor_read_one ${dir}/khatus_x4_sensor_energy/out/battery_percentage)"
+        battery_percentage_poll="$(sensor_read_one ${dir}/khatus_x4_sensor_energy_poller/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)"
@@ -48,7 +52,11 @@ sensors_read_all() {
         load="$(sensor_read_one ${dir}/khatus_x4_sensor_loadavg/out/load_avg_1min)"
         temp="$(sensor_read_one ${dir}/khatus_x4_sensor_temp/out/thermal_zone0)"
         disk="$(sensor_read_one ${dir}/khatus_x4_sensor_disk/out/disk_usage_percentage)"
-        echo "E[${battery_state} ${battery_percentage}] M:${mem}% L:${load} T:${temp}°C D:${disk}% [${mpd}] [$bluetooth_controllers $bluetooth_devices] ${datetime}"
+        vol_left="$(sensor_read_one ${dir}/khatus_x4_sensor_volume/out/vol_left)"
+        vol_right="$(sensor_read_one ${dir}/khatus_x4_sensor_volume/out/vol_right)"
+        vol_state="$(sensor_read_one ${dir}/khatus_x4_sensor_volume/out/state)"
+        vol_mute="$(sensor_read_one ${dir}/khatus_x4_sensor_volume/out/mute)"
+        echo "E[${battery_state} ${battery_percentage} | ${battery_state} ${battery_percentage_poll}] M:${mem}% L:${load} T:${temp}°C D:${disk}% [${mpd}] B:${bluetooth_controllers}:${bluetooth_devices} V:${vol_state}:${vol_left}:${vol_right}:${vol_mute} ${datetime}"
         sleep 1
     done
 }