Merge pull request #40 from LeGeek/zero

cmaglie · cmaglie · commit 68ba177eae22 · 2014-07-01T14:23:05.000+02:00
Fixing Analog Reference values
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
@@ -31,12 +31,12 @@ void analogReference( eAnalogReference ulMode )
   switch(ulMode)
   {
     case AR_DEFAULT:
-    case INTERNAL:
+    case AR_INTERNAL:
     default:
       ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val;
       break;
 
-    case EXTERNAL:
+    case AR_EXTERNAL:
       ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;
       break;
   }
diff --git a/cores/arduino/wiring_analog.h b/cores/arduino/wiring_analog.h
@@ -31,8 +31,8 @@ extern "C" {
 typedef enum _eAnalogReference
 {
   AR_DEFAULT,
-  INTERNAL,
-  EXTERNAL
+  AR_INTERNAL,
+  AR_EXTERNAL
 } eAnalogReference ;
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ void analogReference( eAnalogReference ulMode )`
`31`	`31`	`switch(ulMode)`
`32`	`32`	`{`
`33`	`33`	`case AR_DEFAULT:`
`34`		`- case INTERNAL:`
	`34`	`+ case AR_INTERNAL:`
`35`	`35`	`default:`
`36`	`36`	`ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val;`
`37`	`37`	`break;`
`38`	`38`
`39`		`- case EXTERNAL:`
	`39`	`+ case AR_EXTERNAL:`
`40`	`40`	`ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;`
`41`	`41`	`break;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ extern "C" {`
`31`	`31`	`typedef enum _eAnalogReference`
`32`	`32`	`{`
`33`	`33`	`AR_DEFAULT,`
`34`		`- INTERNAL,`
`35`		`- EXTERNAL`
	`34`	`+ AR_INTERNAL,`
	`35`	`+ AR_EXTERNAL`
`36`	`36`	`} eAnalogReference ;`
`37`	`37`
`38`	`38`