From ca7a2b615f0a77c47a184a1d668dc1079133f004 Mon Sep 17 00:00:00 2001
From: Karl <karl@k-world.me.uk>
Date: Tue, 22 Jul 2025 08:42:22 +0100
Subject: [PATCH] new wifi

---
 kiosk_skeleton/build.sh           |  1 +
 kiosk_skeleton/usr/bin/kiosk-wifi | 50 ++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index edd4334..7d2e76d 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -5,6 +5,7 @@ apt update
 DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot wireless-regdb fontconfig php-cli
 
 rsync -a --chown=root:root "/kiosk_skeleton/." "/"
+chmod +x /usr/bin/kiosk-* /usr/bin/get-ini /usr/bin/refresh-screen /usr/bin/schedule-* /usr/bin/setup-refresh-timer
 
 # Add emoji support
 mkdir -p /home/pi/.fonts
diff --git a/kiosk_skeleton/usr/bin/kiosk-wifi b/kiosk_skeleton/usr/bin/kiosk-wifi
index 03fac28..6182620 100755
--- a/kiosk_skeleton/usr/bin/kiosk-wifi
+++ b/kiosk_skeleton/usr/bin/kiosk-wifi
@@ -1,25 +1,41 @@
 #!/bin/bash
+# Redirect all output to a log file for debugging
+exec &> /var/log/kiosk-wifi.log
+set -ex
 
-echo "Configuring WiFi..."
+echo "--- Kiosk WiFi Configuration Starting ---"
+date
 
+echo "Reading configuration from /boot/kioskbrowser.ini..."
 WIFI_SSID=$(get-ini /boot/kioskbrowser.ini wifi ssid)
 WIFI_PSK=$(get-ini /boot/kioskbrowser.ini wifi psk)
-WIFI_COUNTRY=$(get-ini /boot/kioskbrowser.ini wifi country)
 
-if [ -n "${WIFI_COUNTRY}" ]; then
-    echo "Setting WiFi country to ${WIFI_COUNTRY}"
-    nmcli general reload conf-only
+if [ -z "${WIFI_SSID}" ]; then
+    echo "No WiFi SSID configured. Exiting."
+    exit 0
 fi
 
-if [ -n "${WIFI_SSID}" ]; then
-    echo "Connecting to WiFi network: ${WIFI_SSID}"
-    nmcli device wifi connect "${WIFI_SSID}" password "${WIFI_PSK}"
-    if [ $? -eq 0 ]; then
-        echo "Successfully connected to ${WIFI_SSID}"
-    else
-        echo "Failed to connect to ${WIFI_SSID}"
-        exit 1
-    fi
-else
-    echo "No WiFi SSID configured. Skipping connection."
-fi
+echo "Configuration found: SSID='${WIFI_SSID}'"
+
+echo "Waiting for WiFi adapter to be ready..."
+sleep 5
+
+echo "Checking radio status..."
+nmcli radio all
+
+echo "Ensuring WiFi radio is on..."
+nmcli radio wifi on
+
+echo "Checking device status..."
+nmcli device status
+
+echo "Attempting to connect to WiFi network..."
+nmcli device wifi connect "${WIFI_SSID}" password "${WIFI_PSK}"
+
+echo "Waiting a few seconds for connection to establish..."
+sleep 10
+
+echo "Final connection status:"
+nmcli connection show
+
+echo "--- Kiosk WiFi Configuration Finished ---"