From 4219cd2d43bb4a2a8de0366154b7ba8d4ecee7f9 Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Mon, 18 Jul 2022 19:55:30 +0300 Subject: [PATCH 1/2] Add JXF23 to init script for Hi3516CV200 --- .../hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon index 788d559e..6553e6d1 100755 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon @@ -89,7 +89,7 @@ insert_isp() { insert_sns() { case $SENSOR in - 9m034 | jxf22 | ov2718 | ov9732 | ov9750 | ov9752 | jxh62 | sc1235 | sc2235) + 9m034 | jxf22 | jxf23 | ov2718 | ov9732 | ov9750 | ov9752 | jxh62 | sc1235 | sc2235) devmem 0x200f0040 32 0x2 # I2C0_SCL devmem 0x200f0044 32 0x2 # I2C0_SDA From 48e5d4cac36143cbb58f527644f9ad00836bb8ad Mon Sep 17 00:00:00 2001 From: cronyx Date: Tue, 19 Jul 2022 23:10:41 +0300 Subject: [PATCH 2/2] rewrite config read, added guard_interval and ldpc --- general/package/wifibroadcast/files/S98wfb | 26 ++++++-------------- general/package/wifibroadcast/files/wfb.conf | 4 ++- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/general/package/wifibroadcast/files/S98wfb b/general/package/wifibroadcast/files/S98wfb index 22f963e9..a3a3b8aa 100755 --- a/general/package/wifibroadcast/files/S98wfb +++ b/general/package/wifibroadcast/files/S98wfb @@ -3,19 +3,9 @@ # Start wifibroadcast # -config="/etc/wfb.conf" -keydir="/etc" +. /etc/wfb.conf -wlan=`cat ${config} | grep wlan | cut -f 2 -d '='` -region=`cat ${config} | grep region | cut -f 2 -d '='` -channel=`cat ${config} | grep channel | cut -f 2 -d '='` -bandwidth=`cat ${config} | grep bandwidth | cut -f 2 -d '='` -stbc=`cat ${config} | grep stbc | cut -f 2 -d '='` -mcs_index=`cat ${config} | grep mcs_index | cut -f 2 -d '='` -udp_port=`cat ${config} | grep udp_port | cut -f 2 -d '='` -radio_port=`cat ${config} | grep radio_port | cut -f 2 -d '='` -rs_k=`cat ${config} | grep rs_k | cut -f 2 -d '='` -rs_n=`cat ${config} | grep rs_n | cut -f 2 -d '='` +keydir="/etc" load_rtl() { modprobe cfg80211 @@ -31,10 +21,10 @@ load_ath() { load_interface() { - if cat ${config} | grep "rtl" > /dev/null 2>&1; then + if [ ${driver} = "rtl" ]; then ifconfig ${wlan} up iwconfig ${wlan} mode monitor - elif cat ${config} | grep "ath" > /dev/null 2>&1; then + elif [ ${driver} = "ath" ]; then iwconfig ${wlan} mode monitor ifconfig ${wlan} up fi @@ -44,20 +34,20 @@ load_interface() { } start_wfb() { - wfb_tx -p ${radio_port} -u ${udp_port} -K ${keydir}/drone.key -B ${bandwidth} -M ${mcs_index} -S ${stbc} -k ${rs_k} -n ${rs_n} ${wlan} & + wfb_tx -p ${radio_port} -u ${udp_port} -K ${keydir}/drone.key -B ${bandwidth} -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${rs_k} -n ${rs_n} ${wlan} & } case "$1" in start) - if grep -q daemon=1 ${config}; then + if [ ${daemon} -eq 1 ]; then echo "Loading modules for selected driver..." - if cat ${config} | grep "rtl"; then + if [ ${driver} = "rtl" ]; then if ! lsmod | grep "88XXau"; then load_rtl fi - elif cat ${config} | grep "ath"; then + elif ${driver} = "ath" ]; then if ! lsmod | grep "ath9k_htc"; then load_ath fi diff --git a/general/package/wifibroadcast/files/wfb.conf b/general/package/wifibroadcast/files/wfb.conf index b4ac0c38..c0194902 100644 --- a/general/package/wifibroadcast/files/wfb.conf +++ b/general/package/wifibroadcast/files/wfb.conf @@ -4,9 +4,11 @@ wlan=wlan0 region=BO channel=14 bandwidth=20 -stbc=1 +stbc=0 +ldpc=0 mcs_index=1 radio_port=3 udp_port=5600 rs_k=8 rs_n=12 +guard_interval=long