README.md

@@ -5,16 +5,9 @@ IRMC stands for Internet Relay Morse Code and is an implementation of [MOIP](htt
 # Building 
 ## On Linux
 sudo apt-get install -y alsa-oss oss-compat build-essential autoconf libao-dev libtool libportaudio-dev portaudio19-dev
-make 
-
-### On Raspi (GPIO Interface)
-Follow: http://wiringpi.com/download-and-install/
-make raspi
-
 
 ## On OSX
 brew install portaudio
-make
 
 # Hardware interface options
 A good description on how to build different interfaces (telegraph key, sounder or both) 

src/Makefile

@@ -1,4 +1,4 @@
-SRC = irmc.c cwprotocol.c beep.c util.c
+SRC = irmc.c cwprotocol.c beep.c
 OBJ = ${SRC:.c=.o}
 LDFLAGS = -lportaudio -lpthread -lm 
 CFLAGS = -Wall -Wno-format-zero-length
@@ -21,10 +21,6 @@ irmc:   ${OBJ}
 	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
-raspi:	
-	@${CC} -c -DRASPI ${CFLAGS} ${SRC}
-	@${CC} -o irmc ${OBJ} ${LDFLAGS} -lwiringPi
-
 java:
 	java -jar test/MorseKOB.jar 
 

src/beep.c

@@ -6,11 +6,7 @@
 
 #include "beep.h"
 
-#ifdef RASPI
 #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
-#else
-#define RASPI_AUDIO_LATENCY_FIX (1.)
-#endif
  
 // http://stackoverflow.com/questions/7678470/generating-sound-of-a-particular-frequency-using-gcc-in-ubuntu
 

src/cwprotocol.c

@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <sys/socket.h>
-
 #include "cwprotocol.h"
 
 /* Global variables */
@@ -42,7 +41,7 @@ int prepare_tx (struct data_packet_format *tx_packet, char *id)
 	tx_packet->a21 = 0; /* These magic numbers was provided by Les Kerr */
 	tx_packet->a22 = 755;
 	tx_packet->a23 = 16777215;
-	snprintf(tx_packet->status, SIZE_STATUS, "?"); // this shall include the sent character
+	snprintf(tx_packet->status, SIZE_STATUS, "?");
 	
 	return 0;
 }

src/irmc.c

@@ -15,19 +15,27 @@
 #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>
+#endif
+
+/*
+    #include <linux/ioctl.h>
+    #include <asm-generic/ioctl.h>
+    #include <asm-generic/termios.h>
+*/
+
+//#define DEBUG 1
 
 #define MAXDATASIZE 1024 // max number of bytes we can get at once 
 
 #include "cwprotocol.h"
 #include "beep.h"
-#include "util.h"
-
-// http://raspberrypiguide.de/howtos/raspberry-pi-gpio-how-to/
-#ifdef RASPI
-#include <wiringPi.h>
-#define TX_RASPI_PIN 5
-#endif
-
 
 int serial_status = 0, fd_serial, numbytes;
 
@@ -39,9 +47,8 @@ long tx_timer = 0;
 
 /* TX Methods */
 #define TX_NONE 0
-//#define TX_SERIAL 1
+#define TX_SERIAL 1
-//#define TX_KEYBOARD 2 // not implemented yet
+#define TX_KEYBOARD 2
-#define TX_RASPI 3
 
 long key_press_t1;
 long key_release_t1;
@@ -52,15 +59,67 @@ 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)
 {
 	signal(sig, SIG_IGN);
 	send(fd_socket, &disconnect_packet, SIZE_COMMAND_PACKET, 0);	
 	close(fd_socket);
-#ifdef TX_SERIAL
 	close(fd_serial);
-#endif
 	exit(1);
 }
 
@@ -73,32 +132,18 @@ void txloop (void)
 		tx_data_packet.code[tx_data_packet.n - 1] = 
 			(int) ((key_press_t1 - key_release_t1) * -1);
 
