]> git.rkrishnan.org Git - pihpsdr.git/commitdiff
CW level scaling: put them inside the sw_level_ctrl macro
authorRamakrishnan Muthukrishnan <ram@rkrishnan.org>
Sun, 22 Jan 2023 06:56:21 +0000 (12:26 +0530)
committerRamakrishnan Muthukrishnan <ram@rkrishnan.org>
Sun, 22 Jan 2023 06:56:21 +0000 (12:26 +0530)
transmitter.c

index 37d89c413b4ef995299cef6536c38639692fb82d..894617df11b24d34927b793b901f9d310ac79de9 100644 (file)
@@ -1091,9 +1091,10 @@ static void full_tx_buffer(TRANSMITTER *tx) {
              qsample=floor(gain*ramp+0.5);         // always non-negative, isample is just the pulse envelope
              sidetone=sidevol * ramp * getNextInternalSideToneSample();
 
-              // isample = isample >= 0.0 ? (long)floor(isample * gain + 0.5) : (long)ceil(isample * gain - 0.5);
-              // qsample = qsample >= 0.0 ? (long)floor(qsample * gain + 0.5) : (long)ceil(qsample * gain - 0.5);
-
+#ifdef SW_LEVEL_CTRL
+              isample = isample >= 0.0 ? (long)floor(isample * gain + 0.5) : (long)ceil(isample * gain - 0.5);
+              qsample = qsample >= 0.0 ? (long)floor(qsample * gain + 0.5) : (long)ceil(qsample * gain - 0.5);
+#endif
              old_protocol_iq_samples_with_sidetone(isample,qsample,sidetone);
            }
            break;
@@ -1107,9 +1108,10 @@ static void full_tx_buffer(TRANSMITTER *tx) {
              ramp=cw_shape_buffer192[j];                       // between 0.0 and 1.0
              qsample=floor(gain*ramp+0.5);                     // always non-negative, isample is just the pulse envelope
 
-              // isample = isample >= 0.0 ? (long)floor(isample * gain + 0.5) : (long)ceil(isample * gain - 0.5);
-              // qsample = qsample >= 0.0 ? (long)floor(qsample * gain + 0.5) : (long)ceil(qsample * gain - 0.5);
-
+#ifdef SW_LEVEL_CTRL
+              isample = isample >= 0.0 ? (long)floor(isample * gain + 0.5) : (long)ceil(isample * gain - 0.5);
+              qsample = qsample >= 0.0 ? (long)floor(qsample * gain + 0.5) : (long)ceil(qsample * gain - 0.5);
+#endif
              new_protocol_iq_samples(isample,qsample);
            }
            break;