Fixed New Protocol CW. Updated header files so only included once.

g0orx · Aug 25, 2016 · ee7430a · ee7430a
1 parent 397f1ae
commit ee7430a
Show file tree

Hide file tree

Showing 43 changed files with 366 additions and 95 deletions.
diff --git a/agc.h b/agc.h
@@ -17,9 +17,13 @@
 *
 */
 
+#ifndef _AGC_H
+#define _AGC_H
+
 #define AGC_OFF 0
 #define AGC_LONG 1
 #define AGC_SLOW 2
 #define AGC_MEDIUM 3
 #define AGC_FAST 4
 
+#endif
diff --git a/alex.h b/alex.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _ALEX_H
+#define _ALEX_H
+
 #define ALEX_RX_ANTENNA_NONE   0x00000000
 #define ALEX_RX_ANTENNA_XVTR   0x00000900
 #define ALEX_RX_ANTENNA_EXT1   0x00000A00
@@ -48,3 +51,5 @@
 #define ALEX_BYPASS_HPF        0x00000800
 
 #define ALEX_6M_PREAMP         0x00000008
+
+#endif
diff --git a/audio.h b/audio.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _AUDIO_H
+#define _AUDIO_H
+
 extern int audio;
 extern int audio_buffer_size;
 
@@ -26,3 +29,5 @@ void audio_write(short left_sample,short right_sample);
 /*
 void audio_write(double *buffer,int samples);
 */
+
+#endif
diff --git a/band.h b/band.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _BAND_H
+#define _BAND_H
+
 #include <gtk/gtk.h>
 #include "bandstack.h"
 
@@ -99,3 +102,4 @@ BAND_LIMITS* getBandLimits(long long minDisplay,long long maxDisplay);
 XVTR_ENTRY* getXvtrEntry(int i);
 */
 
+#endif
diff --git a/bandstack.h b/bandstack.h
@@ -17,8 +17,9 @@
 *
 */
 
-#ifndef BANDSTACK_H
-#define BANDSTACK_H
+#ifndef _BANDSTACK_H
+#define _BANDSTACK_H
+
 /* --------------------------------------------------------------------------*/
 /**
 * @brief Bandstack definition

diff --git a/channel.h b/channel.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _CHANNEL_H
+#define _CHANNEL_H
+
 #define CHANNEL_RX0 0
 #define CHANNEL_RX1 1
 #define CHANNEL_RX2 2
@@ -32,3 +35,5 @@
 #define CHANNEL_PSK 11
 #endif
 
+#endif
+
diff --git a/configure.h b/configure.h
@@ -18,6 +18,11 @@
 */
 
 
+#ifndef _CONFIGURE_H
+#define _CONFIGURE_H
+
 #ifdef INCLUDE_GPIO
 void configure_gpio(GtkWidget *parent);
 #endif
+
+#endif
diff --git a/discovered.h b/discovered.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _DISCOVERED_H
+#define _DISCOVERED_H
+
 #include <netinet/in.h>
 #ifdef LIMESDR
 #include <SoapySDR/Device.h>
@@ -82,3 +85,4 @@ extern int selected_device;
 extern int devices;
 extern DISCOVERED discovered[MAX_DEVICES];
 
+#endif
diff --git a/filter.h b/filter.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _FILTER_H
+#define _FILTER_H
+
 #include "mode.h"
 
 // disable Var1 and Var2 (change to 12 to enable)
@@ -61,3 +64,4 @@ int filterVar2High;
 
 FILTER *filters[MODES];
 
+#endif
diff --git a/freedv.h b/freedv.h
@@ -1,3 +1,25 @@
+/* Copyright (C)
+* 2016 - John Melton, G0ORX/N6LYT
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*
+*/
+
+#ifndef _FREEDV_H
+#define _FREEDV_H
+
 extern int n_speech_samples;
 extern int n_max_modem_samples;
 extern short *demod_in;
@@ -16,3 +38,4 @@ int demod_sample_freedv(short sample);
 int mod_sample_freedv(short sample);
 void reset_freedv_tx_text_index();
 
+#endif
diff --git a/frequency.h b/frequency.h
@@ -24,9 +24,8 @@
 * 
 */
 
