adjust raspi latency

README.md

@@ -2,35 +2,12 @@ irmc - Internet Relay Morse Code
 ================================
 IRMC stands for Internet Relay Morse Code and is an implementation of [MOIP](http://8ch9azbsfifz.github.io/moip/).
 
-# How to build?
-## Install dependency: morse keyer library
-```
-wget https://github.com/8cH9azbsFifZ/morse/archive/v0.1.tar.gz
-tar xzf v0.1.tar.gz
-cd morse-0.1
-libtoolize
-./autogen.sh
-./configure  --with-portaudio
-make
-sudo make install
-```
+# Building 
+## On Linux
+sudo apt-get install -y alsa-oss oss-compat build-essential autoconf libao-dev libtool libportaudio-dev portaudio19-dev
 
-## Debian (Wheezy)
-Some dependencies have to be installed:
-```
-apt-get install -y alsa-oss oss-compat build-essential autoconf libao-dev libtool
-```
-Afterwards compilation with `make` should work. If something went wrong, you may have
-to adjust your `LD_LIBRARY_PATH`. Alternatively try:
-```
-LD_LIBRARY_PATH=/usr/local/lib ./irmc mtc-kob.dyndns.org 7890 33 123 
-```
-
-## OSX (Yosemite)
-Compilation with make :)
-
-For the USB serial devices you need a PL2303 driver 
-(i.e. [PL2303_Serial-USB_on_OSX_Lion.pkg](http://changux.co/osx-installer-to-pl2303-serial-usb-on-osx-lio/)).
+## On OSX
+brew install portaudio
 
 # Hardware interface options
 A good description on how to build different interfaces (telegraph key, sounder or both) 

src/Makefile

@@ -1,7 +1,7 @@
 SRC = irmc.c cwprotocol.c beep.c
 OBJ = ${SRC:.c=.o}
 LDFLAGS = -lportaudio -lpthread -lm 
-CFLAGS = -Wall 
+CFLAGS = -Wall -Wno-format-zero-length
 INSTALLDIR = ${HOME}/bin
 
 all: options irmc 

src/beep.c

@@ -3,8 +3,10 @@
 #include <stdint.h>
 #include <unistd.h> // for usleep()
 #include <portaudio.h>
+
 #include "beep.h"
 
+#define RASPI_AUDIO_LATENCY_FIX (30./5.) // https://app.assembla.com/spaces/portaudio/tickets/246-paex_sine-choppy-on-raspberry-pi---defaultlowoutputlatency-too-low/details
  
 // http://stackoverflow.com/questions/7678470/generating-sound-of-a-particular-frequency-using-gcc-in-ubuntu
 
@@ -88,7 +90,7 @@ int buzzer_start(void)
     outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
     outputParameters.channelCount = 1;       /* stereo output */
     outputParameters.sampleFormat = paUInt8; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
+    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency * RASPI_AUDIO_LATENCY_FIX; 
     outputParameters.hostApiSpecificStreamInfo = NULL;
 
     err = Pa_OpenStream(
@@ -155,28 +157,10 @@ int beep_init()
 
 int beep_test(void)
 {
-
-    // notes frequency chart: http://www.phy.mtu.edu/~suits/notefreqs.html
-
     buzzer_start();
     buzzer_set_freq(261);
     msleep(250);
     buzzer_set_freq(0);
-    msleep(250);
-    buzzer_set_freq(329);
-    msleep(250);
-    buzzer_set_freq(349);
-    msleep(250);
-    buzzer_set_freq(392);
-    msleep(250);
-    buzzer_set_freq(440);
-    msleep(250);
-    buzzer_set_freq(494);
-    msleep(250);
-    buzzer_beep(523, 200);
-    msleep(250);
-
     buzzer_stop();
-
     return 0;
 }

src/beep.h

@@ -20,11 +20,6 @@ typedef struct
     uint32_t freq;
 } paTestData;
 
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData );
 void buzzer_set_freq(int frequency);
 void buzzer_beep(int frequency, int msecs);
 int buzzer_start(void);

src/cwprotocol.h

@@ -1,4 +1,4 @@
-#define INTERFACE_VERSION "irmc v0.02"
+#define INTERFACE_VERSION "irmc v0.3.3"
 
 // Structures for the packets: unsigned short command
 #define DIS 0x0002 // disconnect

src/irmc.c

@@ -19,27 +19,23 @@
 #include <sys/time.h>
 #include <stdio.h>
 
-#define BEEP_MORSE
-#ifdef BEEP_MORSE
-	#include <morse/beep.h>
-#else
-	#include "portaudio.h"
-#endif
-
 #ifdef __MACH__
     #include <mach/clock.h>
     #include <mach/mach.h>
-#else
+#endif
+
+/*
     #include <linux/ioctl.h>
     #include <asm-generic/ioctl.h>
     #include <asm-generic/termios.h>
-#endif 
+*/
 
 //#define DEBUG 1
 
 #define MAXDATASIZE 1024 // max number of bytes we can get at once 
 
 #include "cwprotocol.h"
+#include "beep.h"
 
 int serial_status = 0, fd_serial, numbytes;
 
@@ -406,6 +402,7 @@ int main(int argc, char *argv[])
 	send(fd_socket, &disconnect_packet, SIZE_COMMAND_PACKET, 0);	
 	close(fd_socket);
 	close(fd_serial);
+	buzzer_stop();
 
 	exit(0); 
 }