update new protocol for new gain settings

diff --git a/audio.c b/audio.c
index 1bca582ee19153fab2f59393ce919ae53cf71464..fef9049fb7a8adadcb759ca64b548ab51086d119 100644 (file)
--- a/audio.c
+++ b/audio.c
@@ -86,7 +86,9 @@ void audio_write(short left_sample,short right_sample) {
   audio_buffer[audio_offset++]=right_sample;
 
   if(audio_offset==AUDIO_BUFFER_SIZE) {
+//fprintf(stderr,"pa_simple_write...");
     result=pa_simple_write(stream, audio_buffer, (size_t)AUDIO_BUFFER_SIZE, &error);
+//fprintf(stderr,"%d\n",result);
     if(result< 0) {
       fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(error));
       //_exit(1);
@@ -95,30 +97,3 @@ void audio_write(short left_sample,short right_sample) {
   }
 }
 
-/*
-void audio_write(double* buffer,int samples) {
-    int i;
-    int result;
-    int error;
-
-    for(i=0;i<samples;i++) {
-        int source_index=i*2;
-        short left_sample=(short)(buffer[source_index]*32767.0*volume);
-        short right_sample=(short)(buffer[source_index+1]*32767.0*volume);
-        audio_buffer[audio_offset++]=left_sample>>8;
-        audio_buffer[audio_offset++]=left_sample;
-        audio_buffer[audio_offset++]=right_sample>>8;
-        audio_buffer[audio_offset++]=right_sample;
-
-        if(audio_offset==AUDIO_BUFFER_SIZE) {
-            result=pa_simple_write(stream, audio_buffer, (size_t)AUDIO_BUFFER_SIZE, &error);
-            if(result< 0) {
-                fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(error));
-                //_exit(1);
-            }
-            audio_offset=0;
-        }
-    }
-
-}
-*/

diff --git a/new_protocol.c b/new_protocol.c
index b828ed6212b5c7331c1ae623a5bf7404ccaf3876..3c134cc49fad50c294a2b3255f958917078485b7 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -135,8 +135,8 @@ static int outputsamples=BUFFER_SIZE;
 static double iqinputbuffer[BUFFER_SIZE*2];
 static double audiooutputbuffer[BUFFER_SIZE*2];
 
-static short leftaudiosample;
-static short rightaudiosample;
+static int leftaudiosample;
+static int rightaudiosample;
 static long audiosequence;
 static unsigned char audiobuffer[1444];
 static int audioindex;
@@ -145,6 +145,10 @@ static int audioindex;
 static int freedv_samples=0;
 static int freedv_resample=6;  // convert from 48000 to 8000
 #endif
+#ifdef PSK
+static int psk_samples=0;
+static int psk_resample=6;  // convert from 48000 to 8000
+#endif
 
 static void new_protocol_high_priority(int run,int tx,int drive);
 static void* new_protocol_thread(void* arg);
@@ -615,8 +619,8 @@ void* new_protocol_thread(void* arg) {
     int b;
     int leftsample;
     int rightsample;
-    float leftsamplefloat;
-    float rightsamplefloat;
+    double leftsampledouble;
+    double rightsampledouble;
 
     int previous_ptt;
     int previous_dot;
@@ -624,7 +628,7 @@ void* new_protocol_thread(void* arg) {
 
 
     int micsample;
-    float micsamplefloat;
+    double micsampledouble;
 
     int micsamples;
 
@@ -718,13 +722,11 @@ fprintf(stderr,"outputsamples=%d\n", outputsamples);
                   rightsample += (int)((unsigned char)buffer[b++]) << 8;
                   rightsample += (int)((unsigned char)buffer[b++]);
 
-                  leftsamplefloat=(float)leftsample/8388607.0; // for 24 bits
-                  rightsamplefloat=(float)rightsample/8388607.0; // for 24 bits
+                  leftsampledouble=(double)leftsample/8388607.0; // for 24 bits
+                  rightsampledouble=(double)rightsample/8388607.0; // for 24 bits
             
-                  //leftinputbuffer[samples]=leftsamplefloat;
-                  //rightinputbuffer[samples]=rightsamplefloat;
-                  iqinputbuffer[samples*2]=(double)leftsamplefloat;
-                  iqinputbuffer[(samples*2)+1]=(double)rightsamplefloat;
+                  iqinputbuffer[samples*2]=leftsampledouble;
+                  iqinputbuffer[(samples*2)+1]=rightsampledouble;
 
                   samples++;
                   if(samples==BUFFER_SIZE) {
@@ -794,9 +796,9 @@ if(dash!=previous_dash) {
                         for(s=0;s<modem_samples;s++) {
                           for(j=0;j<freedv_resample;j++) {  // 8K to 48K
                             micsample=mod_out[s];
-                            micsamplefloat=(float)micsample/32767.0f; // 16 bit sample 2^16-1
-                            micinputbuffer[micsamples*2]=(double)micsamplefloat*mic_gain;
-                            micinputbuffer[(micsamples*2)+1]=(double)micsamplefloat*mic_gain;
+                            micsampledouble=(double)micsample/32767.0; // 16 bit sample 2^16-1
+                            micinputbuffer[micsamples*2]=micsampledouble*mic_gain;
+                            micinputbuffer[(micsamples*2)+1]=micsampledouble*mic_gain;
                             micsamples++;
                             if(micsamples==buffer_size) {
                               full_tx_buffer();
@@ -812,9 +814,9 @@ if(dash!=previous_dash) {
                     }
                   } else {
 #endif
-                    micsamplefloat = (float)micsample/32767.0F; // 16 bit sample
-                    micinputbuffer[micsamples*2]=(double)(micsamplefloat*mic_gain);
-                    micinputbuffer[(micsamples*2)+1]=(double)(micsamplefloat*mic_gain);
+                    micsampledouble = (double)micsample/32767.0; // 16 bit sample
+                    micinputbuffer[micsamples*2]=micsampledouble*mic_gain;
+                    micinputbuffer[(micsamples*2)+1]=micsampledouble*mic_gain;
 
                     micsamples++;
 
@@ -852,119 +854,139 @@ if(dash!=previous_dash) {
     close(data_socket);
 }
 
-static void full_rx_buffer() {
-  int j;
-  int error;
-
-  fexchange0(CHANNEL_RX0+receiver, iqinputbuffer, audiooutputbuffer, &error);
-  if(error!=0) {
-    fprintf(stderr,"fexchange0 returned error: %d for receiver %d\n", error,receiver);
-  }
-  Spectrum0(1, CHANNEL_RX0+receiver, 0, 0, iqinputbuffer);
-
 #ifdef FREEDV
-  if(mode==modeFREEDV) {
-    int demod_samples;
-    for(j=0;j<outputsamples;j++) {
-      leftaudiosample=(short)(audiooutputbuffer[j*2]*32767.0*volume);
-      rightaudiosample=(short)(audiooutputbuffer[(j*2)+1]*32767.0*volume);
-      demod_samples=demod_sample_freedv(leftaudiosample);
-      if(demod_samples!=0) {
-        int s;
-        int t;
-        for(s=0;s<demod_samples;s++) {
-          if(freedv_sync) {
-            leftaudiosample=rightaudiosample=(short)((double)speech_out[s]*volume);
-          } else {
-            leftaudiosample=rightaudiosample=0;
+static void process_freedv_rx_buffer() {
+  int j;
+  int demod_samples;
+  for(j=0;j<outputsamples;j++) {
+    leftaudiosample=(short)(audiooutputbuffer[j*2]*32767.0*volume);
+    rightaudiosample=(short)(audiooutputbuffer[(j*2)+1]*32767.0*volume);
+    demod_samples=demod_sample_freedv(leftaudiosample);
+    if(demod_samples!=0) {
+      int s;
+      int t;
+      for(s=0;s<demod_samples;s++) {
+        if(freedv_sync) {
+          leftaudiosample=rightaudiosample=(short)((double)speech_out[s]*volume);
+        } else {
+          leftaudiosample=rightaudiosample=0;
+        }
+        for(t=0;t<6;t++) { // 8k to 48k
+          if(local_audio) {
+            audio_write(leftaudiosample,rightaudiosample);
           }
-          for(t=0;t<6;t++) { // 8k to 48k
-            if(local_audio) {
-              audio_write(leftaudiosample,rightaudiosample);
-            }
-            audiobuffer[audioindex++]=leftaudiosample>>8;
-            audiobuffer[audioindex++]=leftaudiosample;
-            audiobuffer[audioindex++]=rightaudiosample>>8;
-            audiobuffer[audioindex++]=rightaudiosample;
-            if(audioindex>=sizeof(audiobuffer)) {
-              // insert the sequence
-              audiobuffer[0]=audiosequence>>24;
-              audiobuffer[1]=audiosequence>>16;
-              audiobuffer[2]=audiosequence>>8;
-              audiobuffer[3]=audiosequence;
-              // send the buffer
-              if(sendto(data_socket,audiobuffer,sizeof(audiobuffer),0,(struct sockaddr*)&audio_addr,audio_addr_length)<0) {
-                fprintf(stderr,"sendto socket failed for audio\n");
-                exit(1);
-              }
-              audioindex=4;
-              audiosequence++;
+          audiobuffer[audioindex++]=leftaudiosample>>8;
+          audiobuffer[audioindex++]=leftaudiosample;
+          audiobuffer[audioindex++]=rightaudiosample>>8;
+          audiobuffer[audioindex++]=rightaudiosample;
+          if(audioindex>=sizeof(audiobuffer)) {
+            // insert the sequence
+            audiobuffer[0]=audiosequence>>24;
+            audiobuffer[1]=audiosequence>>16;
+            audiobuffer[2]=audiosequence>>8;
+            audiobuffer[3]=audiosequence;
+            // send the buffer
+            if(sendto(data_socket,audiobuffer,sizeof(audiobuffer),0,(struct sockaddr*)&audio_addr,audio_addr_length)<0) {
+              fprintf(stderr,"sendto socket failed for audio\n");
+              exit(1);
             }
+            audioindex=4;
+            audiosequence++;
           }
         }
       }
     }
-  } else {
+  }
+}
 #endif
-    for(j=0;j<outputsamples;j++) {
-      leftaudiosample=(short)(audiooutputbuffer[j*2]*32767.0*volume);
-      rightaudiosample=(short)(audiooutputbuffer[(j*2)+1]*32767.0*volume);
-  
-      if(local_audio) {
-        audio_write(leftaudiosample,rightaudiosample);
+
+static void process_rx_buffer() {
+  int j;
+  for(j=0;j<outputsamples;j++) {
+    leftaudiosample=(short)(audiooutputbuffer[j*2]*32767.0*volume);
+    rightaudiosample=(short)(audiooutputbuffer[(j*2)+1]*32767.0*volume);
+
+#ifdef PSK
+    if(mode==modePSK) {
+      if(psk_samples==0) {
+        psk_demod((double)((leftaudiosample+rightaudiosample)/2));
+      }
+      psk_samples++;
+      if(psk_samples==psk_resample) {
+        psk_samples=0;
       }
+    }
+#endif
+    if(local_audio) {
+      audio_write(leftaudiosample,rightaudiosample);
+    }
 
-      audiobuffer[audioindex++]=leftaudiosample>>8;
-      audiobuffer[audioindex++]=leftaudiosample;
-      audiobuffer[audioindex++]=rightaudiosample>>8;
-      audiobuffer[audioindex++]=rightaudiosample;
-  
-      if(audioindex>=sizeof(audiobuffer)) {
-        // insert the sequence
-        audiobuffer[0]=audiosequence>>24;
-        audiobuffer[1]=audiosequence>>16;
-        audiobuffer[2]=audiosequence>>8;
-        audiobuffer[3]=audiosequence;
-        // send the buffer
-        if(sendto(data_socket,audiobuffer,sizeof(audiobuffer),0,(struct sockaddr*)&audio_addr,audio_addr_length)<0) {
-          fprintf(stderr,"sendto socket failed for audio\n");
-          exit(1);
-        }
-        audioindex=4;
-        audiosequence++;
+    audiobuffer[audioindex++]=leftaudiosample>>8;
+    audiobuffer[audioindex++]=leftaudiosample;
+    audiobuffer[audioindex++]=rightaudiosample>>8;
+    audiobuffer[audioindex++]=rightaudiosample;
+
+    if(audioindex>=sizeof(audiobuffer)) {
+      // insert the sequence
+      audiobuffer[0]=audiosequence>>24;
+      audiobuffer[1]=audiosequence>>16;
+      audiobuffer[2]=audiosequence>>8;
+      audiobuffer[3]=audiosequence;
+      // send the buffer
+      if(sendto(data_socket,audiobuffer,sizeof(audiobuffer),0,(struct sockaddr*)&audio_addr,audio_addr_length)<0) {
+        fprintf(stderr,"sendto socket failed for audio\n");
+        exit(1);
       }
+      audioindex=4;
+      audiosequence++;
     }
+  }
+}
+
+static void full_rx_buffer() {
+  int j;
+  int error;
+
+  fexchange0(CHANNEL_RX0, iqinputbuffer, audiooutputbuffer, &error);
+#ifdef PSK
+  if(mode!=modePSK) {
+#endif
+    Spectrum0(1, CHANNEL_RX0, 0, 0, iqinputbuffer);
+#ifdef PSK
+  }
+#endif
+
 #ifdef FREEDV
+  if(mode==modeFREEDV) {
+    process_freedv_rx_buffer();
+    return;
   }
 #endif
+  process_rx_buffer();
 }
 
 static void full_tx_buffer() {
   long isample;
   long qsample;
-  double gain;
+  double gain=8388607.0*scale;;
   int j;
   int error;
 
-  if(tune==1) {
-    double tunefrequency = (double)(filterLow+((filterHigh - filterLow) / 2));
-    sineWave(micinputbuffer, BUFFER_SIZE, phase, tunefrequency);
-    phase=cosineWave(micinputbuffer, BUFFER_SIZE, phase, tunefrequency);
-  }
-
   fexchange0(CHANNEL_TX, micinputbuffer, micoutputbuffer, &error);
-  if(error!=0) {
-    fprintf(stderr,"fexchange0 returned error: %d for transmitter\n", error);
+  Spectrum0(1, CHANNEL_TX, 0, 0, micoutputbuffer);
+
+#ifdef FREEDV
+  if(mode==modeFREEDV) {
+    gain=32767.0*freedv_scale;
   }
+#endif
 
-  if(d->device!=DEVICE_METIS || atlas_penelope) {
+  if(d->device==DEVICE_METIS && atlas_penelope) {
     if(tune) {
-      gain=8388607.0*255.0/(double)tune_drive;
+      gain=8388607.0*(double)tune_drive;
     } else {
-      gain=8388607.0*255.0/(double)drive;
+      gain=8388607.0*(double)drive;
     }
-  } else {
-    gain=8388607.0;
   }
 
   for(j=0;j<micoutputsamples;j++) {
@@ -995,7 +1017,6 @@ static void full_tx_buffer() {
     }
 
   }
-  Spectrum0(1, CHANNEL_TX, 0, 0, micoutputbuffer);
 }
 
 void* new_protocol_timer_thread(void* arg) {

diff --git a/old_protocol.c b/old_protocol.c
index 8e9fe6f8aeca1ea6ae7a5671c31e8739b8130831..b56940b209f89eecf80885ab2c093802645e21ab 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -575,12 +575,14 @@ static void process_rx_buffer() {
     left_rx_sample=(short)(audiooutputbuffer[j*2]*32767.0*volume);
     right_rx_sample=(short)(audiooutputbuffer[(j*2)+1]*32767.0*volume);
 #ifdef PSK
-    if(psk_samples==0) {
-      psk_demod((left_rx_sample+right_rx_sample)/2);
-    }
-    psk_samples++;
-    if(psk_samples==psk_divisor) {
-      psk_samples=0;
+    if(mode==modePSK) {
+      if(psk_samples==0) {
+        psk_demod((double)((left_rx_sample+right_rx_sample)/2));
+      }
+      psk_samples++;
+      if(psk_samples==psk_divisor) {
+        psk_samples=0;
+      }
     }
 #endif
     if(local_audio) {

diff --git a/pihpsdr b/pihpsdr
index 5bfb5121e66573f6d1153399a205b2186e588be1..0935ce84dc25cfacc999e4f9376663953ddb75fe 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 560a1f1ad9886627593d5346f1da1be3f7f92d91..a55f802e28cb848e34d35a227b1844f92f5c119d 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index 5bfb5121e66573f6d1153399a205b2186e588be1..0935ce84dc25cfacc999e4f9376663953ddb75fe 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