-//
-// frequency.h
-//
+#ifndef _FREQUENCY_H
+#define _FREQUENCY_H
 
 /* --------------------------------------------------------------------------*/
 /** 
@@ -44,3 +43,5 @@ struct frequency_info {
 char* getFrequencyInfo(long long frequency);
 int getBand(long long frequency);
 int canTransmit();
+
+#endif
diff --git a/gpio.h b/gpio.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _GPIO_H
+#define _GPIO_H
+
 extern int ENABLE_VFO_ENCODER;
 extern int ENABLE_VFO_PULLUP;
 extern int VFO_ENCODER_A;
@@ -67,3 +70,5 @@ int mode_get_state();
 int filter_get_state();
 int noise_get_state();
 int mox_get_state();
+
+#endif
diff --git a/lime_discovery.h b/lime_discovery.h
@@ -1 +1,25 @@
+/* Copyright (C)
+* 2015 - John Melton, G0ORX/N6LYT
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*
+*/
+
+#ifndef _LIME_DISCOVERY_H
+#define _LIME_DISCOVERY_H
+
 void lime_discovery();
+
+#endif
diff --git a/lime_protocol.h b/lime_protocol.h
@@ -1,7 +1,31 @@
+/* Copyright (C)
+* 2015 - John Melton, G0ORX/N6LYT
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*
+*/
+
+#ifndef _LIME_PROTOCOL_H
+#define _LIME_PROTOCOL_H
+
 #define BUFFER_SIZE 1024
 
 void lime_protocol_init(int rx,int pixels);
 void lime_protocol_stop();
 void lime_protocol_set_frequency(long long f);
 void lime_protocol_set_antenna(int ant);
 void lime_protocol_set_attenuation(int attenuation);
+
+#endif
diff --git a/main.c b/main.c
@@ -166,16 +166,21 @@ gint update(gpointer data) {
         DISCOVERED *d=&discovered[selected_device];
 
         double constant1=3.3;
-        double constant2=0.09;
+        double constant2=0.095;
 
         if(d->protocol==ORIGINAL_PROTOCOL) {
             switch(d->device) {
                 case DEVICE_METIS:
+                    constant1=3.3;
+                    constant2=0.09;
                     break;
                 case DEVICE_HERMES:
-                    //constant2=0.095; HERMES 2
+                    constant1=3.3;
+                    constant2=0.095;
                     break;
                 case DEVICE_ANGELIA:
+                    constant1=3.3;
+                    constant2=0.095;
                     break;
                 case DEVICE_ORION:
                     constant1=5.0;
@@ -256,9 +261,11 @@ gint update(gpointer data) {
             }
         }
 
-//fprintf(stderr,"drive=%d tune_drive=%d alex_forward_power=%d alex_reverse_power=%d exciter_power=%d fwd=%f rev=%f exciter=%f\n",
-//               drive, tune_drive, alex_forward_power, alex_reverse_power, exciter_power, fwd, rev, exciter);
+/*
+fprintf(stderr,"alex_forward_power=%d alex_reverse_power=%d exciter_power=%d fwd=%f rev=%f exciter=%f\n",
+               alex_forward_power, alex_reverse_power, exciter_power, fwd, rev, exciter);
         meter_update(POWER,fwd,rev,exciter,alc);
+*/
     }
 
     return TRUE;

diff --git a/main.h b/main.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _MAIN_H
+#define _MAIN_H
+
 #include <sys/utsname.h>
 extern struct utsname unameData;
 void reconfigure_display();
@@ -25,3 +28,4 @@ void show_psk();
 void show_waterfall();
 #endif
 
+#endif
diff --git a/menu.h b/menu.h
@@ -18,4 +18,9 @@
 */
 
 
+#ifndef _MENU_H
+#define _MENU_H
+
 GtkWidget* menu_init(int width,int height,GtkWidget *parent);
+
+#endif
diff --git a/meter.h b/meter.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _METER_H
+#define _METER_H
+
 #define SMETER 0
 #define POWER 1
 #ifdef PSK
@@ -26,3 +29,5 @@
 
 GtkWidget* meter_init(int width,int height,GtkWidget *parent);
 void meter_update(int meter_type,double value,double reverse,double exciter,double alc);
+
+#endif
diff --git a/mode.h b/mode.h
@@ -17,6 +17,9 @@
 *
 */
 
+#ifndef _MODE_H
+#define _MODE_H
+
 #define modeLSB 0
 #define modeUSB 1
 #define modeDSB 2
@@ -51,3 +54,4 @@ int mode;
 
 char *mode_string[MODES];
 
+#endif
diff --git a/new_discovery.h b/new_discovery.h
@@ -17,5 +17,9 @@
 *
 */
 
+#ifndef _NEW_DISCOVERY_H
+#define _NEW_DISCOVERY_H
 
 void new_discovery(void);
+
+#endif