wfb version up, downgrade rtl8812au version by txpower issue (#428)

general/package/rtl8812au-openipc/0001-disable_8814_8821.patch

@@ -1,6 +1,6 @@
---- a/Makefile	2022-01-23 16:37:12.818897741 +0300
+--- a/Makefile	2022-09-01 20:50:34.085515706 +0300
-+++ b/Makefile	2022-01-23 16:37:49.374948068 +0300
++++ b/Makefile	2022-09-01 21:37:32.114576023 +0300
-@@ -22,8 +22,8 @@
+@@ -39,8 +39,8 @@
  
  ########################## WIFI IC ############################
  CONFIG_RTL8812A = y
@@ -10,13 +10,34 @@
 +CONFIG_RTL8814A = n
  ######################### Interface ###########################
  CONFIG_USB_HCI = y
- ########################### Android ###########################
+ ########################## Features ###########################
-@@ -178,7 +178,7 @@
+@@ -206,9 +206,9 @@
- HCI_NAME = usb
+ EXTRA_CFLAGS += -DDBG=0
  endif
  
 -ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
 +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)
  
- EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
+-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\"
++EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
  ifeq ($(CONFIG_USB_HCI), y)
+ USER_MODULE_NAME = 88XXau
+ endif
+@@ -291,7 +291,7 @@
+ 				hal/btc/halbtc8821c2ant.o
+ endif
+ 
+-include $(TopDIR)/hal/phydm/phydm.mk
++include $(src)/hal/phydm/phydm.mk
+ 
+ ########### HAL_RTL8812A_RTL8821A #################################
+ ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n)
+@@ -1523,7 +1523,7 @@
+ 
+ USER_MODULE_NAME ?=
+ ifneq ($(USER_MODULE_NAME),)
+-MODULE_NAME := $(USER_MODULE_NAME)_wfb
++MODULE_NAME := $(USER_MODULE_NAME)
+ endif
+ 
+ ifneq ($(KERNELRELEASE),)

general/package/rtl8812au-openipc/rtl8812au-openipc.mk

@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-RTL8812AU_OPENIPC_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b
+RTL8812AU_OPENIPC_VERSION = 92433c4e9cf37ff67dd69df8ddbb32198ec3c6fd
-RTL8812AU_OPENIPC_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
+RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING
 
-RTL8812AU_OPENIPC_MODULE_MAKE_OPTS = CONFIG_88XXAU=m \
+RTL8812AU_OPENIPC_MODULE_MAKE_OPTS = CONFIG_RTL8812AU=m \
 	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 

general/package/wifibroadcast/0001-makefile.patch

@@ -1,13 +1,14 @@
---- a/Makefile	2022-01-14 15:05:39.292506627 +0300
+--- a/Makefile	2022-09-01 22:07:30.449753541 +0300
-+++ b/Makefile	2022-01-14 21:45:46.027792951 +0300
++++ b/Makefile	2022-09-01 20:42:21.816597209 +0300
-@@ -1,57 +1,25 @@
+@@ -1,58 +1,25 @@
  ARCH ?= $(shell uname -i)
 -PYTHON ?= /usr/bin/python3
 -COMMIT ?= $(shell git rev-parse HEAD)
 -VERSION ?= $(shell $(PYTHON) ./version.py $(shell git show -s --format="%ct" $(shell git rev-parse HEAD)) $(shell git rev-parse --abbrev-ref HEAD))
+-SOURCE_DATE_EPOCH ?= $(shell git show -s --format="%ct" $(shell git rev-parse HEAD))
 +VERSION ?= $(shell git rev-parse HEAD)
  
--export VERSION COMMIT
+-export VERSION COMMIT SOURCE_DATE_EPOCH
 +LDFLAGS := -lrt -lpcap -lsodium
 +CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"'
  
@@ -46,25 +47,25 @@
 -	$(CC) -o $@ $^ $(_LDFLAGS)
 -
 -test:
--	PYTHONPATH=`pwd` trial telemetry.tests
+-	PYTHONPATH=`pwd` trial3 wfb_ng.tests
 -
 -rpm:  all_bin env
 -	rm -rf dist
 -	./env/bin/python ./setup.py bdist_rpm --force-arch $(ARCH)
--	rm -rf wifibroadcast.egg-info/
+-	rm -rf wfb_ng.egg-info/
 -
 -deb:  all_bin env
 -	rm -rf deb_dist
 -	./env/bin/python ./setup.py --command-packages=stdeb.command bdist_deb
--	rm -rf wifibroadcast.egg-info/ wifibroadcast-$(VERSION).tar.gz
+-	rm -rf wfb_ng.egg-info/ wfb-ng-$(VERSION).tar.gz
 -
 -bdist: all_bin
 -	rm -rf dist
 -	$(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH)
--	rm -rf wifibroadcast.egg-info/
+-	rm -rf wfb_ng.egg-info/
 +	$(CC) -o $@ $^ $(LDFLAGS)
  
  clean:
--	rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wifibroadcast.egg-info _trial_temp *~ src/*.o
+-	rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wfb_ng.egg-info wfb-ng-*.tar.gz _trial_temp *~ src/*.o
 -
 +	rm -rf wfb_rx wfb_tx wfb_keygen *~ src/*.o

general/package/wifibroadcast/Makefile

@@ -0,0 +1,25 @@
+ARCH ?= $(shell uname -i)
+VERSION ?= $(shell git rev-parse HEAD)
+
+LDFLAGS := -lrt -lpcap -lsodium
+CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"'
+
+all: wfb_rx wfb_tx wfb_keygen
+
+src/%.o: src/%.c src/*.h
+	$(CC) $(CFLAGS) -std=gnu99 -c -o $@ $<
+
+src/%.o: src/%.cpp src/*.hpp src/*.h
+	$(CXX) $(CFLAGS) -std=gnu++11 -c -o $@ $<
+
+wfb_rx: src/rx.o src/radiotap.o src/fec.o src/wifibroadcast.o
+	$(CXX) -o $@ $^ $(LDFLAGS)
+
+wfb_tx: src/tx.o src/fec.o src/wifibroadcast.o
+	$(CXX) -o $@ $^ $(LDFLAGS)
+
+wfb_keygen: src/keygen.o
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+clean:
+	rm -rf wfb_rx wfb_tx wfb_keygen *~ src/*.o

general/package/wifibroadcast/files/S98wfb

@@ -9,7 +9,7 @@ keydir="/etc"
 
 load_rtl() {
   modprobe cfg80211
-  modprobe 88XXau rtw_monitor_disable_1m=1
+  modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
 }
 
 load_ath() {

general/package/wifibroadcast/files/wfb.conf

@@ -4,6 +4,7 @@ wlan=wlan0
 region=BO
 channel=14
 txpower=20
+driver_txpower_override=30
 bandwidth=20
 stbc=1
 ldpc=1

general/package/wifibroadcast/wifibroadcast.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIFIBROADCAST_VERSION = 51251b8c484b8c4f548aa3bbb1633e0edbb605dc
+WIFIBROADCAST_VERSION = 3ff62387e68f0649899b00a8b8e1a451a04ffb25
 WIFIBROADCAST_SITE = $(call github,svpcom,wifibroadcast,$(WIFIBROADCAST_VERSION))
 WIFIBROADCAST_LICENSE = GPL-2.0