From: Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
Date: Sun, 22 Jan 2023 06:56:21 +0000 (+0530)
Subject: CW level scaling: put them inside the sw_level_ctrl macro
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/file/$top_link?a=commitdiff_plain;h=999d5a1d5eb22aef8727da02ea6e18148729da52;p=pihpsdr.git

CW level scaling: put them inside the sw_level_ctrl macro
---

diff --git a/transmitter.c b/transmitter.c
index 37d89c4..894617d 100644
--- a/transmitter.c
+++ b/transmitter.c
@@ -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;