Revert "non telegraf version also needs python" (#137)

* Revert "non telegraf version also needs python"

This reverts commit 7f820d0.

red herring, the stats.py script is no longer used for autogain script

* fix autogain for dump978 RSSI value output > 0

autogain script is ignoring rssi values > 0, fix that

this was making autogain very slow to adjust if all received signals
were very strong and only a couple were < 0

* make it a bit easier to see which autogain script is used

Dockerfile

@@ -39,7 +39,7 @@ RUN set -x && \
     TEMP_PACKAGES+=(curl) && \
     # Required for nicer logging.
     KEPT_PACKAGES+=(gawk) && \
-    KEPT_PACKAGES+=(python3) && \
+    ##telegraf##KEPT_PACKAGES+=(python3) && \
     # uat2esnt dependencies (+ telegraf)
     KEPT_PACKAGES+=(socat) && \
     # healthcheck dependencies

rootfs/etc/s6-overlay/scripts/autogain

@@ -35,7 +35,7 @@ function collect_gain_values() {
     local rssi
     local endtime
     local cutoff="${2:--3.5}"
-    cutoff="$(bc -l <<< "scale=0; ${cutoff/#-} * 10 / 1")"
+    cutoff="$(bc -l <<< "scale=0; ${cutoff} * 10 / 1")"
     unset GAIN_COLLECTION
 
     if [[ -z "$1" ]]; then
@@ -57,15 +57,15 @@ function collect_gain_values() {
     # create a FD with a data stream of rssi values
     if chk_enabled "$READSB_AUTOGAIN_USE_RAW"; then
         # parse all messages that have an ";rssi=-xx.xx" element, regardless of any error indicators 
-        while ! exec 3< <(stdbuf -oL sed -n 's|^.*;rssi=-\([0-9]\+\)\.\([0-9]*\);.*$|\1\2|p' </dev/tcp/localhost/30978 2>/dev/null) 2>/dev/null; do
+        while ! exec 3< <(stdbuf -oL sed -n 's|^.*;rssi=\([0-9-]\+\)\.\([0-9]*\);.*$|\1\2|p' </dev/tcp/localhost/30978 2>/dev/null) 2>/dev/null; do
             sleep 5
             exec 3>&-
         done
     else
         # ignore messages that have anything between the raw message string and ";rssi="
         # These messages have an error code ";ts=x" between the raw msg and the rssi element
         # In that case, we're only considering "accepted" messages
-        while ! exec 3< <(stdbuf -oL sed -n 's|^-[0-9a-f]*;rssi=-\([0-9]\+\)\.\([0-9]*\);.*$|\1\2|p' </dev/tcp/localhost/30978 2>/dev/null) 2>/dev/null; do
+        while ! exec 3< <(stdbuf -oL sed -n 's|^-[0-9a-f]*;rssi=\([0-9-]\+\)\.\([0-9]*\);.*$|\1\2|p' </dev/tcp/localhost/30978 2>/dev/null) 2>/dev/null; do
             sleep 5
             exec 3>&-
         done
@@ -76,8 +76,8 @@ function collect_gain_values() {
     starttime="$(date +%s)"
     while IFS= read -r rssi <&3; do
         (( total_msg++ )) || true
-        (( ${rssi##0} < cutoff )) && (( strong_msg++ )) || true
-        # read messages until we have least READSB_AUTOGAIN_MIN_SAMPLES, and the max time is exhausted
+        (( ${rssi##0} > cutoff )) && (( strong_msg++ )) || true
+s6wrap --quiet --timestamps --prepend autogain echo "sample count: $total_msg"
         # in other words - even if the max time expires, continue collecting messages until at least the minimum has been reached
         if (( total_msg >= READSB_AUTOGAIN_MIN_SAMPLES )) && (( $(date +%s) > starttime + $1 )); then
             break

rootfs/scripts/autogain.sh

@@ -1,6 +1,8 @@
 #!/command/with-contenv bash
 # shellcheck shell=bash
 
+# !!! DEPRECATED !!!
+
 # If troubleshooting:
 if [[ -n "$DEBUG_LOGGING" ]]; then
     set -x

rootfs/usr/local/bin/autogain978

@@ -3,6 +3,9 @@
 
 # This script is only for dump978 autogain
 
+# called by /etc/s6-overlay/scripts/autogain
+# or called manually by the user to reset autogain
+
 source /scripts/common
 
 READSB_AUTOGAIN_LOW_PCT="${DUMP978_AUTOGAIN_LOW_PCT:-${READSB_AUTOGAIN_LOW_PCT:-5.0}}"
@@ -148,4 +151,4 @@ s6-svc -r /run/service/stats 2>/dev/null || true
 
 #reset numbers
 echo 0 > $autogain_dir/strong
-echo 0 > $autogain_dir/total
+echo 0 > $autogain_dir/total