diff --git a/asound.conf b/asound.conf index a752802a..82947c47 100644 --- a/asound.conf +++ b/asound.conf @@ -33,16 +33,28 @@ pcm.shared_speaker { } # Recording with input mixing -pcm.shared_mic { +pcm.shared_mic_raw { type dsnoop + ipc_key 2048 ipc_perm 0666 + slave { pcm "hw:CARD=Device,DEV=0" -# channels 1 + channels 1 rate 48000 - period_time 0 period_size 1024 buffer_size 4096 } } + +pcm.shared_mic { + type softvol + + slave.pcm "shared_mic_raw" + + control { + name "MicVolume" + card 2 + } +} diff --git a/config b/config index ee15e394..624f5c72 100755 --- a/config +++ b/config @@ -1580,15 +1580,17 @@ elif [ "$1" = "-L" ]; then echo if [ -z "$param2" ] ; then - echo -e "Enter microphone level in percentage (integer 0 - 100): " + echo -e "Enter microphone level (integer 0 - 255): " read mic else mic="$param2" fi if ! [ -z $mic ] && [[ $mic =~ ^[+-]?[0-9]+([.][0-9]+)?$ ]] ; then + systemctl --user stop wireplumber echo "Updating mic level to" $mic "%" - value=`arecord -l | grep "card"` && echo "$value" > /dev/null && set -- $value && amixer -c ${2:0:1} set Mic $mic% + value=`arecord -l | grep "card"` && echo "$value" > /dev/null && set -- $value && amixer -c ${2:0:1} set MicVolume $mic + systemctl --user start wireplumber else echo "Not updating mic level" fi diff --git a/direwolf-cc.conf b/direwolf-cc.conf index af71089d..d6baa9ef 100644 --- a/direwolf-cc.conf +++ b/direwolf-cc.conf @@ -4,6 +4,6 @@ MYCALL AMSAT CHANNEL 0 MODEM 1200 FULLDUP OFF -TXDELAY 0 +#TXDELAY 0 AGWPORT 8200 -KISSPORT 8201 +KISSPORT 8203 diff --git a/direwolf/direwolf-pacsatsim.conf b/direwolf/direwolf-pacsatsim.conf index b96fc68f..8353c396 100644 --- a/direwolf/direwolf-pacsatsim.conf +++ b/direwolf/direwolf-pacsatsim.conf @@ -3,7 +3,7 @@ MODEM 1200 DWAIT 0 SLOTTIME 10 PERSIST 63 -TXDELAY 1000 +TXDELAY 30 TXTAIL 10 FULLDUP OFF DIGIPEAT 0 0 ^WIDE[3-7]-[1-7]$|^TEST$ ^WIDE[12]-[12]$ TRACE diff --git a/groundstation/direwolf/direwolf-pacsat.conf b/groundstation/direwolf/direwolf-pacsat.conf index 3b9d337b..0d4ba0e1 100644 --- a/groundstation/direwolf/direwolf-pacsat.conf +++ b/groundstation/direwolf/direwolf-pacsat.conf @@ -3,7 +3,7 @@ MODEM 1200 KISSPORT 8100 AGWPORT 8002 DWAIT 20 -SLOTTIME 300 +SLOTTIME 10 PERSIST 63 -TXDELAY 1000 +TXDELAY 30 FULLDUP OFF diff --git a/groundstation/pacsat.sh b/groundstation/pacsat.sh index 40fbc67c..1e937470 100755 --- a/groundstation/pacsat.sh +++ b/groundstation/pacsat.sh @@ -46,6 +46,9 @@ fi if [[ $(arecord -l | grep "USB Audio Device") ]] ; then echo "USB Sound Card detected" soundcard=1 + systemctl --user stop wireplumber + amixer -c 2 set MicVolume 200 + systemctl --user start wireplumber else echo "No USB Sound Card detected" soundcard=0 diff --git a/pacsatsim.sh b/pacsatsim.sh index e7e5d679..7eb15337 100755 --- a/pacsatsim.sh +++ b/pacsatsim.sh @@ -41,6 +41,9 @@ fi if [[ $(arecord -l | grep "USB Audio Device") ]] ; then echo "USB Sound Card detected" soundcard=1 + systemctl --user stop wireplumber + amixer -c 2 set MicVolume 200 + systemctl --user start wireplumber else echo "No USB Sound Card detected" soundcard=0