-#ifdef DEBUG
+		//printf("space: %i\n", tx_data_packet.code[tx_data_packet.n -1]);
-		printf("space: %i\n", tx_data_packet.code[tx_data_packet.n -1]);
-#endif
-#ifdef TX_SERIAL
 		while(serial_status & TIOCM_DSR) ioctl(fd_serial, TIOCMGET, &serial_status);
-#endif
-#ifdef RASPI
-		while(digitalRead(TX_RASPI_PIN)==1) { }
-#endif
 		key_release_t1 = fastclock();
 
 		tx_data_packet.n++;	
 		tx_data_packet.code[tx_data_packet.n - 1] =
 			(int) ((key_release_t1 - key_press_t1) * 1);
 		
-#ifdef DEBUG		
+		//printf("mark: %i\n", tx_data_packet.code[tx_data_packet.n -1]);
-		printf("mark: %i\n", tx_data_packet.code[tx_data_packet.n -1]);
-#endif
 		while(1){
-#ifdef TX_SERIAL
 			ioctl(fd_serial, TIOCMGET, &serial_status);
 			if(serial_status & TIOCM_DSR) break;
-#endif
-#ifdef RASPI
-			if(digitalRead(TX_RASPI_PIN)==1) break;
-#endif
 			tx_timeout = fastclock() - key_release_t1;
 			if(tx_timeout > TX_TIMEOUT) return;
 		}
@@ -155,6 +200,7 @@ int main(int argc, char *argv[])
 	int channel;
 	char id[SIZE_ID];
 	char serialport[64];
+	int tx_method = TX_NONE;
 
 	// Set default values
 	snprintf(hostname, 64, "mtc-kob.dyndns.org");
@@ -245,30 +291,21 @@ int main(int argc, char *argv[])
 	inet_ntop(p->ai_family, get_in_addr((struct sockaddr *)p->ai_addr),
 			s, sizeof s);
 	fprintf(stderr, "Connected to %s.\n", s);
+	beep_init();
+	if ((strcmp (serialport, "")) != 0) 
+		tx_method = TX_SERIAL; 
 
-#ifdef TX_SERIAL
+	if (tx_method == TX_SERIAL) {
 		fd_serial = open(serialport, O_RDWR | O_NOCTTY | O_NDELAY);
 		if(fd_serial == -1) {
     			fprintf(stderr,"Unable to open serial port %s.\n", serialport);
     		}
-#endif
-
-#ifdef RASPI
-	if (wiringPiSetup() == -1)
-	{
-    		fprintf(stderr,"Unable to setup wiringPi for PIN %d\n", TX_RASPI_PIN);
-		exit (1);
 	}
-	pinMode(TX_RASPI_PIN, INPUT);
-#endif
- 
 	freeaddrinfo(servinfo); /* all done with this structure */
 
 	key_release_t1 = fastclock();
 	identifyclient();
     
-	beep_init();
-
 	/* Main Loop */
 	for(;;) {
   		if(tx_timer == 0) 
@@ -336,22 +373,14 @@ int main(int argc, char *argv[])
 		#endif
 			tx_data_packet.n = 0;
 		}
-#ifdef TX_SERIAL
+		if (tx_method == TX_SERIAL) {
 			ioctl(fd_serial,TIOCMGET, &serial_status);
 			if(serial_status & TIOCM_DSR){
 				txloop();
 				tx_timer = TX_WAIT;
 				message(1);
 			}
-#endif
-
-#ifdef RASPI
-		if(digitalRead(5)==1){
-			txloop();
-			tx_timer = TX_WAIT;
-			message(1);
 		}
-#endif
 		
 		if(keepalive_t < 0 && tx_timer == 0){
 		#if DEBUG
@@ -372,9 +401,7 @@ int main(int argc, char *argv[])
 
 	send(fd_socket, &disconnect_packet, SIZE_COMMAND_PACKET, 0);	
 	close(fd_socket);
-#ifdef TX_SERIAL
 	close(fd_serial);
-#endif
 	buzzer_stop();
 
 	exit(0); 

src/util.c

@@ -1,57 +0,0 @@
-
-#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

@@ -1,30 +0,0 @@
-#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);
-