diff --git a/internal/MozziGuts.hpp b/internal/MozziGuts.hpp index 4381b5e6c..660171f28 100644 --- a/internal/MozziGuts.hpp +++ b/internal/MozziGuts.hpp @@ -153,7 +153,7 @@ uint16_t getAudioInput() { return audio_input; } CircularBuffer input_buffer; // fixed size 256 #define audioInputAvailable() (!input_buffer.isEmpty()) #define readAudioInput() (input_buffer.read()) -/** NOTE: Triggered at MOZZI_AUDIO_RATE via defaultAudioOutput(). In addition to the AUDIO_INPUT_PIN, at most one reading is taken for mozziAnalogRead(). */ +/** NOTE: Triggered at MOZZI_AUDIO_RATE via defaultAudioOutput(). In addition to the MOZZI_AUDIO_INPUT_PIN, at most one reading is taken for mozziAnalogRead(). */ inline void advanceADCStep() { switch (adc_count) { case 0: @@ -172,7 +172,7 @@ inline void advanceADCStep() { case 2: // 3us analog_readings[channelNumToIndex(current_channel)] = getADCReading(); - adcStartConversion(adcPinToChannelNum(AUDIO_INPUT_PIN)); // -> result is ignored, but first thing in the next cycle, a second reading is taken. + adcStartConversion(adcPinToChannelNum(MOZZI_AUDIO_INPUT_PIN)); // -> result is ignored, but first thing in the next cycle, a second reading is taken. break; } diff --git a/internal/config_checks_generic.h b/internal/config_checks_generic.h index cb446ea7b..658f57f3b 100644 --- a/internal/config_checks_generic.h +++ b/internal/config_checks_generic.h @@ -126,7 +126,7 @@ MOZZI_CHECK_POW2(MOZZI_CONTROL_RATE) #error "MOZZI_AUDIO_INPUT depends on MOZZI_ANALOG_READ option" #endif -#if !MOZZI_IS(MOZZI_AUDIO_INPUT, MOZZI_AUDIO_INPUT_NONE) && defined(MOZZI_AUDIO_INPUT_PIN) +#if MOZZI_IS(MOZZI_AUDIO_INPUT, MOZZI_AUDIO_INPUT_NONE) && defined(MOZZI_AUDIO_INPUT_PIN) #warning "MOZZI_AUDIO_INPUT_PIN defined without MOZZI_AUDIO_INPUT" #endif