Skip to content

Modemstart fix #73

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Modemstart fix #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b08549
correct modem detection
SpudGunMan Oct 21, 2022
734bb35
timeout to 10second
SpudGunMan Oct 21, 2022
e85cda1
correct detection
SpudGunMan Oct 21, 2022
3166f4e
cleanup for 2.10.1
SpudGunMan Oct 21, 2022
e7734db
fix merge from lastnight
SpudGunMan Oct 21, 2022
2cefd96
Merge branch 'dev' into modemstart-fix
SpudGunMan Oct 21, 2022
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
4 changes: 3 additions & 1 deletion changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
release=2.11.0
release=2.11.1

Changelog
2.11.1 take VARA out of BETA status
fix VARA modem start and stop detection
2.11.0 add auto start modem
2.10.0 add VARA to getardoplist script
add VARA to getardoplist-cron script
Expand Down
4 changes: 2 additions & 2 deletions modems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ yad --form --width=420 --text-align=center --center --title="Pat Menu" --text-al
--field="Start Packet Modem":fbtn 'bash -c "$MYPATH/start-pat2m"' \
--field="Start Mobilinkd Modem Bluetooth":fbtn 'bash -c "$MYPATH/mobilink"' \
--field="Start Mobilinkd Modem Wired":fbtn 'bash -c "$MYPATH/mobi-wired"' \
--field="Start VARA Modem (BETA)":fbtn 'bash -c "$MYPATH/start-vara-hf"' \
--field="Start VARA FM Modem (BETA)":fbtn 'bash -c "$MYPATH/start-vara-fm"' \
--field="Start VARA Modem":fbtn 'bash -c "$MYPATH/start-vara-hf"' \
--field="Start VARA FM Modem":fbtn 'bash -c "$MYPATH/start-vara-fm"' \
--field="Stop Modems":fbtn 'bash -c "$MYPATH/stop-modems"' \
--button="Main Menu":1
BUT=$?
Expand Down
6 changes: 3 additions & 3 deletions start-vara-fm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -108,10 +108,10 @@ fi

echo "starting VARA-FM"
/usr/local/bin/wine $HOME/.wine/drive_c/VARA\ FM/VARAFM.exe > /dev/null 2>&1 &
sleep 7 #give vara time to start
sleep 10 #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 \
Expand Down
6 changes: 3 additions & 3 deletions start-vara-hf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 vara)
if [ ! -z "$MODEMCHECK" ]; then
yad --title="FAILED" --width=400 --height=100 \
--image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \
Expand Down Expand Up @@ -109,10 +109,10 @@ fi

echo "starting VARA HF"
/usr/local/bin/wine $HOME/.wine/drive_c/VARA/VARA.exe > /dev/null 2>&1 &
sleep 7 #give vara time to start
sleep 10 #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 -i vara)
if [ -z "$PIDVARA" ]
then
yad --title="FAILED" --width=400 --height=100 \
Expand Down