mirror of https://github.com/OpenIPC/firmware.git
separate configs AIR and GS for datalink/wifibroadcast packages
whoim2
parent
6ac4826b14
commit
c8176a5f8b
|
|
@ -6,19 +6,31 @@
|
|||
DATALINK_VERSION =
|
||||
DATALINK_SITE =
|
||||
DATALINK_LICENSE = GPL-2.0
|
||||
FPATH = air
|
||||
|
||||
ifeq ($(FAMILY),hi3536dv100)
|
||||
ifeq ($(RELEASE),fpv)
|
||||
FPATH = gs
|
||||
endif
|
||||
endif
|
||||
|
||||
$(info $(FAMILY))
|
||||
$(info $(RELEASE))
|
||||
$(info $(FPATH))
|
||||
|
||||
|
||||
define DATALINK_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
|
||||
cp ../general/package/datalink/files/datalink.conf $(TARGET_DIR)/etc
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
|
||||
cp ../general/package/datalink/files/telemetry.conf $(TARGET_DIR)/etc
|
||||
cp ../general/package/datalink/files/$(FPATH)/telemetry.conf $(TARGET_DIR)/etc
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
|
||||
cp ../general/package/datalink/files/S98datalink $(TARGET_DIR)/etc/init.d
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/datalink/files/telemetry $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/datalink/files/$(FPATH)/telemetry $(TARGET_DIR)/usr/bin
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/datalink/files/tweaksys $(TARGET_DIR)/usr/bin
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Start telemetry
|
||||
#
|
||||
|
||||
. /etc/datalink.conf
|
||||
. /etc/telemetry.conf
|
||||
|
||||
keydir="/etc"
|
||||
|
||||
fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2)
|
||||
|
||||
start_telemetry() {
|
||||
if [ ! -f /usr/bin/telemetry_rx -a ! -f /usr/bin/telemetry_tx ]; then
|
||||
ln -s /usr/bin/wfb_rx /usr/bin/telemetry_rx ; chmod +x /usr/bin/telemetry_rx
|
||||
ln -s /usr/bin/wfb_tx /usr/bin/telemetry_tx ; chmod +x /usr/bin/telemetry_tx
|
||||
else
|
||||
if [ ${one_way} = "false" ]; then
|
||||
telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/drone.key -i ${link_id} ${wlan} &
|
||||
fi
|
||||
telemetry_tx -p ${stream_tx} -u ${port_tx} -K ${keydir}/drone.key -B ${bandwidth} -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${fec_k} -n ${fec_n} -T ${fec_timeout} -i ${link_id} ${wlan} &
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo "Loading MAVLink telemetry service..."
|
||||
|
||||
if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
|
||||
/usr/bin/mavlink-routerd &
|
||||
else
|
||||
mavfwd --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
|
||||
fi
|
||||
if [ ${fw} = "fpv" ]; then
|
||||
start_telemetry
|
||||
fi
|
||||
echo "Done."
|
||||
;;
|
||||
stop)
|
||||
echo "Stopping telemetry services..."
|
||||
kill -9 $(pidof telemetry_rx)
|
||||
kill -9 $(pidof telemetry_tx)
|
||||
kill -9 $(pidof mavlink-routerd)
|
||||
kill -9 $(pidof mavfwd)
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop}"
|
||||
exit 1
|
||||
esac
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
serial=/dev/ttyAMA0
|
||||
baud=115200
|
||||
### router: use simple mavfwd (0) or classic mavlink-routerd (1)
|
||||
router=0
|
||||
|
||||
wlan=wlan0
|
||||
bandwidth=20
|
||||
stbc=1
|
||||
ldpc=1
|
||||
mcs_index=1
|
||||
stream_rx=144
|
||||
stream_tx=16
|
||||
link_id=7669206
|
||||
port_rx=14551
|
||||
port_tx=14550
|
||||
fec_k=1
|
||||
fec_n=2
|
||||
fec_timeout=0
|
||||
guard_interval=long
|
||||
one_way=false
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
wlan=wlan0
|
||||
region=BO
|
||||
# By default used channel number, but, you may set freq instead. For ex: 2387M
|
||||
channel=14
|
||||
frequency=
|
||||
txpower=20
|
||||
driver_txpower_override=20
|
||||
bandwidth=20
|
||||
stbc=1
|
||||
ldpc=1
|
||||
mcs_index=1
|
||||
stream=0
|
||||
link_id=7669206
|
||||
udp_port=5600
|
||||
fec_k=8
|
||||
fec_n=12
|
||||
fec_timeout=0
|
||||
guard_interval=long
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Start wifibroadcast
|
||||
#
|
||||
|
||||
. /etc/datalink.conf
|
||||
. /etc/wfb.conf
|
||||
|
||||
keydir="/etc"
|
||||
chip=$(ipcinfo -c)
|
||||
vendor=$(ipcinfo -v)
|
||||
|
||||
driver=""
|
||||
|
||||
set_mcs() {
|
||||
if [ ${vendor} = "ingenic" ]; then
|
||||
mcs=$(ls -l /lib/firmware | grep "htc_9271" | awk {'print $11'} | cut -d "." -f3)
|
||||
else
|
||||
mcs=$(ls -l /lib/firmware/ath9k_htc | grep "htc_9271-1.4.0.fw" | cut -d "." -f6)
|
||||
fi
|
||||
if [ -z "${mcs}" ]; then
|
||||
setmcs ${mcs_index}
|
||||
fi
|
||||
if [ ${mcs_index} -eq 1 ] || [ ${mcs_index} -eq 3 ]; then
|
||||
if [ ! ${mcs_index} -eq ${mcs} ]; then
|
||||
setmcs ${mcs_index}
|
||||
sleep 3
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# "0bda:8813" -> (8814) -> 8814au
|
||||
# "0846:9052" -> (8811) -> 8821au
|
||||
|
||||
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" | "0b05:17d2" | "2357:0101")
|
||||
driver="realtek"
|
||||
modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
|
||||
;;
|
||||
"0cf3:9271" | "040d:3801")
|
||||
driver="atheros"
|
||||
set_mcs
|
||||
modprobe mac80211
|
||||
modprobe ath9k_htc
|
||||
;;
|
||||
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_modules() {
|
||||
modprobe cfg80211
|
||||
detect_wifi_card
|
||||
}
|
||||
|
||||
load_interface() {
|
||||
if [ ${driver} = "realtek" ]; then
|
||||
ifconfig ${wlan} up
|
||||
iwconfig ${wlan} mode monitor
|
||||
elif [ ${driver} = "atheros" ]; then
|
||||
iwconfig ${wlan} mode monitor
|
||||
ifconfig ${wlan} up
|
||||
fi
|
||||
|
||||
iw reg set ${region}
|
||||
|
||||
if [ ! -z "${frequency}" ]; then
|
||||
iwconfig ${wlan} freq ${frequency}
|
||||
else
|
||||
iwconfig ${wlan} channel ${channel}
|
||||
fi
|
||||
|
||||
iw dev ${wlan} set txpower fixed $((${txpower} * 100))
|
||||
}
|
||||
|
||||
start_wfb() {
|
||||
wfb_tx -p ${stream} -u ${udp_port} -K ${keydir}/drone.key -B ${bandwidth} -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${fec_k} -n ${fec_n} -T ${fec_timeout} -i ${link_id} ${wlan} &
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
if [ ${daemon} -eq 1 ]; then
|
||||
|
||||
echo "Loading modules and wifi card driver..."
|
||||
|
||||
load_modules
|
||||
|
||||
echo "Preparing interface wlan..."
|
||||
|
||||
load_interface
|
||||
|
||||
if ! cat ${keydir}/drone.key > /dev/null 2>&1; then
|
||||
echo "Generating drone & ground station keys..."
|
||||
cd ${keydir} ; wfb_keygen
|
||||
else
|
||||
echo "Drone key exist..."
|
||||
fi
|
||||
|
||||
echo "Starting Wifibroadcast service..."
|
||||
|
||||
start_wfb
|
||||
|
||||
echo "Done."
|
||||
|
||||
if [ ${telemetry} = "true" ]; then
|
||||
if [ ${chip} = "gk7205v200" ]; then
|
||||
# UART2_RX mux
|
||||
devmem 0x120c0010 32 0x1e04
|
||||
fi
|
||||
/usr/bin/telemetry start
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Wifibroadcast service disabled in wfb.conf..."
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
echo "Stopping all services..."
|
||||
kill -9 $(pidof wfb_tx)
|
||||
kill -9 $(pidof telemetry_rx)
|
||||
kill -9 $(pidof telemetry_tx)
|
||||
kill -9 $(pidof mavlink-routerd)
|
||||
kill -9 $(pidof mavfwd)
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop}"
|
||||
exit 1
|
||||
esac
|
||||
|
|
@ -6,6 +6,17 @@
|
|||
WIFIBROADCAST_VERSION = 23.01
|
||||
WIFIBROADCAST_SITE = $(call github,svpcom,wfb-ng,wfb-ng-$(WIFIBROADCAST_VERSION))
|
||||
WIFIBROADCAST_LICENSE = GPL-2.0
|
||||
FPATH = air
|
||||
|
||||
ifeq ($(FAMILY),hi3536dv100)
|
||||
ifeq ($(RELEASE),fpv)
|
||||
FPATH = gs
|
||||
endif
|
||||
endif
|
||||
|
||||
$(info $(FAMILY))
|
||||
$(info $(RELEASE))
|
||||
$(info $(FPATH))
|
||||
|
||||
WIFIBROADCAST_DEPENDENCIES += libpcap libsodium iw
|
||||
|
||||
|
|
@ -23,10 +34,10 @@ define WIFIBROADCAST_INSTALL_TARGET_CMDS
|
|||
$(INSTALL) -m 0755 -D $(@D)/wfb_keygen $(TARGET_DIR)/usr/bin
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
|
||||
cp ../general/package/wifibroadcast/files/wfb.conf $(TARGET_DIR)/etc
|
||||
cp ../general/package/wifibroadcast/files/$(FPATH)/wfb.conf $(TARGET_DIR)/etc
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/wifibroadcast/files/wifibroadcast $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/wifibroadcast/files/$(FPATH)/wifibroadcast $(TARGET_DIR)/usr/bin
|
||||
|
||||
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
|
||||
cp ../general/package/wifibroadcast/files/setmcs $(TARGET_DIR)/usr/bin
|
||||
|
|
|
|||
Loading…
Reference in New Issue