jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Call improvements; fix bugs associated with hanging up; refresh bar on callend

Browse source
This commit is contained in:
Miles Alan 2020-06-21 15:31:00 -05:00
parent f88b83fd15
commit 91d6ebb15d
3 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
scripts/modem/sxmo_modemcall.sh
View file

@ -4,10 +4,11 @@ trap "gracefulexit" INT TERM
fatalerr() { fatalerr() {
# E.g. hangup all calls, switch back to default audio, notify user, and die # E.g. hangup all calls, switch back to default audio, notify user, and die
sxmo_vibratepine 1000 sxmo_vibratepine 1000 &
mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all
alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore
notify-send "$1" notify-send "$1"
(sleep 0.5; echo 1 > /tmp/sxmo_bar) &
kill -9 0 kill -9 0
} }
@ -69,7 +70,6 @@ toggleflagset() {
FLAGS="$(toggleflag "$1" "$FLAGS")" FLAGS="$(toggleflag "$1" "$FLAGS")"
} }
dialmenu() { dialmenu() {
CONTACTS="$(contacts)" CONTACTS="$(contacts)"
NUMBER="$( NUMBER="$(
@ -112,7 +112,7 @@ hangup() {
CALLID="$1" CALLID="$1"
modem_cmd_errcheck -m "$(modem_n)" -o "$CALLID" --hangup modem_cmd_errcheck -m "$(modem_n)" -o "$CALLID" --hangup
log_event "call_hangup" "$CALLID" log_event "call_hangup" "$CALLID"
fatalerr "Call hungup ok" fatalerr "Call with $NUMBER terminated"
exit 1 exit 1
} }
@ -144,7 +144,7 @@ incallmonitor() {
while true; do while true; do
echo 1 > /tmp/sxmo_bar echo 1 > /tmp/sxmo_bar
if mmcli -m "$(modem_n)" -K -o "$CALLID" | grep -E "^call.properties.state.+terminated"; then if mmcli -m "$(modem_n)" -K -o "$CALLID" | grep -E "^call.properties.state.+terminated"; then
fatalerr "$NUMBER hung up the call" fatalerr "Call with $NUMBER terminated"
fi fi
echo "Call still in progress" echo "Call still in progress"
sleep 3 sleep 3
@ -152,18 +152,20 @@ incallmonitor() {
} }
incallmenuloop() { incallmenuloop() {
echo "Current flags are $FLAGS"
CHOICES=" CHOICES="
Volume ↑ ^ sxmo_vol.sh up $([ "$WINDOWIFIED" = 0 ] && echo Windowify || echo Unwindowify) ^ togglewindowify
Volume ↓ ^ sxmo_vol.sh down $([ "$WINDOWIFIED" = 0 ] && echo 'Screenlock ^ togglewindowify; sxmo_screenlock &')
Mic $(echo -- "$FLAGS" | grep -q -- -m && echo ✓) ^ toggleflagset -m Volume ↑ ^ sxmo_vol.sh up
Linemic $(echo -- "$FLAGS" | grep -q -- -l && echo ✓) ^ toggleflagset -l Volume ↓ ^ sxmo_vol.sh down
Echomic $(echo -- "$FLAGS" | grep -q -- -z && echo ✓) ^ toggleflagset -z Earpiece $(echo -- "$FLAGS" | grep -q -- -e && echo ✓) ^ toggleflagset -e
Earpiece $(echo -- "$FLAGS" | grep -q -- -e && echo ✓) ^ toggleflagset -e Mic $(echo -- "$FLAGS" | grep -q -- -m && echo ✓) ^ toggleflagset -m
Linejack $(echo -- "$FLAGS" | grep -q -- -h && echo ✓) ^ toggleflagset -h Linejack $(echo -- "$FLAGS" | grep -q -- -h && echo ✓) ^ toggleflagset -h
Speakerphone $(echo -- "$FLAGS" | grep -q -- -s && echo ✓) ^ toggleflagset -s Linemic $(echo -- "$FLAGS" | grep -q -- -l && echo ✓) ^ toggleflagset -l
DTMF Tones ^ dtmfmenu $CALLID Speakerphone $(echo -- "$FLAGS" | grep -q -- -s && echo ✓) ^ toggleflagset -s
Hangup ^ hangup $CALLID Echomic $(echo -- "$FLAGS" | grep -q -- -z && echo ✓) ^ toggleflagset -z
$([ "$WINDOWIFIED" = 0 ] && echo Windowify || echo Unwindowify) ^ togglewindowify DTMF Tones ^ dtmfmenu $CALLID
Hangup ^ hangup $CALLID
" "
echo "$CHOICES" | echo "$CHOICES" |
xargs -0 echo | xargs -0 echo |
@ -173,9 +175,11 @@ incallmenuloop() {
dmenu -idx $DMENUIDX -l 14 "$([ "$WINDOWIFIED" = 0 ] && echo "-c" || echo "-wm")" -fn "Terminus-30" -p "$NUMBER" | dmenu -idx $DMENUIDX -l 14 "$([ "$WINDOWIFIED" = 0 ] && echo "-c" || echo "-wm")" -fn "Terminus-30" -p "$NUMBER" |
( (
PICKED="$(cat)"; PICKED="$(cat)";
echo "$PICKED" | grep -Ev "." && fatalerr "$NUMBER hung up the call" echo "Picked is $PICKED"
CMD=$(echo "$CHOICES" | grep "$PICKED" | cut -d '^' -f2) echo "$PICKED" | grep -Ev "."
CMD=$(echo "$CHOICES" | grep "$PICKED" | cut -d'^' -f2)
DMENUIDX=$(echo "$(echo "$CHOICES" | grep -n "$PICKED" | cut -d ':' -f1)" - 1 | bc) DMENUIDX=$(echo "$(echo "$CHOICES" | grep -n "$PICKED" | cut -d ':' -f1)" - 1 | bc)
echo "Eval in call context: $CMD"
eval "$CMD" eval "$CMD"
incallmenuloop incallmenuloop
) & wait # E.g. bg & wait to allow for SIGINT propogation ) & wait # E.g. bg & wait to allow for SIGINT propogation
@ -189,7 +193,7 @@ dtmfmenu() {
while true; do while true; do
PICKED="$( PICKED="$(
echo "$NUMS" | grep -o . | sed '1 iReturn to Call Menu' | echo "$NUMS" | grep -o . | sed '1 iReturn to Call Menu' |
dmenu -l 20 -fn Terminus-20 -c -idx $DTMFINDEX -p "DTMF Tone" dmenu "$([ "$WINDOWIFIED" = 0 ] && echo "-c" || echo "-wm")" -l 20 -fn Terminus-20 -c -idx $DTMFINDEX -p "DTMF Tone"
)" )"
echo "$PICKED" | grep "Return to Call Menu" && return echo "$PICKED" | grep "Return to Call Menu" && return
DTMFINDEX=$(echo "$NUMS" | grep -bo "$PICKED" | cut -d: -f1 | xargs -IN echo 2+N | bc) DTMFINDEX=$(echo "$NUMS" | grep -bo "$PICKED" | cut -d: -f1 | xargs -IN echo 2+N | bc)

2
scripts/modem/sxmo_modemlog.sh
View file

@ -1,3 +1,3 @@
#!/usr/bin/env sh #!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
st -f "Terminus-14" -e tail -f "$LOGDIR"/modemlog.tsv st -f "Terminus-14" -e tail -n9999 -f "$LOGDIR"/modemlog.tsv

2
scripts/modem/sxmo_modemtext.sh
View file

@ -76,7 +76,7 @@ sendtextmenu() {
} }
tailtextlog() { tailtextlog() {
st -e tail -f "$LOGDIR/$1/sms.txt" st -e tail -n9999 -f "$LOGDIR/$1/sms.txt"
} }
main() { main() {