From f5ab497bff58d37cc0266e693e5d01a6db4e734f Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Thu, 21 Apr 2022 23:32:42 +0200
Subject: [PATCH] tasmota-charge: fixes

---
 bundles/tasmota-charge/README.md            |  8 +++++---
 bundles/tasmota-charge/files/tasmota-charge | 18 ++++++++++++++----
 nodes/home.server.py                        |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/bundles/tasmota-charge/README.md b/bundles/tasmota-charge/README.md
index 476d264..4237d23 100644
--- a/bundles/tasmota-charge/README.md
+++ b/bundles/tasmota-charge/README.md
@@ -1,14 +1,16 @@
 # Phone
 
-- install termux from Play Store
-- install termux::api from Play Store
+- install termux from F-Droid
+- install termux::api from F-Droid
 - open termux
+- run `pkg update`
 - run `pkg install termux-api openssh`
 - run `passwd` and set a password
 - run `whoami` to get the username
 - run `sshd` to start ssh server
+- run `su - tasmota-charge -c 'ssh-copy-id -p 8022 u0_a233@10.0.0.175'` on server node
 - acquire wakelock for the termux session in notifications
 
 # Server
 
-- you can run something like `su - tasmota-charge -c 'ssh-copy-id -p 8022 u0_q194@10.0.0.166'`
+- you can run something like `su - tasmota-charge -c 'ssh -p 8022 u0_a233@10.0.0.175'`
diff --git a/bundles/tasmota-charge/files/tasmota-charge b/bundles/tasmota-charge/files/tasmota-charge
index 80ac589..9b07efa 100644
--- a/bundles/tasmota-charge/files/tasmota-charge
+++ b/bundles/tasmota-charge/files/tasmota-charge
@@ -6,16 +6,26 @@ PLUG_IP=${plug_ip}
 MIN=${min}
 MAX=${max}
 
-AKKU=$(ssh -p 8022 $PHONE_USER@$PHONE_IP termux-battery-status | jq -r .percentage)
-echo "akku is at $AKKU%"
+if ! ssh -o 'StrictHostKeyChecking no' -p 8022 $PHONE_USER@$PHONE_IP 'true'
+then
+  echo "ERROR: cant connect to phone via ssh"
+  exit 51
+fi
+AKKU=$(ssh -o 'StrictHostKeyChecking no' -p 8022 $PHONE_USER@$PHONE_IP termux-battery-status | jq -r .percentage)
+echo "akku is at $AKKU% ($MIN%/$MAX%)"
 
+if ! curl --head --silent --fail "http://$PLUG_IP/cm?cmnd=Power" --output /dev/null
+then
+  echo "ERROR: cant connect to plug via http"
+  exit 52
+fi
 PLUG_IS=$(curl -s "http://$PLUG_IP/cm?cmnd=Power" | jq -r .POWER)
 echo "plug is $PLUG_IS"
 
-if [[ $AKKU < $MIN ]] && [[ $PLUG_IS = OFF ]]
+if [[ $AKKU -lt $MIN ]] && [[ $PLUG_IS = OFF ]]
 then
   TURN_PLUG=ON
-elif [[ $AKKU > $MAX ]] && [[ $PLUG_IS = ON ]]
+elif [[ $AKKU -gt $MAX ]] && [[ $PLUG_IS = ON ]]
 then
   TURN_PLUG=OFF
 else
diff --git a/nodes/home.server.py b/nodes/home.server.py
index d22c33f..70d7a2d 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -105,8 +105,8 @@
         },
         'tasmota-charge': {
             'phone': {
-                'ip': '10.0.0.166',
-                'user': 'u0_q194',
+                'ip': '10.0.0.175',
+                'user': 'u0_a233',
                 'password': 'november',
             },
             'plug': {