done

README.md

@@ -2,6 +2,13 @@ irmc - Internet Relay Morse Code
 ================================
 IRMC stands for Internet Relay Morse Code and is an implementation of [MOIP](http://8ch9azbsfifz.github.io/moip/).
 
+# Building 
+## On Linux
+sudo apt-get install -y alsa-oss oss-compat build-essential autoconf libao-dev libtool libportaudio-dev portaudio19-dev
+
+## On OSX
+brew install portaudio
+
 # Hardware interface options
 A good description on how to build different interfaces (telegraph key, sounder or both) 
 is given on the [MorseKOB Website](http://kob.sdf.org/morsekob/interface.htm). 

src/Makefile

@@ -1,7 +1,7 @@
-SRC = irmc.c cwprotocol.c beep.c
+SRC = irmc.c cwprotocol.c beep.c util.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/irmc.c

@@ -15,18 +15,6 @@
 #include <pthread.h>
 #include <signal.h>
 #include <arpa/inet.h>
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-
-#ifdef __MACH__
-    #include <mach/clock.h>
-    #include <mach/mach.h>
-#else
-    #include <linux/ioctl.h>
-    #include <asm-generic/ioctl.h>
-    #include <asm-generic/termios.h>
-#endif 
 
 //#define DEBUG 1
 
@@ -34,6 +22,7 @@
 
 #include "cwprotocol.h"
 #include "beep.h"
+#include "util.h"
 
 int serial_status = 0, fd_serial, numbytes;
 
@@ -57,60 +46,6 @@ char last_sender[16];
 int translate = 1;
 int audio_status = 1;
 
-/* portable time, as listed in https://gist.github.com/jbenet/1087739  */
-void current_utc_time(struct timespec *ts) {
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
-  clock_serv_t cclock;
-  mach_timespec_t mts;
-  host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-  clock_get_time(cclock, &mts);
-  mach_port_deallocate(mach_task_self(), cclock);
-  ts->tv_sec = mts.tv_sec;
-  ts->tv_nsec = mts.tv_nsec;
-#else
-  clock_gettime(CLOCK_REALTIME, ts);
-#endif
-}
-
-/* a better clock() in milliseconds */
-long fastclock(void)
-{
-	struct timespec t;
-	long r;
-
-	current_utc_time (&t);
-	r = t.tv_sec * 1000;
-	r = r + t.tv_nsec / 1000000;
-	return r;
-}
-
-int kbhit (void)
-{
-  	struct timeval tv;
-  	fd_set rdfs;
-
-  	tv.tv_sec = 0;
-  	tv.tv_usec = 0;
-
-  	FD_ZERO(&rdfs);
-  	FD_SET (STDIN_FILENO, &rdfs);
-
-  	select (STDIN_FILENO+1, &rdfs, NULL, NULL, &tv);
-  	return FD_ISSET(STDIN_FILENO, &rdfs);
-}
-
-
-/* get sockaddr, IPv4 or IPv6: */
-void *get_in_addr(struct sockaddr *sa)
-{
-	if (sa->sa_family == AF_INET) {
-		return &(((struct sockaddr_in*)sa)->sin_addr);
-	}
-
-	return &(((struct sockaddr_in6*)sa)->sin6_addr);
-}
-
-
 // disconnect from the server
 void inthandler(int sig)
 {

src/util.c

@@ -0,0 +1,57 @@
+
+#include "util.h"
+
+/* portable time, as listed in https://gist.github.com/jbenet/1087739  */
+void current_utc_time(struct timespec *ts) {
+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+  clock_serv_t cclock;
+  mach_timespec_t mts;
+  host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+  clock_get_time(cclock, &mts);
+  mach_port_deallocate(mach_task_self(), cclock);
+  ts->tv_sec = mts.tv_sec;
+  ts->tv_nsec = mts.tv_nsec;
+#else
+  clock_gettime(CLOCK_REALTIME, ts);
+#endif
+}
+
+
+/* a better clock() in milliseconds */
+long fastclock(void)
+{
+	struct timespec t;
+	long r;
+
+	current_utc_time (&t);
+	r = t.tv_sec * 1000;
+	r = r + t.tv_nsec / 1000000;
+	return r;
+}
+
+int kbhit (void)
+{
+  	struct timeval tv;
+  	fd_set rdfs;
+
+  	tv.tv_sec = 0;
+  	tv.tv_usec = 0;
+
+  	FD_ZERO(&rdfs);
+  	FD_SET (STDIN_FILENO, &rdfs);
+
+  	select (STDIN_FILENO+1, &rdfs, NULL, NULL, &tv);
+  	return FD_ISSET(STDIN_FILENO, &rdfs);
+}
+
+/* get sockaddr, IPv4 or IPv6: */
+void *get_in_addr(struct sockaddr *sa)
+{
+	if (sa->sa_family == AF_INET) {
+		return &(((struct sockaddr_in*)sa)->sin_addr);
+	}
+
+	return &(((struct sockaddr_in6*)sa)->sin6_addr);
+}
+
+

src/util.h

@@ -0,0 +1,30 @@
+#include <time.h>
+#include <sys/time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <netdb.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <math.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <signal.h>
+#include <arpa/inet.h>
+
+
+#ifdef __MACH__
+    #include <mach/clock.h>
+    #include <mach/mach.h>
+#endif
+
+
+void current_utc_time(struct timespec *ts);
+long fastclock(void);
+int kbhit (void);
+void *get_in_addr(struct sockaddr *sa);
+