Remove unavailable .h file includes

pull/11/head
boblark 4 years ago
parent 4fb7a512ab
commit 2ff6ebd02f
  1. 2
      OpenAudio_ArduinoLibrary.h
  2. 60
      examples/ReceiverFM/ReceiverFM.ino
  3. 4
      examples/SignalNoise_float/SignalNoise_float.ino

@ -18,7 +18,7 @@
#include "AudioMultiply_F32.h" #include "AudioMultiply_F32.h"
#include "AudioSettings_F32.h" #include "AudioSettings_F32.h"
//#include "input_i2s_f32.h" //#include "input_i2s_f32.h"
#include "output_i2s_OA_f32.h" //#include "output_i2s_OA_f32.h"
#include "play_queue_f32.h" #include "play_queue_f32.h"
#include "record_queue_f32.h" #include "record_queue_f32.h"
#include "synth_pinknoise_f32.h" #include "synth_pinknoise_f32.h"

@ -8,25 +8,46 @@
* *
* Change the value of sine1.frequency to see the DC output change. * Change the value of sine1.frequency to see the DC output change.
* See FMReceiver2.ino for testing with real AC modulation. * See FMReceiver2.ino for testing with real AC modulation.
*
* As an alternative the input can come from the ADC for "SINE_ADC 0"
*
* Output is sent to left channel SGTL5000 DAC.
*/ */
#include "Audio.h" #include "Audio.h"
#include <OpenAudio_ArduinoLibrary.h> #include <OpenAudio_ArduinoLibrary.h>
// Uncomment the lines "SINE" for internally generated sine wave. // SINE_ADC 1 for internally generated sine wave.
// Uncomment the lines "ADC" to use the SGTL5000 Teensy audio adaptor // SINE_ADC 0 to use the SGTL5000 Teensy audio adaptor ADC/DAC
// AudioInputI2S_F32 i2sIn; // ADC #define SINE_ADC 0
AudioSynthWaveformSine_F32 sine1; // SINE
#if SINE_ADC
AudioSynthWaveformSine_F32 sine1;
RadioFMDetector_F32 fmDet1; RadioFMDetector_F32 fmDet1;
AudioRecordQueue_F32 queue1; AudioRecordQueue_F32 queue1;
AudioOutputI2S_F32 i2sOut; // Leave in for timing AudioConvert_F32toI16 cnvrtOut;
// AudioControlSGTL5000 sgtl5000_1; // ADC AudioOutputI2S i2sOut;
AudioControlSGTL5000 sgtl5000_1;
// AudioConnection_F32 connect0(i2sIn, 0, fmDet1, 0); // ADC AudioConnection_F32 connect1(sine1, 0, fmDet1, 0);
AudioConnection_F32 connect0(sine1, 0, fmDet1, 0); // SINE AudioConnection_F32 connect3(fmDet1, 0, cnvrtOut, 0);
// AudioConnection_F32 connect1(sine1, 0, queue1, 0); AudioConnection connect4(cnvrtOut, 0, i2sOut, 0); // left
AudioConnection_F32 connect3(fmDet1, 0, i2sOut, 0); AudioConnection_F32 connect5(fmDet1, 0, queue1, 0);
#else // Input from Teensy Audio Adaptor SGTL5000
// Note - With no input, the FM detector output is all noise. This
// can be loud, so one can add a gain block at the fmDet1 output (like 0.05 gain).
AudioInputI2S i2sIn;
AudioConvert_I16toF32 cnvrtIn;
RadioFMDetector_F32 fmDet1;
AudioRecordQueue_F32 queue1;
AudioConvert_F32toI16 cnvrtOut;
AudioOutputI2S i2sOut;
AudioControlSGTL5000 sgtl5000_1;
AudioConnection connect1(i2sIn, 0, cnvrtIn, 0); // left
AudioConnection_F32 connect2(cnvrtIn, 0, fmDet1, 0);
AudioConnection_F32 connect3(fmDet1, 0, cnvrtOut, 0);
AudioConnection_F32 connect5(fmDet1, 0, queue1, 0); AudioConnection_F32 connect5(fmDet1, 0, queue1, 0);
AudioConnection connect7(cnvrtOut, 0, i2sOut, 0);
#endif
float dt1[512]; // Place to save output float dt1[512]; // Place to save output
float *pq1, *pd1; float *pq1, *pd1;
@ -39,10 +60,12 @@ void setup(void) {
Serial.begin(300); delay(1000); // Any rate is OK Serial.begin(300); delay(1000); // Any rate is OK
Serial.println("Serial Started"); Serial.println("Serial Started");
// sgtl5000_1.enable(); // ADC sgtl5000_1.enable();
// sgtl5000_1.inputSelect(AUDIO_INPUT_LINEIN); //ADC sgtl5000_1.inputSelect(AUDIO_INPUT_LINEIN);
sine1.frequency(14000.0); // SINE #if SINE_ADC
sine1.frequency(14000.0);
#endif
// The FM detector has error checking during object construction // The FM detector has error checking during object construction
// when Serial.print is not available. See RadioFMDetector_F32.h: // when Serial.print is not available. See RadioFMDetector_F32.h:
@ -79,10 +102,15 @@ void loop(void) {
} }
// We have 512 data samples. Serial.print them // We have 512 data samples. Serial.print them
if(i == 4) { if(i == 4) {
Serial.println("512 Time in seconds and FM Output samples:"); #if SINE_ADC
Serial.println("For 14,000 Hz sine wave input:");
#endif
Serial.println("512 samples of FM Det output, starting t=0");
Serial.println("Time in sec, FM Output, Dev from 15,000 Hz:");
for (k=0; k<512; k++) { for (k=0; k<512; k++) {
Serial.print (0.000022667*(float32_t)k, 6); Serial.print (", "); Serial.print (0.000022667*(float32_t)k, 6); Serial.print (", ");
Serial.println (dt1[k],7); Serial.print (dt1[k],7); Serial.print (", ");
Serial.println (dt1[k]/0.000142421, 2); // Convert to Hz
} }
i = 5; i = 5;
} }

@ -49,8 +49,8 @@ int gainControlDB = -35; // Set gain in dB.
void setup(void) { void setup(void) {
float32_t gain; float32_t gain;
AudioMemory(5); AudioMemory(10);
AudioMemory_F32(8); AudioMemory_F32(10);
for (int i=0; i<4; i++) sum1.gain(i, 0.0); // All off for (int i=0; i<4; i++) sum1.gain(i, 0.0); // All off

Loading…
Cancel
Save