Merge pull request #168 from km4ack/beta

Beta
km4ack · Nov 6, 2020 · 8ea13d0 · 8ea13d0
2 parents 9061ac1 + af3ba07
commit 8ea13d0
Show file tree

Hide file tree

Showing 12 changed files with 344 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -19,12 +19,7 @@ For Pat Winlink:
 Winlink Password & Grid Square
 
 # Install
-This script is intended to run on a brand new installation of Buster. It should not be run on a pi that you have already started installing applications on. Install additional apps that you require after running this script.\
-\
-Get Debian Buster from https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/ file debian-10.4.0-arm64-xfce-CD-1.iso
-NOTE: The Debian Buster arm64 image does not come with RealVNC server pre-installed, as it does with Raspbian. The reason is that RealVNC package is currently compiled for the armhf version of libbcm_host.so, which is a hook into the Broadcom GPU chip. As of 2020-06-27, it is not yet possible to get Debian Buster ARM64 to work with VNC.
-
-If this is a problem for you, then you will need to download Raspberry Pi OS (previously called Rasbian) 32-bit from https://downloads.raspberrypi.org/raspios_armhf_latest
+Download Raspberry Pi OS (previously called Rasbian) 32-bit from https://downloads.raspberrypi.org/raspios_armhf_latest
 
 Use a USB flash application such as Balena Etcher to copy the iso file to a USB key, get it at https://www.balena.io/etcher/
 

diff --git a/build-a-pi b/build-a-pi
@@ -341,7 +341,6 @@ false "PAT-MENU" "Control for Pat Winlink" \
 false "JS8CALL" "Weak Signal Digital Mode Software" \
 false "M0IAX" "Tools for JS8Call Messages" \
 false "WSJTX" "Weak Signal Digital Mode Software" \
-false "JTDX" "Weak Signal Digital Mode Software" \
 false "PYQSO" "Logging Software" \
 false "CQRLOG" "Logging Software" \
 false "XLOG" "Logging Software" \
@@ -365,7 +364,7 @@ fi
 if [ $BUT = 3 ]; then
 ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO \
 CQRLOG EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL \
-XLOG JTDX)
+XLOG)
 
 for i in "${ADDAPPS[@]}"
 do
@@ -416,6 +415,13 @@ false "TEMPCONVERT" "Temperature Converter" \
 false "GPARTED" "Disk Utility Tool" \
 false "SHOWLOG" "Log file viewer" \
 false "PISTATS" "Pi3/4 Stats Monitor" \
+false "TELNET" "Telnet Protocol" \
+false "PITERM" "piQtTermTCP Terminal Program" \
+false "SECURITY" "File Encryption Software" \
+false "YGATE" "Yaesu APRS Software" \
+false "BPQ" "LinBPQ Software" \
+false "BATT" "Battery Test Script" \
+false "VNC" "VNC Client Application" \
 --button="Exit":1 \
 --button="Check All and Continue":3 \
 --button="Install Selected":2 > $UTILITY
@@ -425,7 +431,7 @@ exit
 fi
 
 if [ $BUT = 3 ]; then
-UTILAPPS=(DIPOLE CALLSIGN TEMPCONVERT GPARTED SHOWLOG PISTATS)
+UTILAPPS=(DIPOLE CALLSIGN TEMPCONVERT GPARTED SHOWLOG PISTATS TELNET PITERM SECURITY YGATE BPQ BATT VNC)
 for i in "${UTILAPPS[@]}"
 do
 echo "$i" >> $UTILITY

diff --git a/changelog b/changelog
@@ -1,4 +1,23 @@
-version=3.0.4
+version=3.0.5
+
+3.0.5		Fix RTC https://github.com/km4ack/pi-build/issues/139
+		Add Telnet https://github.com/km4ack/pi-build/issues/129
+		Fix GPS conflict https://github.com/km4ack/pi-build/issues/146
+		Add Security Tool File Encryption https://github.com/km4ack/pi-build/issues/148
+		Add PTT command to direwolf.conf (commented out by default)
+		Fix curl "body write fail" in update script
+		Fix https://github.com/km4ack/pi-build/issues/152
+		Fix https://github.com/km4ack/pi-build/issues/155
+		Add YGATE - https://github.com/craigerl/ygate/blob/master/ygate.py
+		Add XGPS menu item - https://github.com/km4ack/pi-build/issues/156
+		update README.md
+		add LinBPQ
+		fix https://github.com/km4ack/pi-build/issues/105 (Conky display issue)
+		add Battery Test Script
+		add piQtTermTCP
+		Remove JTDX (Website Down) see - https://github.com/km4ack/pi-build/issues/153
+		add VNC viewer
+		fix direwolf build procedure https://github.com/km4ack/pi-build/issues/163
 
 3.0.4		Add gitignore
 		Fix Issue #109 https://github.com/km4ack/pi-build/issues/109

