diff --git a/start_docker.sh b/start_docker.sh index c00dbe1..f5331a1 100644 --- a/start_docker.sh +++ b/start_docker.sh @@ -28,6 +28,17 @@ GAIN=0 BIAS=0 +# Baud Rate & FSK Demod Oversampling Settings +# +# Default: 115177 baud 8x oversampling (Default using a RPi Zero W's UART) +# Other parameters which *may* work, but are un-tested: +# 9600 baud, 100x oversampling +# 4800 baud, 200x oversampling +# +BAUD_RATE=115177 +OVERSAMPLING=8 + + # Stop and remove any existing wenet instances echo "Stopping/Removing any existing Wenet instances..." docker stop wenet || true && docker rm wenet || true @@ -40,6 +51,8 @@ docker run -d \ -e RXFREQ=$RXFREQ \ -e GAIN=$GAIN \ -e BIAS=$BIAS \ + -e BAUD_RATE=$BAUD_RATE \ + -e OVERSAMPLING=$OVERSAMPLING \ -v ~/wenet/rx_images/:/opt/wenet/rx_images/ \ --device /dev/bus/usb \ -p 5003:5003 \ diff --git a/start_tx.sh b/start_tx.sh index cadb8dc..8255398 100755 --- a/start_tx.sh +++ b/start_tx.sh @@ -1,31 +1,41 @@ #!/bin/bash # # Wenet TX-side Initialisation Script -# 2016-12-05 Mark Jessop +# 2022-03-19 Mark Jessop # # Run this to set up an attached RFM22B/RFM98W and start transmitting! # Replace the transmit frequency and callsign with your own. # +# A callsign which will be included in the Wenet Packets. +# This MUST be <= 6 characters long. MYCALL=N0CALL -TXFREQ=441.200 + +# The centre frequency of the Wenet transmission. +TXFREQ=443.500 # Baud Rate -# Known working transmit baud rates are 115200 (the preferred default), 9600 and 4800 baud. +# Known working transmit baud rates are 115200 (the preferred default). +# Lower baud rates *may* work, but will need a lot of testing on the receiver +# chain to be sure they perform correctly. BAUDRATE=115200 +# GPS Port +# Note that we only support uBlox GPS units +GPSPORT=/dev/ttyACM0 + # CHANGE THE FOLLOWING LINE TO REFLECT THE ACTUAL PATH TO THE TX FOLDER. # i.e. it may be /home/username/dev/wenet/tx/ cd /home/pi/wenet/tx/ -#Uncomment to initialise a RFM22B +#Uncomment to initialise a RFM22B (untested with Python 3) #python init_rfm22b.py $TXFREQ # Uncomment for use with a RFM98W -python init_rfm98w.py --frequency $TXFREQ --baudrate $BAUDRATE +python3 init_rfm98w.py --frequency $TXFREQ --baudrate $BAUDRATE # Start the main TX Script. -# Note, this assumes there is a uBlox GPS available at /dev/ttyACM0 -python tx_picam_gps.py --baudrate $BAUDRATE $MYCALL & +# Note that you can also add --logo /path/to/logo.png to this to add a logo overlay. +python3 tx_picam_gps.py --baudrate $BAUDRATE --gps $GPSPORT $MYCALL & # If you don't want any GPS overlays, you can comment the above line and run: # python WenetPiCam.py --baudrate $BAUDRATE $MYCALL &