diff --git a/configFiles/balancer.sh b/configFiles/balancer.sh index c4f0fe9..a61d818 100755 --- a/configFiles/balancer.sh +++ b/configFiles/balancer.sh @@ -4,7 +4,9 @@ tag="[BALANCER]" max_retries="10" echo "${tag} Started" -ap_name="$(sh /home/kipr/wombat-os/flashFiles/wallaby_get_serial.sh)-wombat" +serial="$(/home/kipr/wombat-os/flashFiles/wallaby_get_serial.sh)" || exit 1 +[ -n "$serial" ] || { echo "empty Wombat serial" >&2; exit 1; } +ap_name="${serial}-wombat" cleanup() { # Ensure wifi transmitter is turned back on diff --git a/flashFiles/wallaby_get_serial.sh b/flashFiles/wallaby_get_serial.sh index b553666..dae492e 100755 --- a/flashFiles/wallaby_get_serial.sh +++ b/flashFiles/wallaby_get_serial.sh @@ -1,17 +1,7 @@ -#!/bin/bash - -VCMD1='i2cget -y 1 0x50 0x40' -VCMD2='i2cget -y 1 0x50 0x41' -VCMD3='i2cget -y 1 0x50 0x42' -VCMD4='i2cget -y 1 0x50 0x43' - -V1=$(eval $VCMD1) -V2=$(eval $VCMD2) -V3=$(eval $VCMD3) -V4=$(eval $VCMD4) - -printf '%s' "\x$(printf %x ${V1})" | sed 's/^...//' -printf '%s' "\x$(printf %x ${V2})" | sed 's/^...//' -printf '%s' "\x$(printf %x ${V3})" | sed 's/^...//' -printf '%s' "\x$(printf %x ${V4})" | sed 's/^...//' +#!/usr/bin/env bash +set -euo pipefail +for reg in 0x40 0x41 0x42 0x43; do + v=$(i2cget -y 1 0x50 "$reg") + printf '%b' "\\x${v#0x}" +done diff --git a/updateFiles/pkgs/botui.deb b/updateFiles/pkgs/botui.deb index f9c5305..703ecb6 100644 Binary files a/updateFiles/pkgs/botui.deb and b/updateFiles/pkgs/botui.deb differ diff --git a/updateFiles/pkgs/installs/gpiod_1.6.2-1_arm64.deb b/updateFiles/pkgs/installs/gpiod_1.6.2-1_arm64.deb index 11fda45..fa32b11 100644 Binary files a/updateFiles/pkgs/installs/gpiod_1.6.2-1_arm64.deb and b/updateFiles/pkgs/installs/gpiod_1.6.2-1_arm64.deb differ diff --git a/updateFiles/pkgs/installs/libgpiod-dev_1.6.2-1_arm64.deb b/updateFiles/pkgs/installs/libgpiod-dev_1.6.2-1_arm64.deb index 672748b..a95040d 100644 Binary files a/updateFiles/pkgs/installs/libgpiod-dev_1.6.2-1_arm64.deb and b/updateFiles/pkgs/installs/libgpiod-dev_1.6.2-1_arm64.deb differ diff --git a/updateFiles/pkgs/installs/libgpiod2_1.6.2-1_arm64.deb b/updateFiles/pkgs/installs/libgpiod2_1.6.2-1_arm64.deb index 34797c4..1aa8609 100644 Binary files a/updateFiles/pkgs/installs/libgpiod2_1.6.2-1_arm64.deb and b/updateFiles/pkgs/installs/libgpiod2_1.6.2-1_arm64.deb differ diff --git a/updateFiles/pkgs/installs/udhcpd_arm64.deb b/updateFiles/pkgs/installs/udhcpd_arm64.deb index bf1cdd4..8d2c6f6 100644 Binary files a/updateFiles/pkgs/installs/udhcpd_arm64.deb and b/updateFiles/pkgs/installs/udhcpd_arm64.deb differ diff --git a/updateFiles/pkgs/kipr.deb b/updateFiles/pkgs/kipr.deb index 1424fc4..57dae8c 100644 Binary files a/updateFiles/pkgs/kipr.deb and b/updateFiles/pkgs/kipr.deb differ diff --git a/updateFiles/pkgs/libkar.deb b/updateFiles/pkgs/libkar.deb index c7a9467..d491eea 100644 Binary files a/updateFiles/pkgs/libkar.deb and b/updateFiles/pkgs/libkar.deb differ diff --git a/updateFiles/pkgs/pcompiler.deb b/updateFiles/pkgs/pcompiler.deb index 83893f3..3ffa9d5 100644 Binary files a/updateFiles/pkgs/pcompiler.deb and b/updateFiles/pkgs/pcompiler.deb differ