21 Commits
Author SHA1 Message Date
piotr 3be89cb70b hilink: expose runtime knob power through MSP VTX 2026-09-30 12:05:33 +02:00
piotr b04eeba139 hilink: use the installed IMX415 Infinity6E tuning 2026-09-30 11:52:34 +02:00
piotr cdce17874a hilink: map 0 to 100 power control to RTL range 2026-09-30 11:30:33 +02:00
piotr e7d1f1524d hilink: control WFB lifecycle and power from CH6 knob 2026-09-30 11:29:39 +02:00
piotr 5799a283e8 hilink: reflect WFB runtime in MSP VTX 2026-09-28 16:22:30 +02:00
piotr 6156429c34 hilink: report WFB txpower on 0 to 100 VTX scale 2026-09-28 16:09:59 +02:00
piotr f183836b0f hilink: pace MSP VTX table frames 2026-09-28 16:07:47 +02:00
piotr fc34d457a0 hilink: synchronize live WFB state over MSP VTX 2026-09-28 15:03:22 +02:00
piotr 9b1f96bf92 hilink: resync MSP VTX table after FC restart 2026-09-28 13:30:31 +02:00
piotr c1886a666c hilink: wait for FC MSP VTX readiness before table sync 2026-09-28 12:15:29 +02:00
piotr c59e8aefda hilink: retry MSP VTX table after FC handshake 2026-09-28 11:00:58 +02:00
piotr 45c0c6b795 hilink: serialize MSP VTX tables correctly 2026-09-28 10:16:51 +02:00
piotr 847f0bb157 hilink: add read-only YAML-aware MSP VTX status 2026-09-27 23:01:52 +02:00
piotr b8c32c84a1 hilink: bake WFB management and low latency runtime 2026-09-27 10:26:14 +02:00
piotr 8c4661665b hilink: omit unused 88XXau module from NOR image 2026-09-26 17:52:47 +02:00
piotr 2571aeaa4f ci: report rootfs contents when firmware exceeds flash 2026-09-26 15:35:46 +02:00
piotr d48f415bcf ci: include Node runtime for JavaScript actions 2026-09-26 15:03:28 +02:00
piotr 438b2fd47e ci: add dedicated OpenIPC builder runner image 2026-09-26 14:37:51 +02:00
piotr a8c9985704 ci: require preprovisioned build runner 2026-09-26 14:33:52 +02:00
piotr 79659433ea ci: install build dependencies with sudo 2026-09-26 14:30:59 +02:00
piotr bdd949c8c7 ci: add manual HiLink URLLC build workflow 2026-09-26 14:27:19 +02:00
19 changed files with 1210 additions and 2 deletions
+66
View File
@@ -0,0 +1,66 @@
name: Build HiLink URLLC firmware
on:
workflow_dispatch:
jobs:
build:
runs-on: openipc-builder
timeout-minutes: 360
env:
DEVICE: ssc338q_fpv_openipc-urllc-aio
BR2_DL_DIR: /tmp/builder-dl
steps:
- name: Checkout builder branch
uses: actions/checkout@v4
- name: Verify provisioned Buildroot toolchain
shell: bash
run: |
set -eu
id
missing=0
for tool in \
bash bc bison ccache cpio curl file flex gawk gcc git gzip make \
patch perl python3 rsync sed tar tree unzip wget xz; do
if ! command -v "$tool" >/dev/null 2>&1; then
echo "::error::Missing runner dependency: $tool"
missing=1
fi
done
test "$missing" = 0
- name: Build exactly the HiLink URLLC profile
shell: bash
run: |
set -euo pipefail
export GIT_HASH="$(git rev-parse --short HEAD)"
export GIT_BRANCH="$(git branch --show-current)"
mkdir -p "$BR2_DL_DIR" /tmp/ccache
ln -s /tmp/ccache "$HOME/.ccache"
if ! bash builder.sh "$DEVICE"; then
echo '--- largest files retained in the failed rootfs ---'
find openipc/output/target -type f -printf '%s\t%p\n' | \
sort -nr | sed -n '1,100p' || true
echo '--- rootfs target usage ---'
du -sh openipc/output/target 2>/dev/null || true
exit 1
fi
mkdir -p dist
firmware=$(find openipc/output/images -type f -name 'openipc*nor*.tgz' -print -quit)
test -n "$firmware"
cp "$firmware" "dist/${DEVICE}-nor.tgz"
sha256sum "dist/${DEVICE}-nor.tgz" > "dist/${DEVICE}-nor.tgz.sha256"
find dist -maxdepth 1 -type f -printf '%f %s bytes\n'
cat "dist/${DEVICE}-nor.tgz.sha256"
- name: Upload firmware artifact
uses: actions/upload-artifact@v4
with:
name: hilink-urllc-${{ github.sha }}
retention-days: 30
path: dist/*
+35
View File
@@ -0,0 +1,35 @@
FROM debian:bookworm-slim
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash \
bc \
bison \
build-essential \
ca-certificates \
ccache \
cpio \
curl \
file \
flex \
gawk \
git \
gzip \
libncurses-dev \
make \
nodejs \
patch \
perl \
python3 \
rsync \
sed \
tar \
tree \
unzip \
wget \
xz-utils \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /workspace
@@ -0,0 +1,19 @@
#!/bin/sh
start() {
echo "Starting network..."
ifup lo
modprobe 8812eu rtw_tx_pwr_by_rate=0 rtw_tx_pwr_lmt_enable=0
}
stop() {
ifdown lo
ifdown -f wlan0
ifdown -f eth0
}
case "$1" in
start|stop) "$1" ;;
restart|reload) stop; start ;;
*) echo "Usage: $0 {start|stop|restart|reload}"; exit 1 ;;
esac
@@ -0,0 +1,29 @@
#!/bin/sh
case "$1" in
start)
ifdown eth0 2>/dev/null || true
ifup eth0
sleep 5
/usr/bin/mgmt-net --force
if [ -r /run/mgmt-netd.pid ] &&
kill -0 "$(cat /run/mgmt-netd.pid)" 2>/dev/null; then
exit 0
fi
(
while :; do
/usr/bin/mgmt-net
sleep 2
done
) &
echo $! >/run/mgmt-netd.pid
;;
stop)
[ -r /run/mgmt-netd.pid ] &&
kill "$(cat /run/mgmt-netd.pid)" 2>/dev/null || true
rm -f /run/mgmt-netd.pid /run/mgmt-net.state
;;
esac
@@ -0,0 +1,29 @@
#!/bin/sh
case "$1" in
start)
pidof wfb_tx wfb_rx wfb_tun wifilink >/dev/null && exit 0
pidof msposd >/dev/null && exit 0
size=$(curl -s localhost/api/v1/config.json | \
jsonfilter -qe "@.video0.size")
size="${size:-1280x720}"
msposd \
-b 115200 \
-c 8 \
-c 6 \
-p 500 \
-w 1000 \
--mspvtx \
-r 20 \
-m /dev/ttyS2 \
-o 127.0.0.1:14551 \
-z "$size" \
>/tmp/msposd-management.log 2>&1 &
;;
*)
exit 0
;;
esac
@@ -0,0 +1,18 @@
#!/bin/sh
case "$1" in
start)
echo "Starting wifibroadcast..."
wifibroadcast start
;;
stop)
echo "Stopping wifibroadcast..."
wifibroadcast stop
;;
*)
echo "Usage: $0 {start|stop}"
exit 1
;;
esac
@@ -0,0 +1,81 @@
system:
webPort: 80
httpsPort: 443
logLevel: info
isp:
antiFlicker: disabled
sensorConfig: /etc/sensors/imx415_infinity6e.bin
exposure: 5
iqServer: false
image:
mirror: false
flip: false
rotate: 0
contrast: 50
hue: 50
saturation: 50
luminance: 50
video0:
enabled: true
codec: h264
fps: 60
bitrate: 4096
rcMode: cbr
gopSize: 0.2
size: 1280x720
profile: main
sliceUnits: 0
video1:
enabled: false
codec: h264
size: 704x576
fps: 15
jpeg:
enabled: true
qfactor: 50
fps: 5
osd:
enabled: false
font: /usr/share/fonts/truetype/UbuntuMono-Regular.ttf
template: '%d.%m.%Y %H:%M:%S'
posX: 16
posY: 16
audio:
enabled: false
volume: 30
srate: 8000
codec: opus
outputEnabled: false
outputVolume: 30
rtsp:
enabled: false
port: 554
nightMode:
colorToGray: true
irCutSingleInvert: false
lightMonitor: false
lightSensorInvert: false
motionDetect:
enabled: false
visualize: false
debug: false
records:
enabled: false
path: /mnt/mmcblk0p1/%F
split: 1
maxUsage: 95
notime: true
outgoing:
enabled: true
naluSize: 1400
wfb: true
server:
substream: false
watchdog:
enabled: true
timeout: 300
hls:
enabled: false
fpv:
enabled: true
noiseLevel: 1
@@ -0,0 +1,6 @@
iface eth0 inet static
hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66)
address 192.168.0.10
netmask 255.255.255.0
gateway 192.168.0.1
post-up echo "nameserver 1.1.1.1" > /etc/resolv.conf
@@ -0,0 +1,10 @@
auto wlan0
iface wlan0 inet static
address 192.168.0.10
netmask 255.255.255.0
gateway 192.168.0.1
pre-up wpa_passphrase "$(fw_printenv -n wlanssid)" "$(fw_printenv -n wlanpass)" > /tmp/wpa_supplicant.conf
pre-up sed -i 's/#psk.*/scan_ssid=1/g' /tmp/wpa_supplicant.conf
pre-up wpa_supplicant -B -i wlan0 -D nl80211,wext -c /tmp/wpa_supplicant.conf
post-up echo "nameserver 1.1.1.1" > /etc/resolv.conf
post-down killall -q wpa_supplicant
@@ -0,0 +1,17 @@
wireless:
txpower: 10
channel: 161
width: 20
mlink: 1500
broadcast:
mcs_index: 2
tun_index: 1
fec_k: 8
fec_n: 12
stbc: 0
ldpc: 0
link_id: 7669206
telemetry:
router: msposd
serial: ttyS2
osd_fps: 20
@@ -0,0 +1,25 @@
#!/bin/sh
CHANNEL="${1:-}"
VALUE="${2:-}"
# CH6 is the GX12 WFB knob. Betaflight exposes it as 1000..2000 PWM.
[ "$CHANNEL" = "6" ] || exit 0
case "$VALUE" in
''|*[!0-9]*) exit 2 ;;
esac
# First 5% is an explicit OFF detent. Above it WFB starts at 5% and the
# remaining travel maps continuously to 100%. This is a UI-range guard, not a
# regulatory EIRP cap.
if [ "$VALUE" -le 1050 ]; then
rm -f /run/wfb-power
logger -t channels "CH6=$VALUE -> management"
exec /usr/bin/link-mode management
fi
POWER=$((5 + (VALUE - 1051) * 95 / 949))
[ "$POWER" -gt 100 ] && POWER=100
logger -t channels "CH6=$VALUE -> WFB txpower=$POWER"
exec /usr/bin/wfb-power "$POWER"
@@ -0,0 +1,65 @@
#!/bin/sh
LOCK=/run/link-mode.lock
STATE=/run/link-mode.state
log() {
logger -t link-mode "$*"
}
if ! mkdir "$LOCK" 2>/dev/null; then
log "another transition is in progress; ignoring ${1:-}"
exit 0
fi
cleanup() {
rmdir "$LOCK" 2>/dev/null || true
}
trap cleanup EXIT HUP INT TERM
wfb_active() {
pidof wfb_tx wfb_rx wfb_tun wifilink >/dev/null
}
case "${1:-}" in
preflight)
if wfb_active; then
echo wfb >"$STATE"
exit 0
fi
log "management -> WFB"
ifdown wlan0 >/dev/null 2>&1 || true
killall -q wpa_supplicant 2>/dev/null || true
ip link set wlan0 up
if /usr/bin/wifibroadcast start && wfb_active; then
echo wfb >"$STATE"
log "WFB is active"
exit 0
fi
log "WFB start failed"
exit 1
;;
management)
if wfb_active; then
log "WFB -> management"
/usr/bin/wifibroadcast stop
killall -q wifilink 2>/dev/null || true
fi
/usr/bin/mgmt-net --force
echo management >"$STATE"
log "management path restored"
/etc/init.d/S97link-monitor start
exit 0
;;
*)
echo "Usage: $0 {preflight|management}" >&2
exit 2
;;
esac
@@ -0,0 +1,59 @@
#!/bin/sh
STATE=/run/mgmt-net.state
LINK_LOCK=/run/link-mode.lock
FORCE="${1:-}"
[ -e "$LINK_LOCK" ] && [ "$FORCE" != "--force" ] && exit 0
eth_standby() {
ifdown eth0 2>/dev/null || true
ifup eth0
ip addr flush dev eth0
}
carrier=0
if [ -r /sys/class/net/eth0/carrier ]; then
carrier=$(cat /sys/class/net/eth0/carrier 2>/dev/null || echo 0)
fi
if pidof wfb_tx wfb_rx wfb_tun wifilink >/dev/null; then
wfb_active=1
else
wfb_active=0
fi
if [ "$carrier" = "1" ]; then
wanted=ethernet
elif [ "$wfb_active" = "1" ]; then
wanted=wfb
else
wanted=wifi
fi
current=$(cat "$STATE" 2>/dev/null || true)
[ "$wanted" = "$current" ] && [ "$FORCE" != "--force" ] && exit 0
case "$wanted" in
ethernet)
[ "$wfb_active" = "0" ] && ifdown wlan0 2>/dev/null || true
ifdown eth0 2>/dev/null || true
ifup eth0
;;
wifi)
eth_standby
ifdown wlan0 2>/dev/null || true
ip link set wlan0 down
iw dev wlan0 set type managed
ip link set wlan0 up
ifup wlan0
;;
wfb)
eth_standby
;;
esac
echo "$wanted" >"$STATE"
logger -t mgmt-net "active path: $wanted"
@@ -0,0 +1,29 @@
#!/bin/sh
POWER="${1:-}"
LOCK=/run/wfb-power.lock
STATE=/run/wfb-power
case "$POWER" in
''|*[!0-9]*) exit 2 ;;
esac
[ "$POWER" -ge 5 ] && [ "$POWER" -le 100 ] || exit 2
# The runtime state is tmpfs. Do not rewrite /etc/wfb.yaml while a knob moves.
printf '%s\n' "$POWER" >"$STATE"
if ! mkdir "$LOCK" 2>/dev/null; then
exit 0
fi
trap 'rmdir "$LOCK" 2>/dev/null || true' EXIT HUP INT TERM
if pidof wfb_tx wfb_rx wfb_tun wifilink >/dev/null; then
# RTL8812EU accepts 0..3150 mBm driver units; map the user-facing 0..100
# scalar over that complete hardware-supported range.
iw wlan0 set txpower fixed $((POWER * 3150 / 100))
logger -t wfb-power "runtime txpower=$POWER"
exit 0
fi
logger -t wfb-power "txpower=$POWER -> WFB preflight"
/usr/bin/link-mode preflight
@@ -0,0 +1,202 @@
#!/bin/sh
wfb_key=/etc/drone.key
wfb_cfg=/etc/wfb.yaml
wfb_dev=wlan0
echo_log() {
echo "$1" | logger -s -t wifibroadcast
}
wfb_yaml() {
if [ -e "$1" ]; then
while IFS=: read -r key value; do
key=$(eval echo "$key")
value=$(eval echo "$value")
export "$key=$value"
done < "$1"
fi
}
load_config() {
wfb_yaml /rom"$wfb_cfg"
wfb_yaml "$wfb_cfg"
if [ -r /run/wfb-power ]; then
runtime_txpower=$(cat /run/wfb-power)
case "$runtime_txpower" in
[5-9]|[1-9][0-9]|100) txpower="$runtime_txpower" ;;
esac
fi
[ ! -e "$wfb_key" ] && wfb_key=/rom"$wfb_key"
}
load_modules() {
for card in $(lsusb | awk '{print $6}' | uniq); do
case "$card" in
"0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101" | "2604:0012")
driver=88XXau
;;
"0bda:a81a")
driver=8812eu
;;
"0bda:f72b" | "0bda:b733")
driver=8733bu
;;
esac
done
if [ -z "$driver" ]; then
echo_log "Wireless module not detected!"
exit 1
fi
echo_log "Detected driver: $driver"
[ -e /sys/class/net/"$wfb_dev" ] && return
sleep 1
if [ "$driver" != "88XXau" ]; then
opt1="rtw_tx_pwr_by_rate=0"
opt2="rtw_tx_pwr_lmt_enable=0"
fi
modprobe "$driver" "$opt1" "$opt2"
sleep 3
if ! ifconfig "$wfb_dev" up; then
echo_log "Wireless driver not found!"
exit 1
fi
}
load_mlink() {
ifconfig "$wfb_dev" mtu "$mlink"
nalu=$((mlink - 100))
if [ "$(cli -g .outgoing.naluSize)" != "$nalu" ]; then
cli -s .outgoing.naluSize "$nalu"
killall -1 majestic
fi
}
load_interface() {
iw "$wfb_dev" set monitor none
[ "$width" = "40" ] && wfb_width=HT40+ || wfb_width=HT20
iw "$wfb_dev" set channel "$channel" "$wfb_width"
iw reg set 00
[ "$driver" = "88XXau" ] && wfb_power=$((txpower * -100)) || wfb_power=$((txpower * 3150 / 100))
iw "$wfb_dev" set txpower fixed "$wfb_power"
}
load_wfb() {
wfb_rx -K "$wfb_key" -i "$link_id" -p "$1" -u "$3" "$wfb_dev" &> /dev/null &
wfb_tx -K "$wfb_key" -M "$tun_index" -B "$width" -k "$fec_k" -n "$fec_n" \
-S "$stbc" -L "$ldpc" -i "$link_id" -p "$2" -u "$4" "$wfb_dev" &> /dev/null &
}
start_broadcast() {
echo_log "Starting wfb_tx"
wfb_tx -K "$wfb_key" -M "$mcs_index" -B "$width" -k "$fec_k" -n "$fec_n" -U rtp_local \
-S "$stbc" -L "$ldpc" -i "$link_id" -C 8000 "$wfb_dev" &> /dev/null &
}
start_tunnel() {
echo_log "Starting wfb_tun"
load_wfb 160 32 5800 5801
wfb_tun -a 10.5.0.10/24 > /dev/null &
}
start_telemetry() {
chipset=$(ipcinfo -c)
[ "$chipset" = "ssc33x" ] && devmem 0x1F207890 16 0x8
port_rx=14550
port_tx=14551
echo_log "Starting $router"
load_wfb 144 16 "$port_rx" "$port_tx"
if [ "$router" = "mavfwd" ]; then
mavfwd -b 115200 -c 8 -p 100 -a 15 -t -m /dev/"$serial" \
-o 127.0.0.1:"$port_tx" -i 127.0.0.1:"$port_rx" > /dev/null &
else
if [ "$router" = "msposd" ]; then
size=$(curl -s localhost/api/v1/config.json | jsonfilter -qe "@.video0.size")
fi
if ! pidof msposd >/dev/null; then
msposd -b 115200 -c 8 -c 6 -p 500 -w 1000 --mspvtx -r "$osd_fps" -m /dev/"$serial" \
-o 127.0.0.1:"$port_tx" -z "$size" > /dev/null &
fi
fi
}
video_settings() {
sensor=$(ipcinfo -s)
cli -s .isp.sensorConfig /etc/sensors/"$sensor"_infinity6e.bin
cli -s .isp.exposure 5
cli -s .video0.fps 60
cli -s .video0.size 1280x720
cli -s .video0.bitrate 4096
cli -s .video0.codec h264
cli -s .video0.rcMode cbr
cli -s .video0.gopSize 0.2
cli -s .outgoing.enabled true
cli -s .outgoing.wfb true
cli -s .fpv.enabled true
cli -s .fpv.noiseLevel 1
cli -s .records.split 1
cli -s .records.notime true
}
start() {
load_config
load_modules
load_mlink
load_interface
if [ ! -e /etc/system.ok ]; then
video_settings
touch /etc/system.ok
# killall -1 majestic
reboot
fi
stop
start_broadcast
start_tunnel
start_telemetry
wifilink 20 &
}
stop() {
for process in wfb_rx wfb_tx wfb_tun mavfwd; do
if [ -n "$(pidof $process)" ]; then
echo_log "Stopping $process"
killall -q "$process"
fi
done
}
case "$1" in
start|stop)
$1
;;
reset)
cp -f /rom"$wfb_cfg" "$wfb_cfg"
cp -f /rom/etc/majestic.yaml /etc/majestic.yaml
video_settings
;;
cli)
shift
yaml-cli -i "$wfb_cfg" "$@"
;;
*)
echo "Usage: $0 {start|stop|reset|cli}"
exit 1
;;
esac
@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Set custom upgrade url # Set the reproducible Piksar HiLink firmware release channel.
fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/ssc338q_fpv_openipc-urllc-aio-nor.tgz' fw_setenv upgrade 'https://git.piksar.eu/piotr/openipc-builder/releases/download/latest/ssc338q_fpv_openipc-urllc-aio-nor.tgz'
exit 0 exit 0
@@ -14,3 +14,8 @@
/lib/modules/4.9.84/sigmastar/sensor_os04c10_mipi.ko /lib/modules/4.9.84/sigmastar/sensor_os04c10_mipi.ko
/lib/modules/4.9.84/sigmastar/sensor_sc501ai_mipi.ko /lib/modules/4.9.84/sigmastar/sensor_sc501ai_mipi.ko
/lib/modules/4.9.84/sigmastar/sensor_sc8235_mipi.ko /lib/modules/4.9.84/sigmastar/sensor_sc8235_mipi.ko
#
# HiLink's radio is USB 0bda:a81a and loads 8812eu. The legacy 88XXau
# module targets other adapters and is 1.4 MiB, which exceeds the 8 MiB
# rootfs budget without serving this fixed hardware profile.
/lib/modules/4.9.84/extra/88XXau.ko
@@ -0,0 +1,455 @@
diff --git a/osd.c b/osd.c
index a8b756e..7e5ca2a 100644
--- a/osd.c
+++ b/osd.c
@@ -959,48 +959,37 @@ static void rx_msp_callback(msp_msg_t *msp_message) {
break;
}
- case MSP_GET_VTX_CONFIG: {
- if (vtxInitDone) {
- mspVtxConfigStruct *in_mspVtxConfigStruct = (mspVtxConfigStruct *)msp_message->payload;
- uint16_t frequency =
- (in_mspVtxConfigStruct->freqMSB << 8) | in_mspVtxConfigStruct->freqLSB;
+ case MSP_SET_VTX_CONFIG:
+ // FC-side desired settings are read-only for this VTX. The next
+ // MSP_VTX_CONFIG reply will re-advertise the actual WFB runtime.
+ break;
- double current_frequency =
- read_current_freq_from_interface(read_setting("/etc/wfb.conf", "wlan"));
+ case MSP_GET_VTX_CONFIG: {
+ if (msp_message->size < 15) {
+ break;
+ }
- if (verbose)
- printf("mspVTX Band: %i, Channel: %i, wanted Frequency: %u, set "
- "Frequency: %.0f\n",
- in_mspVtxConfigStruct->band, in_mspVtxConfigStruct->channel, frequency,
- current_frequency);
-
- if (frequency != (uint16_t)current_frequency) {
- int channel = 0;
- for (int i = 0; i < MAX_ENTRIES; i++) {
- if (fc_list[i].frequency == frequency)
- channel = fc_list[i].channel;
- }
- if (channel > 0) {
- if (verbose)
- printf("mspVTX executing channel change to channel "
- "%d\n",
- channel);
-
- set_frequency(read_setting("/etc/wfb.conf", "wlan"), channel);
-
- // store new channel to wfb.conf
- char cha_str[32];
- sprintf(cha_str, "%i", channel);
- write_setting("/etc/wfb.conf", "channel", cha_str);
- } else {
- printf("Never change to channel 0, we should not reach "
- "here, check "
- "vtx table in your fc\n");
- }
- }
+ mspVtxConfigStruct *fc_vtx = (mspVtxConfigStruct *)msp_message->payload;
+ bool table_ready = fc_vtx->vtxTableAvailable &&
+ fc_vtx->bands == BAND_COUNT &&
+ fc_vtx->channels == CHANNEL_COUNT &&
+ fc_vtx->powerLevels == NUM_POWER_LEVELS;
+
+ // This is an actual FC reply to our periodic MSP_VTX_CONFIG request.
+ // Keep publishing the true local WFB configuration. If the FC reset or
+ // discarded its table, rebuild it here instead of depending on boot order.
+ if (table_ready) {
+ msp_send_vtx_runtime_config(serial_fd);
} else {
- if (verbose)
- printf("vtxInitDone not finished, should never happen\n");
+ msp_set_vtx_config(serial_fd);
+ }
+
+ if (verbose) {
+ uint16_t fc_frequency =
+ (fc_vtx->freqMSB << 8) | fc_vtx->freqLSB;
+ printf("mspVTX: FC %u MHz, table %u/%u/%u; local WFB %d MHz\n",
+ fc_frequency, fc_vtx->bands, fc_vtx->channels, fc_vtx->powerLevels,
+ read_wfb_frequency());
}
break;
}
diff --git a/osd/msp/msp.c b/osd/msp/msp.c
index b1a538c..d834780 100644
--- a/osd/msp/msp.c
+++ b/osd/msp/msp.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <termios.h>
#include <unistd.h>
extern bool verbose;
@@ -33,12 +34,11 @@ uint16_t channelFreqTable[FREQ_TABLE_SIZE] = {
5925 // WLAN CHANNEL: 132, 140, 144, 153, 161, 169, 177, 185
};
-uint8_t saPowerLevelsLut[NUM_POWER_LEVELS] = {20, 25, 30, 35, 45, 50, 55, 58};
+uint8_t saPowerLevelsLut[NUM_POWER_LEVELS] = {0, 10, 25, 40, 55, 70, 85, 100};
-uint8_t saPowerLevelsLabel[NUM_POWER_LEVELS * POWER_LEVEL_LABEL_LENGTH] = {'2', '0', ' ', '2', '5',
- ' ', '3', '0', ' ', '3', '5', ' ', '4', '5', ' ', '5', '0', ' ', '5', '5', ' ', '5', '8', ' '};
-
-int frequency = 0;
+uint8_t saPowerLevelsLabel[NUM_POWER_LEVELS * POWER_LEVEL_LABEL_LENGTH] = {
+ '0', ' ', ' ', '1', '0', ' ', '2', '5', ' ', '4', '0', ' ',
+ '5', '5', ' ', '7', '0', ' ', '8', '5', ' ', '1', '0', '0'};
uint16_t msp_data_from_msg(uint8_t message_buffer[], msp_msg_t *msg) {
// return size
@@ -46,50 +46,103 @@ uint16_t msp_data_from_msg(uint8_t message_buffer[], msp_msg_t *msg) {
return msg->size + 6;
}
-void wipeVtxTable(int serial_fd, int band, int channel) {
-
- // lets first wipe all
- uint8_t payload[15];
- payload[0] = 0; // idx LSB
- payload[1] = 0; // idx MSB
- payload[2] = 0; // power
- payload[3] = 0; // pitmode
- payload[4] = 0; // lowPowerDisarm
- payload[5] = 0; // pitModeFreq LSB
- payload[6] = 0; // pitModeFreq MSB
- payload[7] = 0; // newBand - WLAN Channel
- payload[8] = 0; // newChannel - 161
- payload[9] = 0; // newFreq LSB
- payload[10] = 0; // newFreq MSB
- payload[11] = 0; // newBandCount
- payload[12] = 0; // newChannelCount
- payload[13] = 0; // newPowerCount
- payload[14] = 1; // vtxtable should be cleared
+static void write_msp_packet(int serial_fd, const uint8_t *buffer, size_t size) {
+ ssize_t written = write(serial_fd, buffer, size);
+ if (written != (ssize_t)size) {
+ fprintf(stderr, "mspVTX: short serial write (%zd/%zu)\n", written, size);
+ return;
+ }
- uint8_t buffer[256];
+ // Betaflight's MSP parser is also carrying DisplayPort traffic on this
+ // UART. Drain and pace table frames so a cold boot cannot overrun its
+ // receive path before it has processed the preceding configuration frame.
+ tcdrain(serial_fd);
+ usleep(20 * 1000);
+}
- construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND);
- write(serial_fd, &buffer, sizeof(buffer));
-
- // now prepare the table
- payload[0] = 0; // idx LSB
- payload[1] = 0; // idx MSB
- payload[2] = 7; // 55, default wfb-ng
- payload[3] = 0; // pitmode
- payload[4] = 0; // lowPowerDisarm
- payload[5] = 0; // pitModeFreq LSB
- payload[6] = 0; // pitModeFreq MSB
- payload[7] = band; // newBand - WLAN Channel
- payload[8] = channel; // newChannel - 161
- payload[9] = 0; // newFreq LSB
- payload[10] = 0; // newFreq MSB
- payload[11] = BAND_COUNT; // newBandCount
- payload[12] = CHANNEL_COUNT; // newChannelCount
- payload[13] = NUM_POWER_LEVELS; // newPowerCount
- payload[14] = 0; // vtxtable should be cleared
+static bool wfb_runtime_active(void) {
+ return system("pidof wfb_tx wfb_rx wfb_tun wifilink >/dev/null 2>&1") == 0;
+}
+
+static uint8_t power_index_for_txpower(int txpower) {
+ uint8_t best = 0;
+ int smallest_delta = 101;
+
+ for (uint8_t i = 0; i < NUM_POWER_LEVELS; i++) {
+ int delta = abs(txpower - saPowerLevelsLut[i]);
+ if (delta < smallest_delta) {
+ best = i;
+ smallest_delta = delta;
+ }
+ }
+
+ return best + 1;
+}
+
+static int get_wfb_vtx_config(int *band, int *channel, int *configured_frequency,
+ uint8_t *power_index, bool *pit_mode) {
+ *configured_frequency = read_wfb_frequency();
+ if (*configured_frequency < 0) {
+ fprintf(stderr, "mspVTX: cannot read /etc/wfb.yaml channel\n");
+ return -1;
+ }
+
+ int txpower = read_wfb_txpower();
+ if (txpower < 0) {
+ fprintf(stderr, "mspVTX: cannot read /etc/wfb.yaml txpower\n");
+ return -1;
+ }
+ bool active = wfb_runtime_active();
+ *pit_mode = !active;
+ if (!active) {
+ txpower = 0;
+ }
+ *power_index = power_index_for_txpower(txpower);
+
+ *band = 1;
+ *channel = 1;
+ for (int index = 0; index < FREQ_TABLE_SIZE; index++) {
+ if (channelFreqTable[index] == *configured_frequency) {
+ *band = index / CHANNEL_COUNT + 1;
+ *channel = index % CHANNEL_COUNT + 1;
+ return 0;
+ }
+ }
+
+ fprintf(stderr, "mspVTX: %d MHz is absent from the VTX table\n", *configured_frequency);
+ return -1;
+}
+
+static void send_vtx_config(int serial_fd, int band, int channel, int configured_frequency,
+ uint8_t power_index, bool pit_mode, bool clear_table) {
+ uint8_t payload[15] = {
+ configured_frequency & 0xFF,
+ (configured_frequency >> 8) & 0xFF,
+ power_index, // nearest configured 0..100 WFB txpower table entry
+ pit_mode, // management standby is represented as VTX pit mode
+ 0, // low power when disarmed
+ 0, 0, // pit frequency
+ band,
+ channel,
+ configured_frequency & 0xFF,
+ (configured_frequency >> 8) & 0xFF,
+ BAND_COUNT,
+ CHANNEL_COUNT,
+ NUM_POWER_LEVELS,
+ clear_table ? 1 : 0,
+ };
+ uint8_t buffer[21];
construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND);
- write(serial_fd, &buffer, sizeof(buffer));
+ write_msp_packet(serial_fd, buffer, sizeof(payload) + 6);
+}
+
+static void wipeVtxTable(int serial_fd, int band, int channel, int configured_frequency,
+ uint8_t power_index, bool pit_mode) {
+ // First tell Betaflight to discard any stale table, then publish the
+ // configured WFB frequency and the table dimensions.
+ send_vtx_config(serial_fd, band, channel, configured_frequency, power_index, pit_mode, true);
+ send_vtx_config(serial_fd, band, channel, configured_frequency, power_index, pit_mode, false);
}
void setVtxTableBand(int serial_fd, uint8_t band) {
@@ -119,7 +172,7 @@ void setVtxTableBand(int serial_fd, uint8_t band) {
}
construct_msp_command(buffer, MSP_SET_VTXTABLE_BAND, payload2, sizeof(payload2), MSP_OUTBOUND);
- write(serial_fd, &buffer, sizeof(buffer));
+ write_msp_packet(serial_fd, buffer, sizeof(payload2) + 6);
}
void setVtxTablePowerLevel(int serial_fd, uint8_t idx) {
@@ -139,31 +192,26 @@ void setVtxTablePowerLevel(int serial_fd, uint8_t idx) {
construct_msp_command(
buffer, MSP_SET_VTXTABLE_POWERLEVEL, payload2, sizeof(payload2), MSP_OUTBOUND);
- write(serial_fd, &buffer, sizeof(buffer));
+ write_msp_packet(serial_fd, buffer, sizeof(payload2) + 6);
}
void msp_set_vtx_config(int serial_fd) {
+ int band;
+ int channel;
+ int configured_frequency;
+ uint8_t power_index;
+ bool pit_mode;
+
+ if (get_wfb_vtx_config(&band, &channel, &configured_frequency, &power_index, &pit_mode) != 0) {
+ return;
+ }
- // mspVTX read current frequency setting
- query_interface_for_available_frequencies();
-
- frequency = read_current_freq_from_interface(read_setting("/etc/wfb.conf", "wlan"));
-
- int band = 6;
- int channel = 3;
- for (int index = 0; index < FREQ_TABLE_SIZE; index++) {
- if (channelFreqTable[index] == frequency) {
- // Determine band and channel using division and modulo
- band = index / 8 + 1; // Which band (integer division)
- channel = (index % 8) + 1; // Channel within the band (modulo)
-
- if (verbose)
- printf("Frequency %d found in band %i, channel %d\n", frequency, band, channel);
- break; // Exit after finding the frequency
- }
+ if (verbose) {
+ printf("mspVTX table: %d MHz, band %d, channel %d\n",
+ configured_frequency, band, channel);
}
- wipeVtxTable(serial_fd, band, channel);
+ wipeVtxTable(serial_fd, band, channel, configured_frequency, power_index, pit_mode);
for (int i = 1; i <= BAND_COUNT; i++) {
setVtxTableBand(serial_fd, i);
@@ -174,6 +222,20 @@ void msp_set_vtx_config(int serial_fd) {
vtxInitDone = true;
}
+void msp_send_vtx_runtime_config(int serial_fd) {
+ int band;
+ int channel;
+ int configured_frequency;
+ uint8_t power_index;
+ bool pit_mode;
+
+ if (get_wfb_vtx_config(&band, &channel, &configured_frequency, &power_index, &pit_mode) != 0) {
+ return;
+ }
+
+ send_vtx_config(serial_fd, band, channel, configured_frequency, power_index, pit_mode, false);
+}
+
msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[],
uint8_t size, msp_direction_e direction) {
uint8_t checksum;
diff --git a/osd/msp/msp.h b/osd/msp/msp.h
index 3e60a31..1fe1c28 100644
--- a/osd/msp/msp.h
+++ b/osd/msp/msp.h
@@ -40,10 +40,10 @@
// wfb-ng list
#define CHANNEL_COUNT 8
-#define BAND_COUNT 8
+#define BAND_COUNT 7
#define IS_FACTORY_BAND 0
-#define FREQ_TABLE_SIZE 64
-#define FREQ_LABEL_SIZE 64
+#define FREQ_TABLE_SIZE 56
+#define FREQ_LABEL_SIZE 56
#define MSP_REBOOT 68 // in message reboot settings
@@ -83,3 +83,5 @@ msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uin
uint8_t size, msp_direction_e direction);
msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat);
void msp_set_vtx_config(int serial_fd);
+// Advertise the actual local WFB configuration without resetting the FC table.
+void msp_send_vtx_runtime_config(int serial_fd);
diff --git a/osd/util/interface.c b/osd/util/interface.c
index 089fdc2..a783431 100644
--- a/osd/util/interface.c
+++ b/osd/util/interface.c
@@ -153,3 +153,81 @@ void set_frequency(char *interface, int channel) {
printf("Failed to set channel on %s\n", interface);
}
}
+
+int read_wfb_frequency(void) {
+ FILE *fp = fopen("/etc/wfb.yaml", "r");
+ char buffer[256];
+ int in_wireless = 0;
+ int channel = -1;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ if (strncmp(buffer, "wireless:", 9) == 0) {
+ in_wireless = 1;
+ continue;
+ }
+
+ if (in_wireless && buffer[0] != ' ' && buffer[0] != ' ' &&
+ buffer[0] != '\n') {
+ break;
+ }
+
+ if (in_wireless && sscanf(buffer, " channel: %d", &channel) == 1) {
+ break;
+ }
+ }
+
+ fclose(fp);
+
+ if (channel >= 1 && channel <= 14) {
+ return 2407 + channel * 5;
+ }
+ if (channel > 14 && channel <= 196) {
+ return 5000 + channel * 5;
+ }
+
+ return -1;
+}
+
+int read_wfb_txpower(void) {
+ FILE *fp = fopen("/run/wfb-power", "r");
+ int txpower = -1;
+
+ // CH6 knob state wins while WFB is active; it is intentionally kept in
+ // tmpfs so power changes do not wear the overlay flash.
+ if (fp != NULL) {
+ if (fscanf(fp, "%d", &txpower) == 1 && txpower >= 0 && txpower <= 100) {
+ fclose(fp);
+ return txpower;
+ }
+ fclose(fp);
+ }
+
+ fp = fopen("/etc/wfb.yaml", "r");
+ char buffer[256];
+ int in_wireless = 0;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ if (strncmp(buffer, "wireless:", 9) == 0) {
+ in_wireless = 1;
+ continue;
+ }
+ if (in_wireless && buffer[0] != ' ' && buffer[0] != ' ' &&
+ buffer[0] != '\n') {
+ break;
+ }
+ if (in_wireless && sscanf(buffer, " txpower: %d", &txpower) == 1) {
+ break;
+ }
+ }
+
+ fclose(fp);
+ return txpower >= 0 && txpower <= 100 ? txpower : -1;
+}
diff --git a/osd/util/interface.h b/osd/util/interface.h
index 983971d..854c9e7 100644
--- a/osd/util/interface.h
+++ b/osd/util/interface.h
@@ -22,3 +22,10 @@ int query_interface_for_available_frequencies();
void set_frequency(char *interface, int channel);
int read_current_freq_from_interface(char *interface);
+
+// Read WiFiLink/OpenIPC WFB channel from the YAML runtime configuration.
+// Returns the centre frequency in MHz, or -1 when no valid channel is present.
+int read_wfb_frequency(void);
+
+// Read the configured WFB txpower scalar (0..100 convention used by this profile).
+int read_wfb_txpower(void);
+58
View File
@@ -0,0 +1,58 @@
################################################################################
#
# msposd — pinned upstream plus HiLink WiFiLink mspVTX compatibility patch
#
################################################################################
MSPOSD_SITE = $(call github,openipc,msposd,$(MSPOSD_VERSION))
MSPOSD_VERSION = ad0175ce01c4e09b3eb4223fd683735f9df22715
MSPOSD_DEPENDENCIES = libevent-openipc
ifeq ($(OPENIPC_SOC_FAMILY),gk7205v200)
MSPOSD_FAMILY = goke
MSPOSD_OSDRV = $(GOKE_OSDRV_GK7205V200_PKGDIR)
else ifeq ($(OPENIPC_SOC_FAMILY),hi3516ev200)
MSPOSD_FAMILY = hisi
MSPOSD_OSDRV = $(HISILICON_OSDRV_HI3516EV200_PKGDIR)
else ifeq ($(OPENIPC_SOC_FAMILY),infinity6b0)
MSPOSD_FAMILY = star6b0
MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)
else ifeq ($(OPENIPC_SOC_FAMILY),infinity6c)
MSPOSD_FAMILY = star6c
MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6C_PKGDIR)
else
MSPOSD_FAMILY = star6e
MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)
endif
define MSPOSD_BUILD_CMDS
$(MAKE) CC=$(TARGET_CC) TOOLCHAIN=$(STAGING_DIR) DRV=$(MSPOSD_OSDRV)/files/lib $(MSPOSD_FAMILY) OUTPUT=$(@D)/msposd -C $(@D)
endef
define MSPOSD_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/msposd
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/safeboot.sh
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/fonts
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_inav.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_inav_hd.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_btfl.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_btfl_hd.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_ardu.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/font_ardu_hd.png
$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/vtxmenu.ini
endef
define MSPOSD_INSTALL_LIBRARIES
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(MSPOSD_OSDRV)/files/lib/libcam_os_wrapper.so
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(MSPOSD_OSDRV)/files/lib/libmi_rgn.so
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(MSPOSD_OSDRV)/files/lib/libmi_sys.so
endef
ifeq ($(OPENIPC_SOC_VENDOR),sigmastar)
MSPOSD_POST_INSTALL_TARGET_HOOKS += MSPOSD_INSTALL_LIBRARIES
endif
$(eval $(generic-package))