Break up into procedures

[khatus.git] / x4 / sanity_check

diff --git a/x4/sanity_check b/x4/sanity_check
index 8100c2f..7ed1ca0 100755 (executable)
--- a/x4/sanity_check
+++ b/x4/sanity_check
@@ -6,14 +6,22 @@ set -e
 
 dir="${prefix}/${host}"
 
-kill_sensor() {
-    if test -f "$1"
-    then
-        kill $(cat "$1")
-    fi
+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
+}
+
+sensors_fork_all() {
+    ./bin/khatus_x4_sensor_datetime &
+    ./bin/khatus_x4_sensor_mpd      &
+    ./bin/khatus_x4_sensor_energy   &
 }
 
-read_sensor() {
+sensor_read_one() {
     if test -f "$1"
     then
         cat "$1"
@@ -22,20 +30,22 @@ read_sensor() {
     fi
 }
 
-kill_sensor ${dir}/khatus_x4_sensor_datetime/pid
-kill_sensor ${dir}/khatus_x4_sensor_mpd/pid
-kill_sensor ${dir}/khatus_x4_sensor_energy/pid
-
-./bin/khatus_x4_sensor_datetime -d
-./bin/khatus_x4_sensor_mpd -d
-./bin/khatus_x4_sensor_energy -d
-
-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)"
+        datetime="$(sensor_read_one ${dir}/khatus_x4_sensor_datetime/out/datetime)"
+        mpd="$(sensor_read_one ${dir}/khatus_x4_sensor_mpd/out/status)"
+        echo "E[${battery_state} ${battery_percentage}] [${mpd}] ${datetime}"
+        sleep 1
+    done
+}
+
+main() {
+    sensors_kill_all
+    sensors_fork_all
+    sensors_read_all
+}
+
+main