Minor adjustments for ease of testing

pull/17/head
Andrew Koenig 2024-10-03 23:09:18 -05:00
rodzic 346df7335b
commit 2b2a569a70
2 zmienionych plików z 26 dodań i 21 usunięć

Wyświetl plik

@ -24,16 +24,17 @@ fi
: "${BAUD_RATE:=115177}" : "${BAUD_RATE:=115177}"
: "${OVERSAMPLING:=8}" : "${OVERSAMPLING:=8}"
: "${UDP_PORT:=0}" : "${UDP_PORT:=0}"
: "${WEB_PORT:=5003}"
# Start up the SSDV Uploader script and push it into the background. # Start up the SSDV Uploader script and push it into the background.
python3 ssdvuploader.py "$MYCALL" & #python3 ssdvuploader.py "$MYCALL" &
SSDV_UPLOAD_PID=$! #SSDV_UPLOAD_PID=$!
# Start the Web Interface Server # Start the Web Interface Server
if [ "$UDP_PORT" = "0" ]; then if [ "$UDP_PORT" = "0" ]; then
python3 wenetserver.py "$MYCALL" & python3 wenetserver.py "$MYCALL" -l "$WEB_PORT" &
else else
python3 wenetserver.py "$MYCALL" -u "$UDP_PORT" & python3 wenetserver.py "$MYCALL" -l "$WEB_PORT" -u "$UDP_PORT" &
fi fi
WEB_VIEWER_PID=$! WEB_VIEWER_PID=$!
@ -64,15 +65,16 @@ if [ "$SDR_TYPE" = "RTLSDR" ] ; then
python3 rx_ssdv.py --partialupdate 16 --headless python3 rx_ssdv.py --partialupdate 16 --headless
elif [ "$SDR_TYPE" = "KA9Q" ] ; then elif [ "$SDR_TYPE" = "KA9Q" ] ; then
# Establish a channel # Establish a channel
echo -n "Tuning receiver -- " # echo -n "Tuning receiver -- "
avahi-resolve-host-name "$DEVICE" # avahi-resolve-host-name "$DEVICE"
timeout 10 tune --samprate "$SDR_RATE" --mode wenet --frequency "$RX_SSB_FREQ" --ssrc "$RX_SSB_FREQ" --radio "$DEVICE" # timeout 10 tune --samprate "$SDR_RATE" --mode wenet --frequency "$RX_SSB_FREQ" --ssrc "$RX_SSB_FREQ" --radio "$DEVICE"
# Start receiver # Start receiver
echo -n "Starting pcmcat and demodulator -- " echo "Starting pcmcat and demodulator"
PCMDEVICE=$(echo "$DEVICE" | sed 's/.local/-pcm.local/g') # PCMDEVICE="$DEVICE" #$(echo "$DEVICE" | sed 's/.local/-pcm.local/g')
echo "$PCMDEVICE" # echo "$PCMDEVICE"
pcmcat -s "$RX_SSB_FREQ" "$PCMDEVICE" | \ # pcmcat -s "$RX_SSB_FREQ" "$PCMDEVICE" | \
pcmcat "$DEVICE" | \
./fsk_demod --cs16 -s --stats=100 2 "$SDR_RATE" "$BAUD_RATE" - - 2> >(python3 fskstatsudp.py --rate 1 --freq $RX_SSB_FREQ --samplerate $SDR_RATE) | \ ./fsk_demod --cs16 -s --stats=100 2 "$SDR_RATE" "$BAUD_RATE" - - 2> >(python3 fskstatsudp.py --rate 1 --freq $RX_SSB_FREQ --samplerate $SDR_RATE) | \
./drs232_ldpc - - -vv 2> /dev/null | \ ./drs232_ldpc - - -vv 2> /dev/null | \
python3 rx_ssdv.py --partialupdate 16 --headless python3 rx_ssdv.py --partialupdate 16 --headless
@ -81,5 +83,5 @@ else
fi fi
# Kill off the SSDV Uploader and the GUIs # Kill off the SSDV Uploader and the GUIs
kill $SSDV_UPLOAD_PID #kill $SSDV_UPLOAD_PID
kill $WEB_VIEWER_PID kill $WEB_VIEWER_PID

