Use /dev/power

1 files changed, 11 insertions, 16 deletions

diff --git a/power_control.sh b/power_control.sh
index 8e995bd..c64a235 100755
--- a/power_control.sh
+++ b/power_control.sh
@@ -32,27 +32,22 @@ clear_all() {
 report() {
         echo "["
         for i in $(seq 1 $NUM_OUTPUTS); do
-                relay_state=$(cat $POWER_PATH/relay$i)
-                if [ $relay_state -eq 1 ]; then
-                        state="true"
-                else
-                        state="false"
-                fi
+                set -- $(cat "/dev/power$i")
+
+                # Convert to JSON booleans
+                state="false"; [ "$1" = "on" ] && state="true"
 
                 echo -e "\t{"
                 echo -e "\t\t\"output\": $i,"
                 echo -e "\t\t\"engaged\": $state,"
-                echo -e "\t\t\"active_power\": $(cat $POWER_PATH/active_pwr$i),"
-                echo -e "\t\t\"energy_sum\": $(cat $POWER_PATH/energy_sum$i),"
-                echo -e "\t\t\"current_rms\": $(cat $POWER_PATH/i_rms$i),"
-                echo -e "\t\t\"voltage_rms\": $(cat $POWER_PATH/v_rms$i),"
-                echo -e "\t\t\"power_factor\": $(cat $POWER_PATH/pf$i)"
+                echo -e "\t\t\"active_power\": $2,"
+                echo -e "\t\t\"energy_sum\": $6),"
+                echo -e "\t\t\"current_rms\": $3,"
+                echo -e "\t\t\"voltage_rms\": $4,"
+                echo -e "\t\t\"power_factor\": $5"
+                echo -en "\t}"
 
-                if [ $i -eq $NUM_OUTPUTS ]; then
-                        echo -e "\t}"
-                else
-                        echo -e "\t},"
-                fi
+                [ $i -eq $NUM_OUTPUTS ] && echo -e ","
         done
         echo "]"
 }