From 50e9bbff31b6c189c753a603d05a5950498b096a Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Sun, 15 Jan 2023 23:41:13 +0300
Subject: [PATCH] [wfb] autdetect wifi card

---
 general/package/wifibroadcast/files/S98wfb    | 77 ++++++++++++-------
 .../wifibroadcast/files/telemetry.conf        |  2 +-
 general/package/wifibroadcast/files/tweaksys  |  2 +-
 general/package/wifibroadcast/files/wfb.conf  |  1 -
 4 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/general/package/wifibroadcast/files/S98wfb b/general/package/wifibroadcast/files/S98wfb
index 986faeb1..a5cbb62b 100755
--- a/general/package/wifibroadcast/files/S98wfb
+++ b/general/package/wifibroadcast/files/S98wfb
@@ -8,25 +8,62 @@
 keydir="/etc"
 chip=$(ipcinfo -c)
 
-load_rtl() {
-  modprobe cfg80211
-  modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
-  sleep 3
+driver=""
+
+detect_wifi_card() {
+  echo "Detecting wifi card vendor..."
+  devices=$(lsusb | cut -d ' ' -f6 | sort | uniq)
+  for card in ${devices}
+	do
+	  case "${card}" in
+	  "0bda:8812" | "0bda:881a")
+		driver="realtek"
+		modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
+	  ;;
+	  "0cf3:9271")
+		driver="atheros"
+		modprobe mac80211
+		modprobe ath9k_htc
+	  ;;
+      "148f:3070")
+        driver="ralink"
+		modprobe rt2800usb
+		modprobe rt2x00usb
+      ;;
+	esac
+  done
+
+  if [ -z "${driver}" ]; then
+	echo "No usb wifi card detected. Check wifi stick connection, usb power or possible bad soldering."
+	exit
+  else
+	echo "Detected:" ${driver}
+  fi
+
+  echo "Awaiting interface ${wlan} in system..."
+
+  local n=0
+  while ! $(ifconfig -a | grep -q ${wlan})
+  do
+	if [ ${n} -ge 5 ]; then
+	  echo "No interface ${wlan}. Check wifi stick connection, usb power or possible bad soldering."
+	  exit
+	fi
+	sleep 0.5
+	n=$(expr ${n} + 1)
+  done
 }
 
-load_ath() {
+load_modules() {
   modprobe cfg80211
-  modprobe mac80211
-  modprobe ath9k_htc
-  sleep 3
+  detect_wifi_card
 }
 
 load_interface() {
-
-  if [ ${driver} = "rtl" ]; then
+  if [ ${driver} = "realtek" ]; then
 	  ifconfig ${wlan} up
 	  iwconfig ${wlan} mode monitor
-  elif [ ${driver} = "ath" ]; then
+  elif [ ${driver} = "atheros" ] | [ ${driver} = "ralink" ]; then
 	  iwconfig ${wlan} mode monitor
 	  ifconfig ${wlan} up
   fi
@@ -49,31 +86,19 @@ case "$1" in
 
     if [ ${daemon} -eq 1 ]; then
 
-	  echo "Loading modules for selected driver..."
+	  echo "Loading modules and wifi card driver..."
 
-	  if [ ${driver} = "rtl"  ]; then
-		if ! lsmod | grep "88XXau"; then
-		  load_rtl
-		fi
-	  elif [ ${driver} = "ath" ]; then
-		if ! lsmod | grep "ath9k_htc"; then
-          load_ath
-		fi
-	  fi
+	  load_modules
 
-	  echo "Done."
 	  echo "Preparing interface wlan..."
 	  
 	  load_interface
 	  
-	  echo "Done."
-
 	  if ! cat ${keydir}/drone.key > /dev/null 2>&1; then
 		echo "Generating drone & ground station keys..."
 		cd ${keydir} ; wfb_keygen
-		echo "Done."
 	  else
-		echo "Drone key exist... Done."
+		echo "Drone key exist..."
 	  fi
 
 	  echo "Starting Wifibroadcast service..."
diff --git a/general/package/wifibroadcast/files/telemetry.conf b/general/package/wifibroadcast/files/telemetry.conf
index 7ecc519b..648d812d 100644
--- a/general/package/wifibroadcast/files/telemetry.conf
+++ b/general/package/wifibroadcast/files/telemetry.conf
@@ -1,6 +1,6 @@
 serial=/dev/ttyAMA0
-baud=115200
 wlan=wlan0
+baud=115200
 bandwidth=20
 stbc=1
 ldpc=1
diff --git a/general/package/wifibroadcast/files/tweaksys b/general/package/wifibroadcast/files/tweaksys
index 95d5c0bb..78e78950 100755
--- a/general/package/wifibroadcast/files/tweaksys
+++ b/general/package/wifibroadcast/files/tweaksys
@@ -37,7 +37,7 @@ all_other() {
   ${cli} -s .video0.bitrate 5120
   ${cli} -s .video0.codec h264
   ${cli} -s .video0.rcMode cbr
-  ${cli} -s .video0.gopSize 0
+  ${cli} -s .video0.gopSize 0.2
   ${cli} -s .hls.enabled false
   ${cli} -s .netip.enabled false
   ${cli} -s .jpeg.enabled false
diff --git a/general/package/wifibroadcast/files/wfb.conf b/general/package/wifibroadcast/files/wfb.conf
index 7a4f05b8..cee4b487 100644
--- a/general/package/wifibroadcast/files/wfb.conf
+++ b/general/package/wifibroadcast/files/wfb.conf
@@ -1,5 +1,4 @@
 daemon=1
-driver=rtl
 wlan=wlan0
 region=BO
 channel=14