different PS DAC feeback peak value for HL2

diff --git a/hpsdrsim.c b/hpsdrsim.c
index 2f588d6c5f8b6ba011e404783a51dd392beb908a..ca54bf59b2778858c705269189f5299214695a1c 100644 (file)
--- a/hpsdrsim.c
+++ b/hpsdrsim.c
@@ -17,6 +17,7 @@
  * RF1 and RF2 signal strenght vary according to Preamp and Attenuator settings
  * RF3 signal strength varies according to TX-drive and TX-ATT settings
  * RF4 signal strength is normalized to amplitude of 0.407 (old protocol) or 0.2899 (new protocol)
+ *     note HERMESLITEV2 old protocol: 0.23
  *
  * The connection with the ADCs are:
  * ADC0: RF1 upon receive, RF3 upon transmit
@@ -1286,8 +1287,13 @@ void *handler_ep6(void *arg)
                        //
                        // TX signal with peak=0.407
                        //
-                       dacisample= isample[rxptr] * 0.407 * 8388607.0;
-                       dacqsample= qsample[rxptr] * 0.407 * 8388607.0;
+                        if (OLDDEVICE == DEVICE_HERMES_LITE2) {
+                         dacisample= isample[rxptr] * 0.230 * 8388607.0;
+                         dacqsample= qsample[rxptr] * 0.230 * 8388607.0;
+                        } else {
+                         dacisample= isample[rxptr] * 0.407 * 8388607.0;
+                         dacqsample= qsample[rxptr] * 0.407 * 8388607.0;
+                        }
 
                        for (k=0; k< receivers; k++) {
                            myisample=0;

diff --git a/radio.c b/radio.c
index 08d37e6b69bdea29e9ba6ad0df71310d96dcaca2..893c30b99d4308f2af37eee7ab751f7e8e920360 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -992,6 +992,7 @@ void start_radio() {
 
   //g_print("Create transmitter\n");
   if(can_transmit) {
+    double pk;
     if(duplex) {
       transmitter=create_transmitter(CHANNEL_TX, buffer_size, fft_size, updates_per_second, display_width/4, display_height/2);
     } else {
@@ -1009,7 +1010,21 @@ void start_radio() {
     tx_set_ps_sample_rate(transmitter,protocol==NEW_PROTOCOL?192000:active_receiver->sample_rate);
     receiver[PS_TX_FEEDBACK]=create_pure_signal_receiver(PS_TX_FEEDBACK, buffer_size,protocol==ORIGINAL_PROTOCOL?active_receiver->sample_rate:192000,display_width);
     receiver[PS_RX_FEEDBACK]=create_pure_signal_receiver(PS_RX_FEEDBACK, buffer_size,protocol==ORIGINAL_PROTOCOL?active_receiver->sample_rate:192000,display_width);
-    SetPSHWPeak(transmitter->id, protocol==ORIGINAL_PROTOCOL? 0.4067 : 0.2899);
+    switch (protocol) {
+      case NEW_PROTOCOL:
+       pk = 0.2899;
+       break;
+      case ORIGINAL_PROTOCOL:
+        switch (device) {
+         case DEVICE_HERMES_LITE2:
+           pk = 0.2300;
+            break;
+         default:
+           pk = 0.4067;
+            break;
+        }
+    }
+    SetPSHWPeak(transmitter->id, pk);
 #endif
 
   }