diff --git a/lambda-test/lambda-test.c b/lambda-test/lambda-test.c index 4aefc00..967c15e 100644 --- a/lambda-test/lambda-test.c +++ b/lambda-test/lambda-test.c @@ -78,7 +78,7 @@ // AVCC is set as AREF assertTrue(bit_is_set(ADMUX, REFS0)); // digital inputs are disabled - uint8_t adcPorts = (1 << PC0) | (1 << PC2) | (1 << PC5); + uint8_t adcPorts = (1 << ADC_TEMPI) | (1 << ADC_TEMPO) | (1 << ADC_LAMBDA); assertTrue((DIDR0 & adcPorts) == adcPorts); // ADC clock prescaler/8 uint8_t prescalerBy8 = (1 << ADPS1) | (1 << ADPS0); diff --git a/lambda/adc.c b/lambda/adc.c index 1d9eee0..15b5f9d 100644 --- a/lambda/adc.c +++ b/lambda/adc.c @@ -24,7 +24,7 @@ ADMUX |= (1 << REFS0); // disable digital input on the ADC inputs // http://www.openmusiclabs.com/learning/digital/atmega-adc/ - DIDR0 |= (1 << PC0) | (1 << PC2) | (1 << PC5); + DIDR0 |= (1 << ADC_TEMPI) | (1 << ADC_TEMPO) | (1 << ADC_LAMBDA); // ADC clock prescaler/8 ADCSRA |= (1 << ADPS1) | (1 << ADPS0); // enable ADC diff --git a/lambda/adc.h b/lambda/adc.h index 6dfd73e..041c885 100644 --- a/lambda/adc.h +++ b/lambda/adc.h @@ -19,6 +19,10 @@ // #define TEMPO_OP_OFFSET_MV 441 #define TEMPO_OP_OFFSET_MV 454 +#define ADC_TEMPI PC5 // PC5 on diagram +#define ADC_TEMPO PC0 // PC4 on diagram +#define ADC_LAMBDA PC2 // PC3 on diagram + /** * Sets up reference voltage and clock prescaler of the ADC and enables it. */ diff --git a/lambda/sensors.h b/lambda/sensors.h index 52a9b83..fa53989 100644 --- a/lambda/sensors.h +++ b/lambda/sensors.h @@ -18,10 +18,6 @@ #define IDEAL "Ideal" #define RICH "Fett!" -#define ADC_TEMPI PC5 // PC5 on diagram -#define ADC_TEMPO PC0 // PC4 on diagram -#define ADC_LAMBDA PC2 // PC3 on diagram - /** * Entry for the lookup tables. */