Merge branch 'dev' into ARQ

This commit is contained in:
DJ2LS 2021-01-16 15:08:12 +01:00 committed by GitHub
commit 8c4e0fee83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions

View file

@ -3,7 +3,6 @@
My first attempt to learn more about FreeDV and how to create a TNC which gets data from a TCP/IP socket My first attempt to learn more about FreeDV and how to create a TNC which gets data from a TCP/IP socket
## Credits ## Credits
David Rowe and the FreeDV team for developing the modem and libraries David Rowe and the FreeDV team for developing the modem and libraries

View file

@ -1,11 +1,11 @@
#/bin/bash #/bin/bash
cd ~ cd ~
rm -rf FreeDV-Socket-TNC rm -rf FreeDV-JATE
git clone --branch dev https://github.com/DJ2LS/FreeDV-Socket-TNC.git git clone --branch dev https://github.com/DJ2LS/FreeDV-JATE.git
cd ~/FreeDV-Socket-TNC cd ~/FreeDV-JATE
rm -rf codec2 rm -rf codec2
git clone https://github.com/drowe67/codec2.git git clone https://github.com/drowe67/codec2.git
cd codec2 && mkdir build_linux && cd build_linux cd codec2 && mkdir build_linux && cd build_linux
@ -13,14 +13,14 @@ cmake ../
make make
cd ~/FreeDV-Socket-TNC cd ~/FreeDV-JATE
rm -rf LPCNet rm -rf LPCNet
git clone https://github.com/drowe67/LPCNet git clone https://github.com/drowe67/LPCNet
cd LPCNet && mkdir build_linux && cd build_linux cd LPCNet && mkdir build_linux && cd build_linux
cmake -DCODEC2_BUILD_DIR=~/FreeDV-Socket-TNC/codec2/build_linux ../ cmake -DCODEC2_BUILD_DIR=~/FreeDV-JATE/codec2/build_linux ../
make make
cd ~/FreeDV-Socket-TNC/codec2/build_linux && rm -Rf * cd ~/FreeDV-Socket-TNC/codec2/build_linux && rm -Rf *
cmake -DLPCNET_BUILD_DIR=~/FreeDV-Socket-TNC/LPCNet/build_linux .. cmake -DLPCNET_BUILD_DIR=~/FreeDV-JATE/LPCNet/build_linux ..
make make