new beep without jitter

src/Makefile

@@ -1,7 +1,7 @@
-SRC = irmc.c cwprotocol.c
+SRC = irmc.c cwprotocol.c beep.c
 OBJ = ${SRC:.c=.o}
-LDFLAGS = -L/usr/local/lib -L/opt/local/lib  -lportaudio -lpthread -lm -lmorse
-CFLAGS = -I/usr/local/include -I/opt/local/include -Wall 
+LDFLAGS = -lportaudio -lpthread -lm 
+CFLAGS = -Wall 
 INSTALLDIR = ${HOME}/bin
 
 all: options irmc 

src/beep.c

@@ -0,0 +1,182 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h> // for usleep()
+#include <portaudio.h>
+#include "beep.h"
+
+ 
+// http://stackoverflow.com/questions/7678470/generating-sound-of-a-particular-frequency-using-gcc-in-ubuntu
+
+static PaStream *stream;
+static paTestData data;
+
+
+/* This routine will be called by the PortAudio engine when audio is needed.
+** It may called at interrupt level on some machines so don't do anything
+** that could mess up the system like calling malloc() or free().
+*/
+static int patestCallback( const void *inputBuffer, void *outputBuffer,
+                           unsigned long framesPerBuffer,
+                           const PaStreamCallbackTimeInfo* timeInfo,
+                           PaStreamCallbackFlags statusFlags,
+                           void *userData )
+{
+    paTestData *data = (paTestData*)userData;
+    uint8_t *out = (uint8_t*)outputBuffer;
+    unsigned long i;
+    uint32_t freq = data->freq;
+
+    (void) timeInfo; /* Prevent unused variable warnings. */
+    (void) statusFlags;
+    (void) inputBuffer;
+
+    for( i=0; i<framesPerBuffer; i++ )
+    {
+        if(data->up_count > 0 && data->total_count == data->up_count) {
+            *out++ = 0x00;
+            continue;
+        }
+        data->total_count++;
+
+        if(freq != data->prev_freq) {
+            data->counter = 0;
+        }
+
+        if(freq) {
+            int overflow_max = SAMPLE_RATE / freq;
+            uint32_t data_cnt = data->counter % overflow_max;
+            if(data_cnt > overflow_max/2)
+                *out++ = 0xff;
+            else {
+                *out++ = 0x00;
+            }
+            data->counter++;
+        }
+        else {
+            data->counter = 0;
+            *out++ = 0;
+        }
+        data->prev_freq = freq;
+    }
+
+    return paContinue;
+}
+
+void buzzer_set_freq(int frequency)
+{
+    data.up_count = 0; // do not stop!
+    data.freq = frequency;
+}
+
+void buzzer_beep(int frequency, int msecs)
+{
+    data.total_count = 0;
+    data.up_count = SAMPLE_RATE * msecs / 1000;
+    data.freq = frequency;
+}
+
+int buzzer_start(void)
+{
+    PaStreamParameters outputParameters;
+
+    PaError err;
+
+    err = Pa_Initialize();
+    if( err != paNoError ) goto error;
+
+    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.hostApiSpecificStreamInfo = NULL;
+
+    err = Pa_OpenStream(
+        &stream,
+        NULL, /* no input */
+        &outputParameters,
+        SAMPLE_RATE,
+        FRAMES_PER_BUFFER,
+        paClipOff,      /* we won't output out of range samples so don't bother clipping them */
+        patestCallback,
+        &data );
+    if( err != paNoError ) goto error;
+
+    err = Pa_StartStream( stream );
+    if( err != paNoError ) goto error;
+
+    return err;
+error:
+    Pa_Terminate();
+    fprintf( stderr, "An error occured while using the portaudio stream\n" );
+    fprintf( stderr, "Error number: %d\n", err );
+    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
+    return err;
+
+}
+
+int buzzer_stop() 
+{
+    PaError err = 0;
+    err = Pa_StopStream( stream );
+    if( err != paNoError ) goto error;
+
+    err = Pa_CloseStream( stream );
+    if( err != paNoError ) goto error;
+
+    Pa_Terminate();
+
+    return err;
+error:
+    Pa_Terminate();
+    fprintf( stderr, "An error occured while using the portaudio stream\n" );
+    fprintf( stderr, "Error number: %d\n", err );
+    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
+    return err;
+}
+void msleep(int d){
+    usleep(d*1000);
+}
+
+
+int beep(double freq_hz, double duration_sec)
+{
+	buzzer_set_freq(freq_hz);
+	msleep(duration_sec*1000.);
+	buzzer_set_freq(0.);
+	return 0;
+}
+int beep_init()
+{
+	buzzer_start();
+	return 0;
+}
+
+
+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

