diff --git a/examples/ReceiverPart1/ReceiverPart1.ino b/examples/ReceiverPart1/ReceiverPart1.ino index 855a489..8b137b3 100644 --- a/examples/ReceiverPart1/ReceiverPart1.ino +++ b/examples/ReceiverPart1/ReceiverPart1.ino @@ -7,14 +7,12 @@ */ #include "Audio.h" -#include -#include "DSP_TeensyAudio_F32.h" +#include "OpenAudio_ArduinoLibrary.h" AudioInputI2S i2s1; AudioSynthWaveformSine_F32 sine1; // Test signal RadioIQMixer_F32 iqmixer1; AudioFilter90Deg_F32 hilbert1; -// NOTE: Use AudioMixer4_F32 *from Tympan* AudioMixer4_F32 sum1; AudioRecordQueue_F32 queue1; // The LSB output AudioRecordQueue_F32 queue2; // The test sine wave @@ -28,7 +26,6 @@ AudioConnection_F32 patchCord7(hilbert1, 1, sum1, 1); AudioConnection_F32 patchCord8(sum1, 0, queue1, 0); AudioConnection_F32 patchCord9(sine1, 0, queue2, 0); -// Pick one of these #include "hilbert19A.h" #include "hilbert121A.h" #include "hilbert251A.h" @@ -42,13 +39,14 @@ void setup(void) { AudioMemory(5); AudioMemory_F32(10); Serial.begin(300); delay(1000); + sine1.frequency(14000.0); iqmixer1.frequency(16000.0); - // Pick one of the three, the 251 does not have + // Pick one of the three. Note that the 251 does not have // enough samples here to show the full build-up. // hilbert1.begin(hilbert19A, 19); - // hilbert1.begin(hilbert121A, 121); hilbert1.begin(hilbert121A, 121); + // hilbert1.begin(hilbert251A, 251); sum1.gain(0, 1.0); // Leave at 1.0 sum1.gain(1, -1.0); // -1 for LSB out iqmixer1.showError(1); // Prints update() errors diff --git a/examples/ReceiverPart2/ReceiverPart2.ino b/examples/ReceiverPart2/ReceiverPart2.ino index 83125ce..4f4d60f 100644 --- a/examples/ReceiverPart2/ReceiverPart2.ino +++ b/examples/ReceiverPart2/ReceiverPart2.ino @@ -41,25 +41,25 @@ #include "Audio.h" #include -#include "DSP_TeensyAudio_F32.h" -// ********* Mini Control Panel ********* +// ********* Mini Control Panel ************ // Set mode and gain here and re-compile // Here is the mode switch #define LSB 1 #define USB 2 #define NBFM 3 -uint16_t mode = NBFM; // <--Select mode +uint16_t mode = LSB; // <--Select mode -int gainControlDB = 0; // Set SSB gain in dB. 0 dB is a gain of 1.0 +int gainControlDB = 0; // <--Set SSB gain in dB. 0 dB is a gain of 1.0 + +// ****************************************************** -// ***************************************** // To work with T4.0 the I2S routine outputs 16-bit integer (I16). Then // use Audette I16 to F32 convert. Same below for output, in reverse. AudioInputI2S i2sIn; AudioConvert_I16toF32 cnvrt1; -AudioSwitch4_F32 switch1; // Select SSB or FM +AudioSwitch4_OA_F32 switch1; // Select SSB or FM RadioIQMixer_F32 iqmixer1; AudioFilter90Deg_F32 hilbert1; AudioMixer4_F32 sum1; // Summing node for the SSB receiver @@ -108,8 +108,8 @@ float32_t fir_IQ29[29] = { void setup(void) { float32_t vGain; - AudioMemory(5); - AudioMemory_F32(5); + AudioMemory(10); + AudioMemory_F32(10); Serial.begin(300); delay(1000); // Enable the audio shield, select input, and enable output