From 9faa1940a8afc7b7b00fc2d2cb24a44bcd840236 Mon Sep 17 00:00:00 2001 From: Ella Pietraroia Date: Thu, 27 Feb 2020 09:35:58 +1030 Subject: [PATCH] splitting into different main.go files for pi0 and pi3 --- cmd/audio-player/looper/README | 55 -------------------------------- cmd/audio-player/looper0/README | 4 +-- cmd/audio-player/looper0/main.go | 2 +- cmd/audio-player/looper3/main.go | 2 +- 4 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 cmd/audio-player/looper/README diff --git a/cmd/audio-player/looper/README b/cmd/audio-player/looper/README deleted file mode 100644 index b1065257..00000000 --- a/cmd/audio-player/looper/README +++ /dev/null @@ -1,55 +0,0 @@ -/* -NAME - test-audio/README - -AUTHORS - Ella Pietraroia - -LICENSE - revid is Copyright (C) 2017-2020 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - in gpl.txt. If not, see http://www.gnu.org/licenses. -*/ - -Pi Setup: -pull master -navigate to /go/src/bitbucket.org/ausocean/av/cmd/audio-player/looper - $sudo nano main.go -chage file variable at top of function to be wav file that you have put onto the pi (hint: spc command to put a new file on the pi) -and build -edit rc.local to run looper at boot - $sudo nano /etc/rc.local -paste this in after comments but before 'exit 0': ----------------------------------------------------------- - -exec 2> /tmp/rc.local.log # send stderr from rc.local to a log file -exec 1>&2 # send stdout to the same log file -printf "rc.local started" # show start of execution -set -x # tell sh to display commands before execution - -AUDIOPATH=/home/pi/go/src/bitbucket.org/ausocean/av/cmd/audio-player/looper -cd $AUDIOPATH - -./looper & ------------------------------------------------------------------------------------------------------------------ - $systemctl enable rc-local - $sudo systemctl start rc-local.service -after starting the service the looping should start straight away - -Useful commands: - $cat /tmp/rc.local.log - $sudo systemctl status rc-local.service - $cat audio.log (in looper directory) - -On computer - $scp something.wav pi@192.168.1.106:/home/pi diff --git a/cmd/audio-player/looper0/README b/cmd/audio-player/looper0/README index b1065257..bc494532 100644 --- a/cmd/audio-player/looper0/README +++ b/cmd/audio-player/looper0/README @@ -37,10 +37,10 @@ exec 1>&2 # send stdout to the same log file printf "rc.local started" # show start of execution set -x # tell sh to display commands before execution -AUDIOPATH=/home/pi/go/src/bitbucket.org/ausocean/av/cmd/audio-player/looper +AUDIOPATH=/home/pi/go/src/bitbucket.org/ausocean/av/cmd/audio-player/looper0 cd $AUDIOPATH -./looper & +./looper0 & ----------------------------------------------------------------------------------------------------------------- $systemctl enable rc-local $sudo systemctl start rc-local.service diff --git a/cmd/audio-player/looper0/main.go b/cmd/audio-player/looper0/main.go index ffce3362..ad910a72 100644 --- a/cmd/audio-player/looper0/main.go +++ b/cmd/audio-player/looper0/main.go @@ -37,7 +37,7 @@ import ( ) func main() { - soundFile := "48khz.wav" //"5mStartToEndOfTrials.wav" + soundFile := "/home/pi/48khz.wav" //"5mStartToEndOfTrials.wav" soundcardPath := "/usr/share/doc/audioInjector/asound.state.RCA.thru.test" logFile := "audio.log" diff --git a/cmd/audio-player/looper3/main.go b/cmd/audio-player/looper3/main.go index a74067ff..d76e0ddd 100644 --- a/cmd/audio-player/looper3/main.go +++ b/cmd/audio-player/looper3/main.go @@ -36,7 +36,7 @@ import ( ) func main() { - soundFile := "48khz.wav" //"5mStartToEndOfTrials.wav" + soundFile := "/home/pi/48khz.wav" //"5mStartToEndOfTrials.wav" logFile := "audio.log" //making log file