Merge branch 'master' of gitlab.control.lth.se:letter2martin/turtlerob1

get_audio.m

@@ -2,7 +2,6 @@ function signal = get_audio()
 
 global bass;
 
-
 persistent lastLastIndex;
 persistent lastIndex;
 persistent fs;
@@ -32,6 +31,10 @@ tempRight = tempRight(max(end-diffIndex+1,1):end);
 
 lastLastIndex = lastIndex;
 
-signal = [tempLeft; tempRight];
+signal = [tempLeft, tempRight];
+
+
+
+%bass.Stop();
 
 end
\ No newline at end of file

get_audio_loop.m

-addpath(genpath('~/openrobots/lib/matlab/'));
-client = genomix.client('turtlebot1-wifi:8080');
-bass = client.load('bass');
 
 
 figure;
@@ -10,7 +7,7 @@ allAudioRight = [];
 lastLastIndex = 0;
 lastIndex = 0;
 count = 0;
-while count < 50
+while count < 5
     p = bass.Audio();
     if count == 0
         fs = p.Audio.sampleRate;
@@ -34,3 +31,7 @@ while count < 50
     drawnow
     
 end
+
+
+bass.Stop()
+