Merge branch 'master' of https://gitlab.science.ru.nl/biophysics-labs/firmware

README.md

@@ -95,6 +95,18 @@ If you use ALSA/Portaudio using an external USB sound card or dongle, put these
 defaults.pcm.card 1
 defaults.ctl.card 1
 
+To get rid of warnings when using Portaudio, edit /usr/share/alsa/alsa.conf and comment out some lines, e.g.:
+#GW pcm.rear cards.pcm.rear
+#GW pcm.center_lfe cards.pcm.center_lfe
+#GW pcm.side cards.pcm.side
+#GW pcm.hdmi cards.pcm.hdmi
+#GW pcm.modem cards.pcm.modem
+#GW pcm.phoneline cards.pcm.phoneline
+
+To disable the raspberry's internal Broadcom 2835 audio interface, create a file /etc/modprobe.d/alsa-blacklist.conf with the line:
+blacklist snd_bcm2835
+
+
 
 ```
 

init.d/rc.lsldert01

@@ -3,4 +3,4 @@
 echo "running rc.lsldert01"
 run zmq_trigger_subscriber --zmq-proxy tcp://lsldert00.local:5557 --lsl-name 'Digital Triggers 01'
 run lslhider --event-dev /dev/input/by-id/usb-SIGMACHIP_USB_Keyboard-event-kbd
-run zmqaudio
+#run zmqaudio

lsldert/Makefile

@@ -27,6 +27,7 @@ msgqueue_pubsub: msgqueue_pubsub.cc
 lsldert_proxy: lsldert_proxy.cc
 lsldert_proxy: LDLIBS+=-lpthread
 zmq_trigger_subscriber: zmq_trigger_subscriber.cc
+zmqaudio: LDLIBS=-lzmq
 zmqaudio: zmqaudio.cc zmqaudio.h
 paex_sine: paex_sine.c
 zmqaudio paex_sine: LDLIBS+=-lm -lportaudio

lsldert/zmqaudio.cc

@@ -83,7 +83,7 @@ zmq_audiobuffer::zmq_audiobuffer(std::uint32_t _fsamp, std::uint32_t _nsamp,
       data{new float[_nsamp * _nchan]}, idata{0},
       frames_per_buffer{paFramesPerBufferUnspecified}, playing{false}, stream{nullptr} {
     assert(sizeof(float) == 4); // need 32 bit IEEE 754 floats
-    frames_per_buffer = 100;
+    frames_per_buffer=64;
 }
 
 zmq_audiobuffer::~zmq_audiobuffer() {
@@ -277,6 +277,7 @@ int zmq_recv_multi(zmq::socket_t &socket, zmq::message_t parts[], int nmax) {
 }
 
 int rtpriority(int n) {
+return 0;
     int sched_policy = SCHED_FIFO;
     struct sched_param sched;
 
@@ -306,7 +307,7 @@ int main(void) {
 
     zmq::socket_t ssub(context, ZMQ_SUB);
     ssub.connect("tcp://raspi6.local:5557");
-    // ssub.connect("tcp://lsldert00.local:5557");
+    //ssub.connect("tcp://lsldert00.local:5557");
     ssub.setsockopt(ZMQ_SUBSCRIBE, "A", 1);
 
     rtpriority(prio2);