summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Tittelbach <bernhard@tittelbach.org>2017-03-30 15:35:33 +0200
committerBernhard Tittelbach <bernhard@tittelbach.org>2017-03-30 15:35:33 +0200
commitcd1caad111a4210703b76f6c0152da66005aa559 (patch)
tree3060859113b24baf621ad5b58220f86de3409fc5
parentwhitespace cleanup (diff)
fix adc example
-rw-r--r--usb-adc-dustsensor/usb-adc-dustsensor.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/usb-adc-dustsensor/usb-adc-dustsensor.c b/usb-adc-dustsensor/usb-adc-dustsensor.c
index 1bf69a0..84549ea 100644
--- a/usb-adc-dustsensor/usb-adc-dustsensor.c
+++ b/usb-adc-dustsensor/usb-adc-dustsensor.c
@@ -49,8 +49,8 @@
#define LOWv OP_CLEARBIT
#define DUSTS_LED(OP) PIN_SW(PORTF, PF0, OP)
-#define DUSTS_ADC_NUM 1
-#define DUSTS_ADC_MUX_MASK ADC_CHANNEL1
+#define DUSTS_ADC_NUM 0
+#define DUSTS_ADC_MUX_MASK ADC_CHANNEL0
void dusts_init(void)
@@ -58,20 +58,18 @@ void dusts_init(void)
DDRF = (1 << PF0);
DUSTS_LED(HIGHv);
//ADC_Init(ADC_SINGLE_CONVERSION);
- ADC_Init(ADC_FREE_RUNNING);
+ ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_32);
ADC_SetupChannel (DUSTS_ADC_NUM);
}
int16_t dusts_measure(void) {
DUSTS_LED(LOWv);
_delay_us(280);
-
//measure ADC
- int16_t m = ADC_GetChannelReading(ADC_REFERENCE_AVCC | DUSTS_ADC_MUX_MASK);
-
+ ADC_GetChannelReading(ADC_REFERENCE_INT2560MV | ADC_RIGHT_ADJUSTED | DUSTS_ADC_MUX_MASK);
_delay_us(40);
DUSTS_LED(HIGHv);
- return m;
+ return ADC_GetResult();
}