Wyświetl plik

@ -9,21 +9,21 @@
# Your station callsign, which will be shown on https://ssdv.habhub.org # Your station callsign, which will be shown on https://ssdv.habhub.org
# when receiving packets. # when receiving packets.
# Make sure there is no space between the = and your callsign. # Make sure there is no space between the = and your callsign.
MYCALL=CHANGEME MYCALL=KE5GDB-1
# Receive Frequency (Hz) # Receive Frequency (Hz)
# The normal receive frequency used by Project Horus is 443.5 MHz # The normal receive frequency used by Project Horus is 443.5 MHz
RXFREQ=443500000 RXFREQ=431250000
# SDR Type. Set this to RTLSDR for RTL-SDR use or KA9Q for KA9Q-Radio use # SDR Type. Set this to RTLSDR for RTL-SDR use or KA9Q for KA9Q-Radio use
SDR_TYPE=RTLSDR #SDR_TYPE=RTLSDR
#SDR_TYPE=KA9Q SDR_TYPE=KA9Q
# RTLSDR Device ID. Leave this at 0 if you don't want to use a particular device # RTLSDR Device ID. Leave this at 0 if you don't want to use a particular device
DEVICE=0 #DEVICE=0
#DEVICE=wenet-1-pcm.local DEVICE=wenet-1-pcm.local
# Receiver Gain. Set this to 0 to use automatic gain control, otherwise if running a # Receiver Gain (RTL-SDR only). Set this to 0 to use automatic gain control, otherwise if running a
# preamplifier, you may want to experiment with lower gain settings to optimize # preamplifier, you may want to experiment with lower gain settings to optimize
# your receiver setup. # your receiver setup.
# You can find what gain range is valid for your RTLSDR by running: rtl_test # You can find what gain range is valid for your RTLSDR by running: rtl_test
@ -31,7 +31,7 @@ DEVICE=0
# 32.8 - your performance may vary! # 32.8 - your performance may vary!
GAIN=0 GAIN=0
# Bias Tee Enable (1) or Disable (0) # Bias Tee Enable (1) or Disable (0) (RTL-SDR only)
# Enable this is you are intending on powering a preamplifer via coax from your RTLSDR # Enable this is you are intending on powering a preamplifer via coax from your RTLSDR
BIAS=0 BIAS=0
@ -43,7 +43,7 @@ BIAS=0
# 9600 baud, 100x oversampling # 9600 baud, 100x oversampling
# 4800 baud, 200x oversampling # 4800 baud, 200x oversampling
# #
BAUD_RATE=115177 BAUD_RATE=115200
OVERSAMPLING=8 OVERSAMPLING=8
@ -76,6 +76,7 @@ if [ "SDR_TYPE" = "RTLSDR" ] ; then
--device /dev/bus/usb \ --device /dev/bus/usb \
-p 5003:5003 -p 5003:5003
wenet wenet
# ghcr.io/projecthorus/wenet:latest
elif [ "$SDR_TYPE" = "KA9Q" ] ; then elif [ "$SDR_TYPE" = "KA9Q" ] ; then
docker run -d \ docker run -d \
--name wenet \ --name wenet \
@ -94,6 +95,8 @@ elif [ "$SDR_TYPE" = "KA9Q" ] ; then
--device /dev/bus/usb \ --device /dev/bus/usb \
--network host \ --network host \
wenet wenet
# ghcr.io/projecthorus/wenet:latest
else else
echo "No valid SDR type specified! Please enter RTLSDR or KA9Q!" echo "No valid SDR type specified! Please enter RTLSDR or KA9Q!"
exit 0 exit 0