Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add wfview wfserver to bap #457

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ Winlink client for Raspberry Pi https://getpat.io/
#### PATMENU:
Menu for configuring Pat. Recommended if installing Pat. https://github.com/km4ack/patmenu

#### wfview & wfserver
wfview is a program developed by amateur radio enthusiasts to control modern Icom ham radios https://wfview.org

#### ARDOPC:
HF modem for Pat. Recommended if installing Pat. https://www.cantab.net/users/john.wiseman/Documents/ARDOPC.html

Expand Down
35 changes: 35 additions & 0 deletions app-check
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,41 @@ else
echo "QTSOUND=Not_Installed" >> $UPDATEFILE
fi

#----------------------------------------------------#
# wfview
#----------------------------------------------------#
if [ -f /usr/local/bin/wfview ]; then
echo "Checking wfview"
WFVIEW_CURRENT_VER=$(wfview --version | grep version | sed 's/wfview version: //' | cut -c1-4)
WFVIEW_LATEST=$(curl -s https://gitlab.com/eliggett/wfview/-/raw/master/WHATSNEW | grep + | tail -n 1 | sed 's/+ //' | cut -c1-4)

if (($(echo "${WFVIEW_LATEST} ${WFVIEW_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then
echo "WFVIEW=NEEDS-UPDATE" >> $UPDATEFILE
else
echo "WFVIEW=is_latest_version" >> $UPDATEFILE
fi

else
echo "WFVIEW=Not_Installed" >> $UPDATEFILE
fi
#----------------------------------------------------#
# wfviewsvr
#----------------------------------------------------#
if [ -f /usr/local/bin/wfserver ]; then
echo "Checking wfserver"
WFSERVER_CURRENT_VER=$(wfserver --version | grep version | sed 's/wfserver version: //' | cut -c1-4)
WFSERVER_LATEST=$(curl -s https://gitlab.com/eliggett/wfview/-/raw/master/WHATSNEW | grep + | tail -n 1 | sed 's/+ //' | cut -c1-4)

if (($(echo "${WFSERVER_LATEST} ${WFSERVER_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then
echo "WFSERVER=NEEDS-UPDATE" >> $UPDATEFILE
else
echo "WFSERVER=is_latest_version" >> $UPDATEFILE
fi

else
echo "WFSERVER=Not_Installed" >> $UPDATEFILE
fi

#----------------------------------------------------#
# Repeater-Start
#----------------------------------------------------#
Expand Down
6 changes: 4 additions & 2 deletions build-a-pi
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "ARDOP" "Modem for HF" \
false "ARDOPGUI" "GUI for ARDOP" \
false "VARA" "VARA Modem - <b>Pi 4 Required</b>" \
false "WFSERVER" "wfserver for Icom Radios" \
false "HAMLIB" "Needed for Rig Control" \
false "DIREWOLF" "Software TNC" \
false "AX25" "Data Link Layer Protocol" \
Expand All @@ -253,7 +254,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi

if [ ${BUT} = 3 ]; then
BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA HAMLIB DIREWOLF AX25 PULSE GPSUPDATE)
BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA WFSERVER HAMLIB DIREWOLF AX25 PULSE GPSUPDATE)
for i in "${BASEAPPS[@]}"; do
echo "$i" >>${BASE}
done
Expand Down Expand Up @@ -403,6 +404,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "CONKY" "System Information Display" \
false "PI-APRS" "APRS Message Application" \
false "CHIRP" "Program Radios" \
false "WFVIEW" "wfview controller for Icom radios" \
false "GARIM" "File Transfer Program" \
false "PAT" "Radio Email Application" \
false "PAT-MENU" "Control for Pat Winlink" \
Expand Down Expand Up @@ -432,7 +434,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then
fi

if [ ${BUT} = 3 ]; then
ADDAPPS=(CONKY PI-APRS CHIRP GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO
HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL
GRIDCALC CQRLOG REPEAT)

Expand Down
41 changes: 41 additions & 0 deletions functions/additional.function
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,47 @@ EOF

}

################################
# WFVIEW
################################
WFVIEW() {

sudo apt-get install -y libasound2-dev cmake build-essential libudev-dev qt5-qmake libqt5core5a
sudo apt-get -y install build-essential
sudo apt-get -y install qt5-qmake
sudo apt-get -y install libqt5core5a
sudo apt-get -y install qtbase5-dev
sudo apt-get -y install libqt5serialport5 libqt5serialport5-dev
sudo apt-get -y install libqt5multimedia5
sudo apt-get -y install libqt5multimedia5-plugins
sudo apt-get -y install libqt5xml5
sudo apt-get -y install qtmultimedia5-dev
sudo apt-get -y install libopus-dev
sudo apt-get -y install libeigen3-dev
sudo apt-get -y install libportaudio2 libportaudiocpp0
sudo apt-get -y install portaudio19-dev
sudo apt-get -y install librtaudio-dev librtaudio6
sudo apt-get -y install git
echo "Only one of the next two commands need to work."
sudo apt-get -y install libqcustomplot1.3 libqcustomplot-doc libqcustomplot-dev
sudo apt-get -y install libqcustomplot2.0 libqcustomplot-doc libqcustomplot-dev

cd ${BUILDDIR}
rm -rf wfview

git clone --depth 1 https://gitlab.com/eliggett/wfview.git

cd ${BUILDDIR}/wfview || return
git submodule init
git submodule update

mkdir build
cd build
qmake ../wfview.pro
make -j2
sudo make install

}

##################################
# PROPAGATION
Expand Down
41 changes: 41 additions & 0 deletions functions/base.function
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,47 @@ DIREWOLF() {

}

################################
# WFSERVER
################################
WFSERVER() {

sudo apt-get -y install build-essential
sudo apt-get -y install qt5-qmake
sudo apt-get -y install libqt5core5a
sudo apt-get -y install qtbase5-dev
sudo apt-get -y install libqt5serialport5 libqt5serialport5-dev
sudo apt-get -y install libqt5multimedia5
sudo apt-get -y install libqt5multimedia5-plugins
sudo apt-get -y install libqt5xml5
sudo apt-get -y install qtmultimedia5-dev
sudo apt-get -y install libopus-dev
sudo apt-get -y install libeigen3-dev
sudo apt-get -y install libportaudio2 libportaudiocpp0
sudo apt-get -y install portaudio19-dev
sudo apt-get -y install librtaudio-dev librtaudio6
sudo apt-get -y install git
echo "Only one of the next two commands need to work."
sudo apt-get -y install libqcustomplot1.3 libqcustomplot-doc libqcustomplot-dev
sudo apt-get -y install libqcustomplot2.0 libqcustomplot-doc libqcustomplot-dev

cd ${BUILDDIR} || return
rm -rf wfserver

git clone --depth 1 https://gitlab.com/eliggett/wfview.git ./wfserver

cd ${BUILDDIR}/wfserver || return
git submodule init
git submodule update

mkdir build
cd build
qmake ../wfserver.pro
make -j2
sudo make install

}

################################
# AX25
################################
Expand Down
2 changes: 2 additions & 0 deletions update
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "ARDOP" "$ARDOP" "Mode for HF" \
false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \
false "VARA" "$VARA" "VARA Modem - <b>Pi 4 Required</b>" \
false "WFSERVER" "$WFSERVER" "wfview server for Icom radios" \
false "DIREWOLF" "$DIRE" "Software TNC" \
false "AX25" "$AX25" "Data Link Layer Protocol" \
false "PULSE" "$PULSE" "Sound server" \
Expand Down Expand Up @@ -462,6 +463,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \
false "PAT" "$PAT" "Radio Email Application" \
false "PAT-MENU" "$PATMENU" "Control for Pat Winlink" \
false "CHIRP" "$CHIRP" "Program Radios" \
false "WFVIEW" "$WFVIEW" "wfview Icom radio controller" \
false "GARIM" "$GARIM" "File Transfer Program " \
false "VARIM" "$VARIM" "Radio Chat VARA" \
false "M0IAX" "$M0IAX" "Tools for JS8Call messages" \
Expand Down