Fixed PR31 that I mistakenly brought back, and removed unused variables.

Author: boblark

radioCWModulator_F32.cpp

@@ -15,12 +15,9 @@ void radioCWModulator_F32::update(void)  {
    if(!enableXmit)
       return;
 
-   float32_t circTemp[64];  // Storage for data from Gaussian
-   uint16_t tempIndex;
    uint16_t index, i;
    float32_t a, b;
    audio_block_f32_t *blockOut;
-   int32_t circIndexSave24;
    blockOut = AudioStream_F32::allocate_f32();   // Output block
    if (!blockOut)  return;
 
@@ -193,17 +190,20 @@ void radioCWModulator_F32::update(void)  {
    */
    if(sampleRate == SR_24KSPS)
       {
+      // ToDo:  Re-scale coefficients of FIR x2.0 to eliminate next statement
       for(int kk=0; kk<64; kk++)   dataBuf12A[kk] *= 2.0f;
       arm_fir_interpolate_f32 (&interp12_24Inst, dataBuf12A, dataBuf24, 64);
       }
    else if(sampleRate == SR_48KSPS)
       {
+      // ToDo:  Re-scale coefficients of FIR x2.0 to eliminate next statement
       for(int kk=0; kk<32; kk++)   dataBuf12A[kk] *= 4.0f;
       arm_fir_interpolate_f32 (&interp12_24Inst, dataBuf12A, dataBuf24, 32);
       arm_fir_interpolate_f32 (&interp24_48Inst, dataBuf24,  dataBuf48, 64);
       }
    else if(sampleRate == SR_96KSPS)
       {
+      // ToDo:  Re-scale coefficients of FIR x2.0 to eliminate next statement
       for(int kk=0; kk<16; kk++)  dataBuf12A[kk] *= 8.0f;
       arm_fir_interpolate_f32 (&interp12_24Inst, dataBuf12A, dataBuf24, 16);
       arm_fir_interpolate_f32 (&interp24_48Inst, dataBuf24,  dataBuf48, 32);
@@ -213,7 +213,7 @@ void radioCWModulator_F32::update(void)  {
    // Interpolation is complete, now amplitude modulate CW onto a sine wave.
    for (i=0; i < 128; i++)   // Always 128 modulation signals
       {
-      float32_t vOut;
+      float32_t vOut = 0.0;
       if(sampleRate == SR_12KSPS)
          vOut = dataBuf12[i];
       else if(sampleRate == SR_24KSPS)

radioCWModulator_F32.h

@@ -45,8 +45,13 @@
 // 22 to 25 ksps.  setSampleRate_Hz() changed to bool (true if successful, false
 // if unsupported rate.
 
-// *** 15 SEPT 2025  VERSION USING FULL FIR FILTERS (multiplying by zeros) ***
-
+/* *** 15 SEPT 2025  VERSION USING FULL FIR FILTERS (multiplying by zeros) ***
+   Processor time per update():
+      12 ksps Sample rate  81 uSec   0.76% of processor
+      24 ksps              59 uSec   1.1%
+      48 ksps              48 uSec   1.8%
+      96 ksks              41 uSec   3.1%
+ */
 /* ToDo:  Revise to polyphase interpolation to improve execution time.
    See Richard G. Lyons,  "Understanding Digital Signal Processing,"
    Third Edition, Prentice-Hall 2011, Section 10.12.2 Half-Band
@@ -59,6 +64,8 @@
    filter coefficient is zero, except for the center one that is
    always 0.5. The zero-product multiply-and-accumulates are not done by
    omitting them from the coefficient array.
+
+   Comment: The processor useage is so small, this change is not of value.  RSL
  */
 
 #ifndef radioCWModulator_F32_h_
@@ -115,7 +122,7 @@ class radioCWModulator_F32 : public AudioStream_F32
          dataBuf12[ii] = 0.0f;
       for(int ii=0; ii<128; ii++)
          {
-         dataBuf12[ii]     = 0.0f;
+         dataBuf12[ii] = 0.0f;
          dataBuf24[ii] = 0.0f;    // Buffer for 12 to 24 ksps interp
          dataBuf48[ii] = 0.0f;
          dataBuf96[ii] = 0.0f;
@@ -167,7 +174,7 @@ class radioCWModulator_F32 : public AudioStream_F32
       {
       uint16_t space = getBufferSpace();
       uint16_t size = strlen(_pStr);
-      if(space < size)  return  false;
+      if(space <= size)  return  false;  // Fixed twice - thanks defragster!
       for(int kk=0; kk<(int)strlen(_pStr); kk++)
          sendCW( (uint16_t)*(_pStr+kk) );
       return true;