adjust #includes per restructure, deps

include/audio/Audio.h

@@ -34,7 +34,7 @@
 #error "The Audio Library only works with Teensy 3.X.  Teensy 2.0 is unsupported."
 #endif
 
-#include "DMAChannel.h"
+#include <core/DMAChannel.h>
 #if !defined(DMACHANNEL_HAS_BEGIN) || !defined(DMACHANNEL_HAS_BOOLEAN_CTOR)
 #error "You need to update DMAChannel.h & DMAChannel.cpp"
 #error "https://github.com/PaulStoffregen/cores/blob/master/teensy3/DMAChannel.h"
@@ -56,85 +56,85 @@
 #define AudioInterrupts()   (NVIC_ENABLE_IRQ(IRQ_SOFTWARE))
 
 // include all the library headers, so a sketch can use a single
-// #include <Audio.h> to get the whole library
+// #include <audio/Audio.h> to get the whole library
 //
-#include "analyze_fft256.h"
-#include "analyze_fft1024.h"
-#include "analyze_print.h"
-#include "analyze_tonedetect.h"
-#include "analyze_notefreq.h"
-#include "analyze_peak.h"
-#include "analyze_rms.h"
-#include "async_input_spdif3.h"
-#include "control_sgtl5000.h"
-#include "control_wm8731.h"
-#include "control_ak4558.h"
-#include "control_cs4272.h"
-#include "control_cs42448.h"
-#include "control_tlv320aic3206.h"
-#include "effect_bitcrusher.h"
-#include "effect_chorus.h"
-#include "effect_fade.h"
-#include "effect_flange.h"
-#include "effect_envelope.h"
-#include "effect_multiply.h"
-#include "effect_delay.h"
-#include "effect_delay_ext.h"
-#include "effect_midside.h"
-#include "effect_reverb.h"
-#include "effect_freeverb.h"
-#include "effect_waveshaper.h"
-#include "effect_granular.h"
-#include "effect_combine.h"
-#include "effect_rectifier.h"
-#include "filter_biquad.h"
-#include "filter_fir.h"
-#include "filter_variable.h"
-#include "filter_ladder.h"
-#include "input_adc.h"
-#include "input_adcs.h"
-#include "input_i2s.h"
-#include "input_i2s2.h"
-#include "input_i2s_quad.h"
-#include "input_i2s_hex.h"
-#include "input_i2s_oct.h"
-#include "input_tdm.h"
-#include "input_tdm2.h"
-#include "input_pdm.h"
-#include "input_spdif3.h"
-#include "mixer.h"
-#include "output_dac.h"
-#include "output_dacs.h"
-#include "output_i2s.h"
-#include "output_i2s2.h"
-#include "output_i2s_quad.h"
-#include "output_i2s_hex.h"
-#include "output_i2s_oct.h"
-#include "output_mqs.h"
-#include "output_pwm.h"
-#include "output_spdif.h"
-#include "output_spdif2.h"
-#include "output_spdif3.h"
-#include "output_pt8211.h"
-#include "output_pt8211_2.h"
-#include "output_tdm.h"
-#include "output_tdm2.h"
-#include "output_adat.h"
-#include "play_memory.h"
-#include "play_queue.h"
-#include "play_sd_raw.h"
-#include "play_sd_wav.h"
-#include "play_serialflash_raw.h"
-#include "record_queue.h"
-#include "synth_tonesweep.h"
-#include "synth_sine.h"
-#include "synth_waveform.h"
-#include "synth_dc.h"
-#include "synth_whitenoise.h"
-#include "synth_pinknoise.h"
-#include "synth_karplusstrong.h"
-#include "synth_simple_drum.h"
-#include "synth_pwm.h"
-#include "synth_wavetable.h"
+#include "./analyze_fft256.h"
+#include "./analyze_fft1024.h"
+#include "./analyze_print.h"
+#include "./analyze_tonedetect.h"
+#include "./analyze_notefreq.h"
+#include "./analyze_peak.h"
+#include "./analyze_rms.h"
+#include "./async_input_spdif3.h"
+#include "./control_sgtl5000.h"
+#include "./control_wm8731.h"
+#include "./control_ak4558.h"
+#include "./control_cs4272.h"
+#include "./control_cs42448.h"
+#include "./control_tlv320aic3206.h"
+#include "./effect_bitcrusher.h"
+#include "./effect_chorus.h"
+#include "./effect_fade.h"
+#include "./effect_flange.h"
+#include "./effect_envelope.h"
+#include "./effect_multiply.h"
+#include "./effect_delay.h"
+#include "./effect_delay_ext.h"
+#include "./effect_midside.h"
+#include "./effect_reverb.h"
+#include "./effect_freeverb.h"
+#include "./effect_waveshaper.h"
+#include "./effect_granular.h"
+#include "./effect_combine.h"
+#include "./effect_rectifier.h"
+#include "./filter_biquad.h"
+#include "./filter_fir.h"
+#include "./filter_variable.h"
+#include "./filter_ladder.h"
+#include "./input_adc.h"
+#include "./input_adcs.h"
+#include "./input_i2s.h"
+#include "./input_i2s2.h"
+#include "./input_i2s_quad.h"
+#include "./input_i2s_hex.h"
+#include "./input_i2s_oct.h"
+#include "./input_tdm.h"
+#include "./input_tdm2.h"
+#include "./input_pdm.h"
+#include "./input_spdif3.h"
+#include "./mixer.h"
+#include "./output_dac.h"
+#include "./output_dacs.h"
+#include "./output_i2s.h"
+#include "./output_i2s2.h"
+#include "./output_i2s_quad.h"
+#include "./output_i2s_hex.h"
+#include "./output_i2s_oct.h"
+#include "./output_mqs.h"
+#include "./output_pwm.h"
+#include "./output_spdif.h"
+#include "./output_spdif2.h"
+#include "./output_spdif3.h"
+#include "./output_pt8211.h"
+#include "./output_pt8211_2.h"
+#include "./output_tdm.h"
+#include "./output_tdm2.h"
+#include "./output_adat.h"
+#include "./play_memory.h"
+#include "./play_queue.h"
+#include "./play_sd_raw.h"
+#include "./play_sd_wav.h"
+#include "./play_serialflash_raw.h"
+#include "./record_queue.h"
+#include "./synth_tonesweep.h"
+#include "./synth_sine.h"
+#include "./synth_waveform.h"
+#include "./synth_dc.h"
+#include "./synth_whitenoise.h"
+#include "./synth_pinknoise.h"
+#include "./synth_karplusstrong.h"
+#include "./synth_simple_drum.h"
+#include "./synth_pwm.h"
+#include "./synth_wavetable.h"
 
 #endif