diff --git a/conky/conky-7inch b/conky/conky-7inch
@@ -25,7 +25,7 @@ no_buffers yes
 uppercase no
 cpu_avg_samples 2
 net_avg_samples 1
-override_utf8_locale no
+override_utf8_locale yes
 use_spacer right
 TEXT
 

diff --git a/conky/conky-large b/conky/conky-large
@@ -26,7 +26,7 @@ conky.config = {
 	uppercase = false,
 	cpu_avg_samples = 2,
 	net_avg_samples = 1,
-	override_utf8_locale = false,
+	override_utf8_locale = true,
 	use_spacer = 'right',
 };
 

diff --git a/conky/conky-medium b/conky/conky-medium
@@ -26,7 +26,7 @@ conky.config = {
 	uppercase = false,
 	cpu_avg_samples = 2,
 	net_avg_samples = 1,
-	override_utf8_locale = false,
+	override_utf8_locale = true,
 	use_spacer = 'right',
 };
 

diff --git a/conky/conky-small b/conky/conky-small
@@ -26,7 +26,7 @@ conky.config = {
 	uppercase = false,
 	cpu_avg_samples = 2,
 	net_avg_samples = 1,
-	override_utf8_locale = false,
+	override_utf8_locale = true,
 	use_spacer = 'right',
 };
 

diff --git a/conky/get-vfo b/conky/get-vfo
@@ -3,7 +3,7 @@
 #get VFO of radio to display in conky
 #20200428
 
-source "$HOME/patmenu/config"
+source "$HOME/patmenu2/config"
 
 MAIN () {
 

diff --git a/functions/additional.function b/functions/additional.function
@@ -121,6 +121,7 @@ CONKY(){
 	sudo apt install -y conky
 	fi
 touch $HOME/Documents/mylog.txt		#conky will fail to load if this file doesn't exist
+touch /var/lib/misc/dnsmasq.leases	#conky will fail to load if this file doesn't exist
 sudo apt-get install -y ruby2.5
 sudo gem install gpsd_client
 sudo gem install maidenhead
@@ -554,6 +555,10 @@ fi
 ##################################
 #	JTDX
 ##################################
+#This code is left in place but no option is given during inital
+#run or update because the jtdx website is down.
+#see https://github.com/km4ack/pi-build/issues/153
+#14OCT2020 KM4ACK
 
 JTDX(){
 cd $HOME

diff --git a/functions/base.function b/functions/base.function
@@ -53,6 +53,21 @@ rm $DIR/gpsinstall
 #GPS Variable set by main script or update script
 #and placed in config file
 sudo sed -i "s|DEVICES.*$|DEVICES=\"$GPS\"|g" /etc/default/gpsd
+
+#add xgps to menu
+cat > xgps.desktop <<EOF
+[Desktop Entry]
+Name=XGPS
+GenericName=XGPS
+Comment=GPS Date Viewer
+Exec=/usr/bin/xgps
+Icon=/usr/share/icons/Adwaita/scalable/devices/thunderbolt-symbolic.svg
+Terminal=false
+Type=Application
+Categories=Utility
+EOF
+
+sudo mv xgps.desktop /usr/share/applications/
 }
 
 ################################
@@ -115,12 +130,15 @@ DIREWOLF(){
 cd $HOME
 git clone https://www.github.com/wb2osz/direwolf
 cd $HOME/direwolf
-sudo apt-get install -y libasound2-dev
-make
+mkdir build && cd build
+sudo apt-get install -y libasound2-dev cmake
+cmake ..
+make -j 4
 sudo make install
 make install-conf
 sed -i "s/N0CALL/$CALL/" "$HOME/direwolf.conf"
 sed -i 's/# ADEVICE  plughw:1,0/ADEVICE  plughw:2,0/' $HOME/direwolf.conf
+sed -i '/#PTT\ \/dev\/ttyUSB0\ RTS/a #Uncomment line below for PTT with sabrent sound card\n#PTT RIG 2 localhost:4532' $HOME/direwolf.conf
 rm -rf $HOME/direwolf
 }