From 3c37e93a0a6178c8b3a89f294e77fe7a8a0b394a Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 20 Oct 2022 12:23:40 -0500 Subject: [PATCH 1/9] update --- changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 447dc20..a560ea6 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ -release=2.10.0 +release=2.11.0 Changelog +2.11.0 add auto start modem 2.10.0 add VARA to getardoplist script add VARA to getardoplist-cron script add Pat Autoconnect VARA script From f20ee5359f99ee2168703e8c20257feb2e89fe93 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 20 Oct 2022 12:23:52 -0500 Subject: [PATCH 2/9] update --- manage-pat | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/manage-pat b/manage-pat index cb0b7b2..12dfb5c 100755 --- a/manage-pat +++ b/manage-pat @@ -4,7 +4,22 @@ export MYPATH=$HOME/patmenu2 LOGO=$MYPATH/pmlogo.png source $MYPATH/manage-pat-functions MAIN=$MYPATH/patmenu +CUR=$(cat $MYPATH/.autostart.conf | awk -F "/" '{print $NF}' | sed 's/"//') +if [ -z "$CUR" ]; then +CUR=None +else + #set pretty name for display + if [ $CUR = 'start-vara-hf' ]; then + CUR=VARA-HF + elif [ $CUR = 'start-vara-fm' ]; then + CUR=VARA-FM + elif [ $CUR = 'start-pat-ardop' ]; then + CUR=ARDOP + elif [ $CUR = 'start-pat2m' ]; then + CUR=Packet + fi +fi yad --form --width=420 --text-align=center --center --title="Manage Pat" --text-align=center \ --image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ @@ -16,6 +31,7 @@ yad --form --width=420 --text-align=center --center --title="Manage Pat" --text- --field="Set ARDOP PTT":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; SETPTT"' \ --field="Set Listen Mode":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; LISTEN"' \ --field="Add P2P Alias":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; PEER"' \ +--field="Auto Start Modem - $CUR":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; AUTOMODEM"' \ --field="Delete Alias":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; DELETEALIAS"' \ --field="Backup Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; BKUPCONFIG"' \ --field="Restore Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; RESTORECONFIG"' \ @@ -26,6 +42,4 @@ BUT=$? if [ $BUT = 1 ]; then $MAIN & exit -fi - -echo $? \ No newline at end of file +fi \ No newline at end of file From 83d317a449f3659432d596bde526433130ba25e7 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 20 Oct 2022 12:24:01 -0500 Subject: [PATCH 3/9] update --- manage-pat-functions | 115 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/manage-pat-functions b/manage-pat-functions index 126fefe..7fdadeb 100644 --- a/manage-pat-functions +++ b/manage-pat-functions @@ -598,6 +598,119 @@ $MAIN fi } - +AUTOMODEM(){ +CONF=$HOME/patmenu2/.autostart.conf +HTTP_ADDR=$(grep http_addr $HOME/.config/pat/config.json | sed 's/.*": "//;s/:.*//') + +#pat server check +if [ "$HTTP_ADDR" = '127.0.0.1' ]; then +yad --form --width=420 --text-align=center --center --title="Auto Modem Start" --text-align=center \ +--image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ +--text="The Pat mailbox server is currently set to only accept connections from the Pi itself. \ +Typically if using the auto modem start feature, you will be accessing the Pat mailbox from \ +another device. Would you like to configure the system to accept connections over the network?" \ +--button="Keep Current Settings":1 \ +--button="Allow Network Connections":2 +BUT=$? + if [ $BUT = 2 ]; then + cp $HOME/.config/pat/config.json $HOME/.config/pat/config.json.bkup + sed -i 's/127.0.0.1/0.0.0.0/' $HOME/.config/pat/config.json + sudo systemctl restart pat@`whoami` + fi +fi + +source $CONF + +#Figure out which modem (if any) is set to auto start already and give it a pretty name. +CUR=$(echo $AUTO_CMD | awk -F "/" '{print $NF}') +if [ -z $CUR ]; then +echo +else + if [ $CUR = 'start-vara-hf' ]; then + CUR=VARA-HF + elif [ $CUR = 'start-vara-fm' ]; then + CUR=VARA-FM + elif [ $CUR = 'start-pat-ardop' ]; then + CUR=ARDOP + elif [ $CUR = 'start-pat2m' ]; then + CUR=Packet + fi +fi + +#check to see if we already have a autostart in place. Give user +#a chance to delete before adding a new one. Can only have one +#modem starting at a time. +if [ -f $CONF ]; then +yad --form --width=420 --text-align=center --center --title="Auto Modem Start" --text-align=center \ +--image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ +--text="Existing Auto Start Found - $CUR\rYou must delete the existing auto start before creating a new one. \ +Only one modem at a time can be set to auto start at boot." \ +--button="Delete Current":1 \ +--button="Keep Current":2 +BUT=$? + if [ $BUT = 1 ]; then + crontab -l > /run/user/$UID/tempcron.txt + rm $CONF + sed -i '/patmenu2\/start/d' /run/user/$UID/tempcron.txt + crontab /run/user/$UID/tempcron.txt + elif [ $BUT = 2 ]; then + $MAIN & + exit + elif [ $BUT = 252 ]; then + exit + fi +fi + +AUTO=$(yad --form --width=420 --text-align=center --center --title="Auto Modem Start" --text-align=center \ +--image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ +--text="Auto Modem Start by KM4ACK" \ +--field="Auto Start Modem on Boot":CB "NONE|VARA|VARA-FM|ARDOP|Packet") +BUT=$? + +AUTO=$(echo $AUTO | awk -F "|" '{print $1}') + +#give user chance to exit/cancel +if [ $BUT = 252 ]; then +exit +elif [ $BUT = 1 ]; then +$MAIN & +exit +fi + +#set command per user selection +if [ "$AUTO" = 'VARA' ]; then +echo "VARA Selected" +AUTO_CMD="sleep 15 && export DISPLAY=:0 && $HOME/patmenu2/start-vara-hf" +elif [ "$AUTO" = 'VARA-FM' ]; then +echo "VARA FM Selected" +AUTO_CMD="sleep 15 && export DISPLAY=:0 && $HOME/patmenu2/start-vara-fm" +elif [ "$AUTO" = 'ARDOP' ]; then +echo "ARDOP Selected" +AUTO_CMD="sleep 15 && export DISPLAY=:0 && $HOME/patmenu2/start-pat-ardop" +elif [ "$AUTO" = 'Packet' ]; then +echo "Packet Selected" +AUTO_CMD="sleep 15 && export DISPLAY=:0 && $HOME/patmenu2/start-pat2m" +elif [ "$AUTO" = 'NONE' ]; then +$MAIN & +exit +fi + +#send the command to the conf file +echo "AUTO_CMD=\"$AUTO_CMD\"" > $CONF + +#add auto start to current cron job +crontab -l > /run/user/$UID/tempcron.txt +echo "@reboot $AUTO_CMD" >> /run/user/$UID/tempcron.txt +crontab /run/user/$UID/tempcron.txt + +#give user feedback +yad --form --width=420 --text-align=center --center --title="Auto Modem Start" --text-align=center \ +--image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ +--text="$AUTO will auto start at boot\r\rIMPORTANT NOTE!\rThe sound card MUST be plugged in \ +before booting the Pi or the auto start feature will FAIL." \ +--button=gtk-ok +$MAIN & +exit +} From a7a726e243b007bb5c653e305ddb495843ad7a21 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 16 Feb 2023 07:16:15 -0600 Subject: [PATCH 4/9] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index a560ea6..f8e4ad6 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,7 @@ release=2.11.0 Changelog 2.11.0 add auto start modem + fix false failure when starting vara modems 2.10.0 add VARA to getardoplist script add VARA to getardoplist-cron script add Pat Autoconnect VARA script From 4984a084721460bba39209b4407372c6574fe542 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 16 Feb 2023 07:16:29 -0600 Subject: [PATCH 5/9] fix false failure --- start-vara-fm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start-vara-fm b/start-vara-fm index 72e7606..54c4ed6 100755 --- a/start-vara-fm +++ b/start-vara-fm @@ -32,7 +32,7 @@ FLRIG=$(echo $RIG | grep "\-m 4") fi #Check if modem is already running -MODEMCHECK=$(ps aux | grep -i box86 | grep -i varafm) +MODEMCHECK=$(ps aux | grep -i wine | grep -i varafm) if [ ! -z "$MODEMCHECK" ]; then yad --title="FAILED" --width=400 --height=100 \ --image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \ @@ -111,7 +111,7 @@ echo "starting VARA-FM" sleep 7 #give vara time to start #verify vara has started -PIDVARA=$(ps aux | grep -i box86 | grep -i varafm) +PIDVARA=$(ps aux | grep -i wine | grep -i varafm) if [ -z "$PIDVARA" ] then yad --title="FAILED" --width=400 --height=100 \ From 3cf61a2ef5a99c112336b233e7d56806c9cd958a Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 16 Feb 2023 07:16:43 -0600 Subject: [PATCH 6/9] fix false failure --- start-vara-hf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start-vara-hf b/start-vara-hf index cff0566..d659cbd 100755 --- a/start-vara-hf +++ b/start-vara-hf @@ -33,7 +33,7 @@ FLRIG=$(echo $RIG | grep "\-m 4") fi #Check if modem is already running -MODEMCHECK=$(ps aux | grep -i box86 | grep -i varafm) +MODEMCHECK=$(ps aux | grep -i wine | grep -i varafm) if [ ! -z "$MODEMCHECK" ]; then yad --title="FAILED" --width=400 --height=100 \ --image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \ @@ -112,7 +112,7 @@ echo "starting VARA HF" sleep 7 #give vara time to start #verify vara has started -PIDVARA=$(ps aux | grep -i box86 | grep VARA.exe) +PIDVARA=$(ps aux | grep -i wine | grep VARA.exe) if [ -z "$PIDVARA" ] then yad --title="FAILED" --width=400 --height=100 \ From fa33a857c3983d75f8bd010689b24ad242bf8342 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 4 Mar 2023 07:07:11 -0600 Subject: [PATCH 7/9] update --- changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index f8e4ad6..21a3858 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ -release=2.11.0 +release=2.12.0 Changelog +2.12.0 add support for mobilinkd TNC 4 2.11.0 add auto start modem fix false failure when starting vara modems 2.10.0 add VARA to getardoplist script From ee9f294b3c9fb132254a5c829bbdcf42335c053f Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 4 Mar 2023 07:07:33 -0600 Subject: [PATCH 8/9] add support mobilinkd tnc4 --- mobilink | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mobilink b/mobilink index a1c5629..a68c600 100755 --- a/mobilink +++ b/mobilink @@ -2,7 +2,7 @@ #script to connect mobilinkd TNC for ax25 #20200602 -#20220304 last edit KM4ACK +#20230304 last edit KM4ACK ################################################################ # # # # # # # # # ##### # # # @@ -78,23 +78,25 @@ hcitool scan > $TMPFILE #Decide if its a TNC 2 or 3 TNC2=$(grep -i TNC2 $TMPFILE) TNC3=$(grep -i TNC3 $TMPFILE) -if [ -z "$TNC2" ] -then -MAC=$(grep -i mobi $TMPFILE | awk '{ print $1 }') -TNC=3 -elif [ -z "$TNC3" ] -then +TNC4=$(grep -i TNC4 $TMPFILE) +if [ -n "$TNC2" ]; then MAC=$(grep -i mobi $TMPFILE | awk '{ print $1 }') TNC=2 +elif [ -n "$TNC3" ]; then +MAC=$(grep -i mobi $TMPFILE | awk '{ print $1 }') +TNC=3 +elif [ -n "$TNC4" ]; then +MAC=$(grep -i mobi $TMPFILE | awk '{ print $1 }') +TNC=4 fi #set correct connection commmand -if [ $TNC = "2" ] -then +if [ $TNC = "2" ]; then CONNECT="sudo rfcomm bind /dev/rfcomm0 $MAC" -elif [ $TNC = "3" ] -then +elif [ $TNC = "3" ]; then CONNECT="sudo rfcomm bind /dev/rfcomm0 $MAC 6" +elif [ $TNC = "4" ]; then +CONNECT="sudo rfcomm bind /dev/rfcomm0 $MAC" fi #See if device was found and connect if found From ca9c2914c11c4ff51223a8cb003e1f0210fdaee2 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 6 Mar 2023 13:05:31 -0600 Subject: [PATCH 9/9] fix version num --- changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 21a3858..893ecc9 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,8 @@ -release=2.12.0 +release=2.11.0 Changelog -2.12.0 add support for mobilinkd TNC 4 -2.11.0 add auto start modem +2.11.0 add support for mobilinkd TNC 4 + add auto start modem fix false failure when starting vara modems 2.10.0 add VARA to getardoplist script add VARA to getardoplist-cron script