include/audio/Quantizer.h

@@ -29,7 +29,7 @@
 #ifndef quantizer_h_
 #define quantizer_h_
 
-#include "Arduino.h"
+#include <core/Arduino.h>
 
 //#define DEBUG_QUANTIZER
 

include/audio/Resampler.h

@@ -31,7 +31,7 @@
 #define resampler_h_
 
 
-#include "Arduino.h"
+#include <core/Arduino.h>
 //#define DEBUG_RESAMPLER  //activates debug output
 
 #define MAX_FILTER_SAMPLES 40961 //=1024*20 +1

include/audio/analyze_fft1024.h

@@ -27,9 +27,9 @@
 #ifndef analyze_fft1024_h_
 #define analyze_fft1024_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 // windows.c
 extern "C" {

include/audio/analyze_fft256.h

@@ -27,9 +27,9 @@
 #ifndef analyze_fft256_h_
 #define analyze_fft256_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 // windows.c
 extern "C" {

include/audio/analyze_notefreq.h

@@ -23,8 +23,8 @@
 #ifndef AudioAnalyzeNoteFrequency_h_
 #define AudioAnalyzeNoteFrequency_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 /***********************************************************************
  *              Safe to adjust these values below                      *
  *                                                                     *

include/audio/analyze_peak.h

@@ -27,8 +27,8 @@
 #ifndef analyze_peakdetect_h_
 #define analyze_peakdetect_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioAnalyzePeak : public AudioStream
 {

include/audio/analyze_print.h

@@ -27,8 +27,8 @@
 #ifndef analyze_print_h_
 #define analyze_print_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioAnalyzePrint : public AudioStream
 {

include/audio/analyze_rms.h

@@ -27,8 +27,8 @@
 #ifndef analyze_rms_h_
 #define analyze_rms_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioAnalyzeRMS : public AudioStream
 {

include/audio/analyze_tonedetect.h

@@ -27,8 +27,8 @@
 #ifndef analyze_tonedetect_h_
 #define analyze_tonedetect_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioAnalyzeToneDetect : public AudioStream
 {

include/audio/async_input_spdif3.h

@@ -28,12 +28,12 @@
  */
 #ifndef async_input_spdif3_h_
 #define async_input_spdif3_h_
-#include "Resampler.h"
-#include "Quantizer.h"
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
-#include <arm_math.h>
+#include "./Resampler.h"
+#include "./Quantizer.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
+#include <core/arm_math.h>
 
 //#define DEBUG_SPDIF_IN	//activates debug output
 

include/audio/biquad.h

@@ -29,8 +29,8 @@
 #ifndef biquad_coeffs_h_
 #define biquad_coeffs_h_
 
-#include "Arduino.h"
-#include <arm_math.h>
+#include <core/Arduino.h>
+#include <core/arm_math.h>
 #include <type_traits>
 
 enum class BiquadType {

include/audio/control_ak4558.h

@@ -7,7 +7,7 @@
 #ifndef control_ak4558_h_
 #define control_ak4558_h_
 
-#include "AudioControl.h"
+#include "./AudioControl.h"
 
 #define AK4558_SERIAL_DEBUG 1
 //if 1, then Serial Monitor will show debug information about configuration of the AK4558

include/audio/control_cs42448.h

@@ -27,7 +27,7 @@
 #ifndef control_cs42448_h_
 #define control_cs42448_h_
 
-#include "AudioControl.h"
+#include "./AudioControl.h"
 #include <math.h>
 
 class AudioControlCS42448 : public AudioControl

include/audio/control_cs4272.h

@@ -30,7 +30,7 @@
 #ifndef control_cs4272_h_
 #define control_cs4272_h_
 
-#include "AudioControl.h"
+#include "./AudioControl.h"
 
 class AudioControlCS4272 : public AudioControl
 {

include/audio/control_sgtl5000.h

@@ -27,8 +27,8 @@
 #ifndef control_sgtl5000_h_
 #define control_sgtl5000_h_
 
-#include <AudioStream.h>
-#include "AudioControl.h"
+#include <core/AudioStream.h>
+#include "./AudioControl.h"
 
 // SGTL5000-specific defines for headphones
 #define AUDIO_HEADPHONE_DAC 0

include/audio/control_tlv320aic3206.h

@@ -54,8 +54,8 @@
 #ifndef control_tlv320aic3206_h_
 #define control_tlv320aic3206_h_
 
-#include "AudioControl.h"
-#include <Arduino.h>
+#include "./AudioControl.h"
+#include <core/Arduino.h>
 
 //convenience names to use with inputSelect() to set whnch analog inputs to use
 #define AIC3206_INPUT_IN1            1   //uses IN1

include/audio/control_wm8731.h

@@ -27,7 +27,7 @@
 #ifndef control_wm8731_h_
 #define control_wm8731_h_
 
-#include "AudioControl.h"
+#include "./AudioControl.h"
 
 class AudioControlWM8731 : public AudioControl
 {

include/audio/effect_bitcrusher.h

@@ -28,8 +28,8 @@
 #ifndef effect_bitcrusher_h_
 #define effect_bitcrusher_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectBitcrusher : public AudioStream
 {

include/audio/effect_chorus.h

@@ -23,8 +23,8 @@
 #ifndef effect_chorus_h_
 #define effect_chorus_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 /******************************************************************/
 

include/audio/effect_combine.h

@@ -30,8 +30,8 @@
 
 #ifndef effect_digital_combine_h_
 #define effect_digital_combine_h_
-#include <Arduino.h>
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectDigitalCombine : public AudioStream
 {

include/audio/effect_delay.h

@@ -26,9 +26,9 @@
 
 #ifndef effect_delay_h_
 #define effect_delay_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 #if defined(__IMXRT1062__)
   // 4.00 second maximum on Teensy 4.0

include/audio/effect_delay_ext.h

@@ -26,9 +26,9 @@
 
 #ifndef effect_delay_ext_h_
 #define effect_delay_ext_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "spi_interrupt.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./spi_interrupt.h"
 
 enum AudioEffectDelayMemoryType_t {
 	AUDIO_MEMORY_23LC1024 = 0,	// 128k x 8 S-RAM

include/audio/effect_envelope.h

@@ -26,9 +26,9 @@
 
 #ifndef effect_envelope_h_
 #define effect_envelope_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 #define SAMPLES_PER_MSEC (AUDIO_SAMPLE_RATE_EXACT/1000.0)
 

include/audio/effect_fade.h

@@ -27,8 +27,8 @@
 #ifndef effect_fade_h_
 #define effect_fade_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectFade : public AudioStream
 {

include/audio/effect_flange.h

@@ -23,8 +23,8 @@
 #ifndef effect_flange_h_
 #define effect_flange_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 /******************************************************************/
 //                A u d i o E f f e c t F l a n g e

include/audio/effect_freeverb.h

@@ -26,8 +26,8 @@
 
 #ifndef effect_freeverb_h_
 #define effect_freeverb_h_
-#include <Arduino.h>
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectFreeverb : public AudioStream
 {

include/audio/effect_granular.h

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-#include "AudioStream.h"
+#include <core/AudioStream.h>
 
 class AudioEffectGranular : public AudioStream
 {

include/audio/effect_midside.h

@@ -23,10 +23,10 @@
 #ifndef effect_midside_decode_h_
 #define effect_midside_decode_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
-#include "utility/dspinst.h"
+#include "./utility/dspinst.h"
 
 
 /**

include/audio/effect_multiply.h

@@ -26,9 +26,9 @@
 
 #ifndef effect_multiply_h_
 #define effect_multiply_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 class AudioEffectMultiply : public AudioStream
 {

include/audio/effect_rectifier.h

@@ -27,8 +27,8 @@
 #ifndef effect_rectifier_h_
 #define effect_rectifier_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectRectifier: public AudioStream
 {

include/audio/effect_reverb.h

@@ -29,7 +29,7 @@
 #ifndef effect_reverb_
 #define effect_reverb_
 
-#include "AudioStream.h"
+#include <core/AudioStream.h>
 
 #define APF1_BUF_LEN 600
 #define APF2_BUF_LEN 1300

include/audio/effect_waveshaper.h

@@ -25,8 +25,8 @@
 #ifndef effect_waveshaper_h_
 #define effect_waveshaper_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioEffectWaveshaper : public AudioStream
 {

include/audio/filter_biquad.h

@@ -27,8 +27,8 @@
 #ifndef filter_biquad_h_
 #define filter_biquad_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioFilterBiquad : public AudioStream
 {

include/audio/filter_fir.h

@@ -23,9 +23,9 @@
 #ifndef filter_fir_h_
 #define filter_fir_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 // Indicates that the code should just pass through the audio
 // without any filtering (as opposed to doing nothing at all)

include/audio/filter_ladder.h

@@ -33,8 +33,8 @@
 #ifndef filter_ladder_h_
 #define filter_ladder_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioFilterLadder: public AudioStream
 {

include/audio/filter_variable.h

@@ -27,8 +27,8 @@
 #ifndef filter_variable_h_
 #define filter_variable_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioFilterStateVariable: public AudioStream
 {

include/audio/input_adc.h

@@ -27,9 +27,9 @@
 #ifndef input_adc_h_
 #define input_adc_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputAnalog : public AudioStream
 {

include/audio/input_adcs.h

@@ -27,9 +27,9 @@
 #ifndef input_adcs_h_
 #define input_adcs_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputAnalogStereo : public AudioStream
 {

include/audio/input_i2s.h

@@ -27,9 +27,9 @@
 #ifndef _input_i2s_h_
 #define _input_i2s_h_
 
-#include <Arduino.h>
-#include <AudioStream.h>
-#include <DMAChannel.h>
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputI2S : public AudioStream
 {

include/audio/input_i2s2.h

@@ -28,9 +28,9 @@
 #ifndef _input_i2s2_h_
 #define _input_i2s2_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputI2S2 : public AudioStream
 {

include/audio/input_i2s_hex.h

@@ -27,9 +27,9 @@
 #ifndef _input_i2s_hex_h_
 #define _input_i2s_hex_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputI2SHex : public AudioStream
 {

include/audio/input_i2s_oct.h

@@ -27,9 +27,9 @@
 #ifndef _input_i2s_oct_h_
 #define _input_i2s_oct_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputI2SOct : public AudioStream
 {

include/audio/input_i2s_quad.h

@@ -27,9 +27,9 @@
 #ifndef _input_i2s_quad_h_
 #define _input_i2s_quad_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputI2SQuad : public AudioStream
 {

include/audio/input_pdm.h

@@ -27,9 +27,9 @@
 #ifndef _input_pdm_h_
 #define _input_pdm_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputPDM : public AudioStream
 {

include/audio/input_spdif3.h

@@ -29,9 +29,9 @@
 #ifndef _input_spdif3_h_
 #define _input_spdif3_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputSPDIF3 : public AudioStream
 {

include/audio/input_tdm.h

@@ -27,9 +27,9 @@
 #ifndef _input_tdm_h_
 #define _input_tdm_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputTDM : public AudioStream
 {

include/audio/input_tdm2.h

@@ -28,9 +28,9 @@
 #ifndef _input_tdm2_h_
 #define _input_tdm2_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioInputTDM2 : public AudioStream
 {

include/audio/mixer.h

@@ -27,8 +27,8 @@
 #ifndef mixer_h_
 #define mixer_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioMixer4 : public AudioStream
 {

include/audio/output_adat.h

@@ -24,9 +24,9 @@
 #ifndef output_ADAT_h_
 #define output_ADAT_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputADAT : public AudioStream
 {

include/audio/output_dac.h

@@ -27,9 +27,9 @@
 #ifndef output_dac_h_
 #define output_dac_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputAnalog : public AudioStream
 {

include/audio/output_dacs.h

@@ -27,9 +27,9 @@
 #ifndef output_dacs_h_
 #define output_dacs_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputAnalogStereo : public AudioStream
 {

include/audio/output_i2s.h

@@ -27,9 +27,9 @@
 #ifndef output_i2s_h_
 #define output_i2s_h_
 
-#include <Arduino.h>
-#include <AudioStream.h>
-#include <DMAChannel.h>
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 
 #if !defined(KINETISL)

include/audio/output_i2s2.h

@@ -28,9 +28,9 @@
 #ifndef output_i2s2_h_
 #define output_i2s2_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 
 class AudioOutputI2S2 : public AudioStream

include/audio/output_i2s_hex.h

@@ -27,9 +27,9 @@
 #ifndef output_i2s_hex_h_
 #define output_i2s_hex_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputI2SHex : public AudioStream
 {

include/audio/output_i2s_oct.h

@@ -27,9 +27,9 @@
 #ifndef output_i2s_oct_h_
 #define output_i2s_oct_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputI2SOct : public AudioStream
 {

include/audio/output_i2s_quad.h

@@ -27,9 +27,9 @@
 #ifndef output_i2s_quad_h_
 #define output_i2s_quad_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputI2SQuad : public AudioStream
 {

include/audio/output_mqs.h

@@ -28,9 +28,9 @@
 #ifndef output_mqs_h_
 #define output_mqs_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputMQS : public AudioStream
 {

include/audio/output_pt8211.h

@@ -29,9 +29,9 @@
 #ifndef output_pt8211_h_
 #define output_pt8211_h_
 
-#include <Arduino.h>
-#include <AudioStream.h>
-#include <DMAChannel.h>
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 
 #if !defined(KINETISL)

include/audio/output_pt8211_2.h

@@ -35,9 +35,9 @@
 // #define AUDIO_PT8211_INTERPOLATION_LINEAR
 #define AUDIO_PT8211_INTERPOLATION_CIC
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputPT8211_2 : public AudioStream
 {

include/audio/output_pwm.h

@@ -27,9 +27,9 @@
 #ifndef output_pwm_h_
 #define output_pwm_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 #if defined(__IMXRT1062__)
 struct _pwm_pin_info_struct {

include/audio/output_spdif.h

@@ -24,9 +24,9 @@
 #ifndef output_SPDIF_h_
 #define output_SPDIF_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputSPDIF : public AudioStream
 {

include/audio/output_spdif2.h

@@ -24,9 +24,9 @@
 #ifndef output_SPDIF2_h_
 #define output_SPDIF2_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputSPDIF2 : public AudioStream
 {

include/audio/output_spdif3.h

@@ -23,9 +23,9 @@
 #ifndef output_SPDIF3_h_
 #define output_SPDIF3_h_
 
-#include <Arduino.h>
-#include <AudioStream.h>
-#include <DMAChannel.h>
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputSPDIF3 : public AudioStream
 {

include/audio/output_tdm.h

@@ -27,9 +27,9 @@
 #ifndef output_tdm_h_
 #define output_tdm_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputTDM : public AudioStream
 {

include/audio/output_tdm2.h

@@ -28,9 +28,9 @@
 #ifndef output_tdm2_h_
 #define output_tdm2_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "DMAChannel.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/DMAChannel.h>
 
 class AudioOutputTDM2 : public AudioStream
 {

include/audio/play_memory.h

@@ -27,8 +27,8 @@
 #ifndef play_memory_h_
 #define play_memory_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioPlayMemory : public AudioStream
 {

include/audio/play_queue.h

@@ -27,8 +27,8 @@
 #ifndef play_queue_h_
 #define play_queue_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioPlayQueue : public AudioStream
 {

include/audio/play_sd_raw.h

@@ -27,9 +27,9 @@
 #ifndef play_sd_raw_h_
 #define play_sd_raw_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "SD.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <sd/SD.h>
 
 class AudioPlaySdRaw : public AudioStream
 {

include/audio/play_sd_wav.h

@@ -27,9 +27,9 @@
 #ifndef play_sd_wav_h_
 #define play_sd_wav_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "SD.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <sd/SD.h>
 
 class AudioPlaySdWav : public AudioStream
 {

include/audio/play_serialflash_raw.h

@@ -28,9 +28,9 @@
 #ifndef play_serial_raw_h_
 #define play_serial_raw_h_
 
-#include "Arduino.h"
-#include <AudioStream.h>
-#include <SerialFlash.h>
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <serial-flash/SerialFlash.h>
 
 class AudioPlaySerialflashRaw : public AudioStream
 {

include/audio/record_queue.h

@@ -27,8 +27,8 @@
 #ifndef record_queue_h_
 #define record_queue_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 class AudioRecordQueue : public AudioStream
 {

include/audio/spi_interrupt.h

@@ -27,9 +27,9 @@
 #ifndef audio_spi_interrupt_h_
 #define audio_spi_interrupt_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "SPI.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <spi/SPI.h>
 
 static inline void AudioStartUsingSPI(void) __attribute__((always_inline, unused));
 static inline void AudioStopUsingSPI(void) __attribute__((always_inline, unused));

include/audio/synth_dc.h

@@ -26,9 +26,9 @@
 
 #ifndef synth_dc_h_
 #define synth_dc_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 // compute (a - b) / c
 // handling 32 bit interger overflow at every step

include/audio/synth_karplusstrong.h

@@ -26,9 +26,9 @@
 
 #ifndef synth_karplusstrong_h_
 #define synth_karplusstrong_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 class AudioSynthKarplusStrong : public AudioStream
 {

include/audio/synth_pinknoise.h

@@ -26,9 +26,9 @@
 
 #ifndef synth_pinknoise_h_
 #define synth_pinknoise_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 class AudioSynthNoisePink : public AudioStream
 {

include/audio/synth_pwm.h

@@ -27,9 +27,9 @@
 #ifndef synth_pwm_h_
 #define synth_pwm_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 class AudioSynthWaveformPWM : public AudioStream
 {

include/audio/synth_simple_drum.h

@@ -28,8 +28,8 @@
 
 #ifndef _SYNTH_SIMPLE_DRUM_H_
 #define _SYNTH_SIMPLE_DRUM_H_
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 class AudioSynthSimpleDrum : public AudioStream
 {

include/audio/synth_sine.h

@@ -27,9 +27,9 @@
 #ifndef synth_sine_h_
 #define synth_sine_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 // TODO: investigate making a high resolution sine wave
 // using Taylor series expansion.

include/audio/synth_tonesweep.h

@@ -23,8 +23,8 @@
 #ifndef synth_tonesweep_h_
 #define synth_tonesweep_h_
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 
 //                A u d i o S y n t h T o n e S w e e p
 // Written by Pete (El Supremo) Feb 2014

include/audio/synth_waveform.h

@@ -27,9 +27,9 @@
 #ifndef synth_waveform_h_
 #define synth_waveform_h_
 
-#include <Arduino.h>
-#include "AudioStream.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include <core/arm_math.h>
 
 // waveforms.c
 extern "C" {

include/audio/synth_wavetable.h

@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include "Arduino.h"
-#include "AudioStream.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
 #include <math.h>
 #include <stdint.h>
 

include/audio/synth_whitenoise.h

@@ -26,9 +26,9 @@
 
 #ifndef synth_whitenoise_h_
 #define synth_whitenoise_h_
-#include "Arduino.h"
-#include "AudioStream.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include <core/AudioStream.h>
+#include "./utility/dspinst.h"
 
 class AudioSynthNoiseWhite : public AudioStream
 {

include/audio/utility/imxrt_hw.h

@@ -34,8 +34,8 @@
 
 #define IMXRT_CACHE_ENABLED 2 // 0=disabled, 1=WT, 2= WB
 
-#include <Arduino.h>
-#include <imxrt.h>
+#include <core/Arduino.h>
+#include <core/imxrt.h>
 
 void set_audioClock(int nfact, int32_t nmult, uint32_t ndiv,  bool force = false); // sets PLL4
 

src/audio/Quantizer.cpp

@@ -26,7 +26,7 @@
 /*
  by Alexander Walch
  */
-#include "Quantizer.h"
+#include "audio/Quantizer.h"
 
 #define SAMPLEINVALID(sample) (!isfinite(sample) || abs(sample) >= 1.2)	//use only for floating point samples (\in [-1.,1.])
 

src/audio/Resampler.cpp

@@ -27,7 +27,7 @@
  by Alexander Walch
  */
 
-#include "Resampler.h"
+#include "audio/Resampler.h"
 #include <math.h>
 
 Resampler::Resampler(float attenuation, int32_t minHalfFilterLength, int32_t maxHalfFilterLength, StepAdaptionParameters settings): _targetAttenuation(attenuation)

src/audio/analyze_fft1024.cpp

@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_fft1024.h"
-#include "sqrt_integer.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include "audio/analyze_fft1024.h"
+#include "audio/utility/sqrt_integer.h"
+#include "audio/utility/dspinst.h"
 
 
 // 140312 - PAH - slightly faster copy

src/audio/analyze_fft256.cpp

@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_fft256.h"
-#include "sqrt_integer.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include "audio/analyze_fft256.h"
+#include "audio/utility/sqrt_integer.h"
+#include "audio/utility/dspinst.h"
 
 
 // 140312 - PAH - slightly faster copy

src/audio/analyze_notefreq.cpp

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_notefreq.h"
-#include "utility/dspinst.h"
-#include "arm_math.h"
+#include <core/Arduino.h>
+#include "audio/analyze_notefreq.h"
+#include "audio/utility/dspinst.h"
+#include <core/arm_math.h>
 
 #define HALF_BLOCKS AUDIO_GUITARTUNER_BLOCKS * 64
 

src/audio/analyze_peak.cpp

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_peak.h"
+#include <core/Arduino.h>
+#include "audio/analyze_peak.h"
 
 void AudioAnalyzePeak::update(void)
 {

src/audio/analyze_print.cpp

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_print.h"
+#include <core/Arduino.h>
+#include "audio/analyze_print.h"
 
 #define STATE_IDLE          0  // doing nothing
 #define STATE_WAIT_TRIGGER  1  // looking for trigger condition

src/audio/analyze_rms.cpp

@@ -25,9 +25,9 @@
  */
 
 
-#include <Arduino.h>
-#include "analyze_rms.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include "audio/analyze_rms.h"
+#include "audio/utility/dspinst.h"
 
 void AudioAnalyzeRMS::update(void)
 {

src/audio/analyze_tonedetect.cpp

@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "analyze_tonedetect.h"
-#include "utility/dspinst.h"
+#include <core/Arduino.h>
+#include "audio/analyze_tonedetect.h"
+#include "audio/utility/dspinst.h"
 
 #if defined(__ARM_ARCH_7EM__)
 

src/audio/async_input_spdif3.cpp

@@ -28,11 +28,11 @@
  */
 #if defined(__IMXRT1052__) || defined(__IMXRT1062__)
 
-#include "async_input_spdif3.h"
-#include "output_spdif3.h"
+#include "audio/async_input_spdif3.h"
+#include "audio/output_spdif3.h"
 
-#include "biquad.h"
-#include <utility/imxrt_hw.h>
+#include "audio/biquad.h"
+#include "audio/utility/imxrt_hw.h"
 //Parameters
 namespace {
 	#define SPDIF_RX_BUFFER_LENGTH AUDIO_BLOCK_SAMPLES

src/audio/control_ak4558.cpp

@@ -4,10 +4,10 @@
  * Copyright 2015, Michele Perla
  *
  */
- 
-#include <Arduino.h>
-#include "control_ak4558.h"
-#include "Wire.h"
+
+#include <core/Arduino.h>
+#include "audio/control_ak4558.h"
+#include "wire/Wire.h"
 
 void AudioControlAK4558::initConfig(void)
 {

src/audio/control_cs42448.cpp

@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "control_cs42448.h"
-#include "Wire.h"
+#include <core/Arduino.h>
+#include "audio/control_cs42448.h"
+#include <wire/Wire.h>
 
 
 #define CS42448_Chip_ID				0x01

src/audio/control_cs4272.cpp

@@ -27,9 +27,9 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "control_cs4272.h"
-#include "Wire.h"
+#include <core/Arduino.h>
+#include "audio/control_cs4272.h"
+#include "wire/Wire.h"
 
 #define CS4272_ADDR 0x10 // TODO: need to double check
 

src/audio/control_sgtl5000.cpp

@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <Arduino.h>
-#include "control_sgtl5000.h"
-#include "Wire.h"
+#include <core/Arduino.h>
+#include "audio/control_sgtl5000.h"
+#include "wire/Wire.h"
 
 #define CHIP_ID				0x0000
 // 15:8 PARTID		0xA0 - 8 bit identifier for SGTL5000

src/audio/control_tlv320aic3206.cpp

@@ -7,8 +7,8 @@
 	License: MIT License.  Use at your own risk.
  */
 
-#include "control_tlv320aic3206.h"
-#include <Wire.h>
+#include "audio/control_tlv320aic3206.h"
+#include <wire/Wire.h>
 
 //********************************  Constants  *******************************//