From 409fdd38baef135f81c80035b54102abb725251f Mon Sep 17 00:00:00 2001 From: Chip Audette Date: Sun, 12 Feb 2017 21:12:01 -0500 Subject: [PATCH] Update Blocks with GUI directive for ins and outs --- AudioControlSGTL5000_Extended.h | 1 + AudioConvert_F32.h | 2 ++ AudioEffectCompressor_F32.h | 1 + AudioEffectGain_F32.h | 1 + AudioFilterFIR_F32.h | 1 + AudioFilterIIR_F32.h | 1 + AudioMixer4_F32.h | 1 + AudioMultiply_F32.h | 1 + control_tlv320aic3206.h | 2 ++ input_i2s_f32.h | 10 +--------- output_i2s_f32.h | 14 ++------------ synth_sine_f32.h | 1 + synth_waveform_F32.h | 1 + 13 files changed, 16 insertions(+), 21 deletions(-) diff --git a/AudioControlSGTL5000_Extended.h b/AudioControlSGTL5000_Extended.h index 5273fbd..fe1c8a3 100644 --- a/AudioControlSGTL5000_Extended.h +++ b/AudioControlSGTL5000_Extended.h @@ -13,6 +13,7 @@ class AudioControlSGTL5000_Extended : public AudioControlSGTL5000 { + //GUI: inputs:0, outputs:0 //this line used for automatic generation of GUI node public: AudioControlSGTL5000_Extended(void) {}; bool micBiasEnable(void) { diff --git a/AudioConvert_F32.h b/AudioConvert_F32.h index df8af3e..64af32e 100644 --- a/AudioConvert_F32.h +++ b/AudioConvert_F32.h @@ -7,6 +7,7 @@ class AudioConvert_I16toF32 : public AudioStream_F32 //receive Int and transmits Float { + //GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: AudioConvert_I16toF32(void) : AudioStream_F32(1, inputQueueArray_f32) { }; void update(void) { @@ -44,6 +45,7 @@ class AudioConvert_I16toF32 : public AudioStream_F32 //receive Int and transmits class AudioConvert_F32toI16 : public AudioStream_F32 //receive Float and transmits Int { + //GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: AudioConvert_F32toI16(void) : AudioStream_F32(1, inputQueueArray_Float) {}; void update(void) { diff --git a/AudioEffectCompressor_F32.h b/AudioEffectCompressor_F32.h index 93e4929..f31ddd6 100644 --- a/AudioEffectCompressor_F32.h +++ b/AudioEffectCompressor_F32.h @@ -18,6 +18,7 @@ class AudioEffectCompressor_F32 : public AudioStream_F32 { + //GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: //constructor AudioEffectCompressor_F32(void) : AudioStream_F32(1, inputQueueArray_f32) { diff --git a/AudioEffectGain_F32.h b/AudioEffectGain_F32.h index ac3dcba..8539cc7 100644 --- a/AudioEffectGain_F32.h +++ b/AudioEffectGain_F32.h @@ -14,6 +14,7 @@ class AudioEffectGain_F32 : public AudioStream_F32 { + //GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: //constructor AudioEffectGain_F32(void) : AudioStream_F32(1, inputQueueArray_f32) {}; diff --git a/AudioFilterFIR_F32.h b/AudioFilterFIR_F32.h index 0488ec2..4ccbf10 100644 --- a/AudioFilterFIR_F32.h +++ b/AudioFilterFIR_F32.h @@ -21,6 +21,7 @@ class AudioFilterFIR_F32 : public AudioStream_F32 { +//GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: AudioFilterFIR_F32(void): AudioStream_F32(1,inputQueueArray), coeff_p(FIR_F32_PASSTHRU) { } diff --git a/AudioFilterIIR_F32.h b/AudioFilterIIR_F32.h index 5a8e804..0f98913 100644 --- a/AudioFilterIIR_F32.h +++ b/AudioFilterIIR_F32.h @@ -21,6 +21,7 @@ class AudioFilterIIR_F32 : public AudioStream_F32 { + //GUI: inputs:1, outputs:1 //this line used for automatic generation of GUI node public: AudioFilterIIR_F32(void): AudioStream_F32(1,inputQueueArray), coeff_p(FIR_F32_PASSTHRU) { } diff --git a/AudioMixer4_F32.h b/AudioMixer4_F32.h index 0b7af83..ac153a5 100644 --- a/AudioMixer4_F32.h +++ b/AudioMixer4_F32.h @@ -17,6 +17,7 @@ #include class AudioMixer4_F32 : public AudioStream_F32 { +//GUI: inputs:4, outputs:1 //this line used for automatic generation of GUI node public: AudioMixer4_F32() : AudioStream_F32(4, inputQueueArray) { for (int i=0; i<4; i++) multiplier[i] = 1.0; diff --git a/AudioMultiply_F32.h b/AudioMultiply_F32.h index aeaf284..2d4d7f7 100644 --- a/AudioMultiply_F32.h +++ b/AudioMultiply_F32.h @@ -17,6 +17,7 @@ class AudioMultiply_F32 : public AudioStream_F32 { + //GUI: inputs:2, outputs:1 //this line used for automatic generation of GUI node public: AudioMultiply_F32(void) : AudioStream_F32(2, inputQueueArray_f32) {}; void update(void); diff --git a/control_tlv320aic3206.h b/control_tlv320aic3206.h index e7c4acf..c2467cf 100644 --- a/control_tlv320aic3206.h +++ b/control_tlv320aic3206.h @@ -16,6 +16,8 @@ class AudioControlTLV320AIC3206: public AudioControl { public: + //GUI: inputs:0, outputs:0 //this line used for automatic generation of GUI node + AudioControlTLV320AIC3206(void) {}; bool enable(void); bool disable(void); bool volume(float n); diff --git a/input_i2s_f32.h b/input_i2s_f32.h index 25e022e..9720f33 100644 --- a/input_i2s_f32.h +++ b/input_i2s_f32.h @@ -34,6 +34,7 @@ class AudioInputI2S_F32 : public AudioStream_F32 { +//GUI: inputs:0, outputs:2 //this line used for automatic generation of GUI nodes public: AudioInputI2S_F32(void) : AudioStream_F32(0, NULL) { begin(); } virtual void update(void); @@ -49,14 +50,5 @@ private: static uint16_t block_offset; }; -/* -class AudioInputI2Sslave : public AudioInputI2S -{ -public: - AudioInputI2Sslave(void) : AudioInputI2S(0) { begin(); } - void begin(void); - friend void dma_ch1_isr(void); -}; -*/ #endif diff --git a/output_i2s_f32.h b/output_i2s_f32.h index 18b2eb0..bed67a0 100644 --- a/output_i2s_f32.h +++ b/output_i2s_f32.h @@ -34,6 +34,7 @@ class AudioOutputI2S_F32 : public AudioStream_F32 { +//GUI: inputs:2, outputs:0 //this line used for automatic generation of GUI node public: AudioOutputI2S_F32(void) : AudioStream_F32(2, inputQueueArray) { begin(); } virtual void update(void); @@ -56,17 +57,6 @@ private: }; -/* -class AudioOutputI2Sslave : public AudioOutputI2S -{ -public: - AudioOutputI2Sslave(void) : AudioOutputI2S(0) { begin(); } ; - void begin(void); - friend class AudioInputI2Sslave; - friend void dma_ch0_isr(void); -protected: - static void config_i2s(void); -}; -*/ + #endif diff --git a/synth_sine_f32.h b/synth_sine_f32.h index 3cdcd3f..255a5c3 100644 --- a/synth_sine_f32.h +++ b/synth_sine_f32.h @@ -20,6 +20,7 @@ class AudioSynthWaveformSine_F32 : public AudioStream_F32 { +//GUI: inputs:0, outputs:1 //this line used for automatic generation of GUI node public: AudioSynthWaveformSine_F32() : AudioStream_F32(0, NULL), magnitude(16384) {} void frequency(float freq) { diff --git a/synth_waveform_F32.h b/synth_waveform_F32.h index 8591057..5c44f0b 100644 --- a/synth_waveform_F32.h +++ b/synth_waveform_F32.h @@ -16,6 +16,7 @@ class AudioSynthWaveform_F32 : public AudioStream_F32 { + //GUI: inputs:0, outputs:1 //this line used for automatic generation of GUI node public: enum OscillatorMode { OSCILLATOR_MODE_SINE = 0,