@@ -1,46 +1,3 @@
-/** @file paex_sine.c
-	@ingroup examples_src
-	@brief Play a sine wave for several seconds.
-	@author Ross Bencina <rossb@audiomulch.com>
-    @author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id$
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
 #include <stdio.h>
 #include <math.h>
 #include "portaudio.h"
@@ -53,126 +10,28 @@
 #define M_PI  (3.14159265)
 #endif
 
-#define TABLE_SIZE   (200)
 typedef struct
 {
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    char message[20];
-}
-paTestData;
+    uint32_t total_count;
+    uint32_t up_count;
+
+    uint32_t counter;
+    uint32_t prev_freq;
+    uint32_t freq;
+} paTestData;
 
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
 static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
+                           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);
+int buzzer_stop();
+void msleep(int d);
+int beep_test(void);
 
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    
-    return paContinue;
-}
-
-/*
- * This routine is called by portaudio when playback is done.
- */
-static void StreamFinished( void* userData )
-{
-   paTestData *data = (paTestData *) userData;
-   printf( "Stream Completed: %s\n", data->message );
-}
-
-/*******************************************************************/
-
-void beep_init(void);
-
-int beep(double freq_hz, double duration_sec)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    if (outputParameters.device == paNoDevice) {
-      fprintf(stderr,"Error: No default output device.\n");
-      goto error;
-    }
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    sprintf( data.message, "No Message" );
-    err = Pa_SetStreamFinishedCallback( stream, &StreamFinished );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( duration_sec * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
+// compatibility to old interface
+int beep(double freq_hz, double duration_sec);
+int beep_init();

src/cwprotocol.c

@@ -1,6 +1,17 @@
 #include <stdio.h>
+#include <sys/socket.h>
 #include "cwprotocol.h"
 
+/* Global variables */
+struct command_packet_format connect_packet = {CON, DEFAULT_CHANNEL}; 
+struct command_packet_format disconnect_packet = {DIS, 0};
+struct data_packet_format id_packet;
+struct data_packet_format rx_data_packet;
+struct data_packet_format tx_data_packet;
+
+int tx_sequence = 0, rx_sequence;
+int fd_socket;
+
 int prepare_id (struct data_packet_format *id_packet, char *id)
 {
 	id_packet->command = DAT;
@@ -34,3 +45,40 @@ int prepare_tx (struct data_packet_format *tx_packet, char *id)
 	
 	return 0;
 }
+
+
+// connect to server and send my id.
+void identifyclient(void)
+{
+	tx_sequence++;
+	id_packet.sequence = tx_sequence;
+	send(fd_socket, &connect_packet, SIZE_COMMAND_PACKET, 0);
+	send(fd_socket, &id_packet, SIZE_DATA_PACKET, 0);
+}
+
+int send_latch (void)
+{
+	int i;
+	tx_sequence++;
+	tx_data_packet.sequence = tx_sequence;
+	tx_data_packet.code[0] = -1;
+	tx_data_packet.code[1] = 1;
+	tx_data_packet.n = 2;
+	for(i = 0; i < 5; i++) send(fd_socket, &tx_data_packet, SIZE_DATA_PACKET, 0);
+	tx_data_packet.n = 0;
+	return 0;
+}
+
+int send_unlatch (void)
+{
+	int i;
+	tx_sequence++;
+	tx_data_packet.sequence = tx_sequence;
+	tx_data_packet.code[0] = -1;
+	tx_data_packet.code[1] = 2;
+	tx_data_packet.n = 2;
+	for(i = 0; i < 5; i++) send(fd_socket, &tx_data_packet, SIZE_DATA_PACKET, 0);
+	tx_data_packet.n = 0;
+	return 0;
+}
+

src/cwprotocol.h

@@ -32,7 +32,7 @@ struct data_packet_format{
 	unsigned int a23;
     	signed int code[SIZE_CODE];
     	unsigned int n;
-    	char status[SIZE_STATUS];  /* This is called version in MorseKob */
+    	char status[SIZE_STATUS];  /* This is called version in MorseKob, in cwcom this transmits the sent character?! */
     	char a4[8];
     
 };
@@ -40,6 +40,23 @@ struct data_packet_format{
 // Define the packets used
 #define DEFAULT_CHANNEL 103
 
+/* Define functions provided by cwprotocol */ 
 int prepare_id (struct data_packet_format *id_packet, char *id);
 int prepare_tx (struct data_packet_format *tx_packet, char *id);
+void identifyclient (void);
+int send_latch (void);
+int send_unlatch (void);
+
+/* Define external struct for global variables */
+extern struct command_packet_format connect_packet;
+extern struct command_packet_format disconnect_packet;
+extern struct data_packet_format id_packet;
+extern struct data_packet_format rx_data_packet;
+extern struct data_packet_format tx_data_packet;
+
+extern int tx_sequence, rx_sequence;
+
+extern int fd_socket;
+
+
 

src/irmc.c

@@ -35,21 +35,13 @@
     #include <asm-generic/termios.h>
 #endif 
 
- 
 //#define DEBUG 1
 
 #define MAXDATASIZE 1024 // max number of bytes we can get at once 
 
 #include "cwprotocol.h"
 
-struct command_packet_format connect_packet = {CON, DEFAULT_CHANNEL}; 
-struct command_packet_format disconnect_packet = {DIS, 0};
-struct data_packet_format id_packet;
-struct data_packet_format rx_data_packet;
-struct data_packet_format tx_data_packet;
-
-int serial_status = 0, fd_serial, fd_socket, numbytes;
-int tx_sequence = 0, rx_sequence;
+int serial_status = 0, fd_serial, numbytes;
 
 double tx_timeout = 0;
 long tx_timer = 0;
@@ -84,7 +76,6 @@ void current_utc_time(struct timespec *ts) {
 #else
   clock_gettime(CLOCK_REALTIME, ts);
 #endif
- 
 }
 
 /* a better clock() in milliseconds */
@@ -125,14 +116,6 @@ void *get_in_addr(struct sockaddr *sa)
 	return &(((struct sockaddr_in6*)sa)->sin6_addr);
 }
 
-// connect to server and send my id.
-void identifyclient(void)
-{
-	tx_sequence++;
-	id_packet.sequence = tx_sequence;
-	send(fd_socket, &connect_packet, SIZE_COMMAND_PACKET, 0);
-	send(fd_socket, &id_packet, SIZE_DATA_PACKET, 0);
-}
 
 // disconnect from the server
 void inthandler(int sig)
@@ -176,31 +159,6 @@ void txloop (void)
 	}
 }
 
-int send_latch (void)
-{
-	int i;
-	tx_sequence++;
-	tx_data_packet.sequence = tx_sequence;
-	tx_data_packet.code[0] = -1;
-	tx_data_packet.code[1] = 1;
-	tx_data_packet.n = 2;
-	for(i = 0; i < 5; i++) send(fd_socket, &tx_data_packet, SIZE_DATA_PACKET, 0);
-	tx_data_packet.n = 0;
-	return 0;
-}
-
-int send_unlatch (void)
-{
-	int i;
-	tx_sequence++;
-	tx_data_packet.sequence = tx_sequence;
-	tx_data_packet.code[0] = -1;
-	tx_data_packet.code[1] = 2;
-	tx_data_packet.n = 2;
-	for(i = 0; i < 5; i++) send(fd_socket, &tx_data_packet, SIZE_DATA_PACKET, 0);
-	tx_data_packet.n = 0;
-	return 0;
-}
 
 void message(int msg)
 {