From a0bfb4ee8d1a83b8b05ea87851a6f3befb54d27b Mon Sep 17 00:00:00 2001
From: Martin Karlsson <letter2martin@gmail.com>
Date: Thu, 24 Sep 2015 15:09:18 +0200
Subject: [PATCH] tja laget!
---
get_audio.m | 7 +++++--
get_audio_loop.m | 9 +++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/get_audio.m b/get_audio.m
index 0bf8bb1..0de0d87 100644
--- a/get_audio.m
+++ b/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
diff --git a/get_audio_loop.m b/get_audio_loop.m
index 5b6b472..6b9b9f1 100644
--- a/get_audio_loop.m
+++ b/get_audio_loop.m
@@ -1,6 +1,3 @@
-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()
+
--
GitLab