arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-12-01 17:57:53 +03:00
Code Activity

[sam] fixing analog on Due, normally

Browse Source
This commit is contained in:
Thibaut VIARD
2011-11-21 12:16:54 +01:00
parent 062278262d
commit 7cbb284eb4
11 changed files with 146 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/sam/cores/sam/validation/build_gcc/test.mk
View File

@@ -22,8 +22,8 @@
# putting default variant
ifeq ("$(VARIANT)", "")
#VARIANT=sam3s_ek
VARIANT=sam3u_ek
#VARIANT=arduino_due
#VARIANT=sam3u_ek
VARIANT=arduino_due
endif
ifeq ("$(VARIANT)", "sam3s_ek")

46
hardware/sam/cores/sam/wiring_analog.c
View File

@@ -33,15 +33,12 @@ void analogReference( eAnalogReference ulMode )
uint32_t analogRead( uint32_t ulPin )
{
uint32_t ulValue ;
uint32_t ulValue=0 ;
uint32_t ulChannel ;
ulChannel=g_APinDescription[ulPin].ulAnalogChannel ;
#if defined sam3u_ek
#elif defined sam3s_ek
#elif defined arduino_due
#if defined SAM3U4E
switch ( ulChannel )
{
// Handling ADC 10 bits channels
@@ -53,10 +50,23 @@ uint32_t analogRead( uint32_t ulPin )
case ADC5 :
case ADC6 :
case ADC7 :
// Enable the corresponding channel
adc_enable_channel( ADC, ulChannel ) ;
// Start the ADC
adc_start( ADC ) ;
adc_get_value( ADC, ulChannel ) ;
adc_stop( ADC ) ;
// Wait for end of conversion
while ( adc_get_status( ADC ) & (1<<ulChannel) ) == 0 ) ;
// Read the value
ulValue=adc_get_value( ADC, ulChannel ) ;
// Enable the corresponding channel
adc_disable_channel( ADC, ulChannel ) ;
// Stop the ADC
// adc_stop( ADC ) ; // never do adc_stop() else we have to reconfigure the ADC each time
break ;
// Handling ADC 12 bits channels
@@ -68,20 +78,32 @@ uint32_t analogRead( uint32_t ulPin )
case ADC13 :
case ADC14 :
case ADC15 :
// Enable the corresponding channel
adc12_enable_channel( ADC12B, ulChannel-ADC8 ) ;
// Start the ADC12B
adc12_start( ADC12B ) ;
adc12_get_value( ADC12B, ulChannel-ADC8 ) ;
adc12_stop( ADC12B ) ;
// Wait for end of conversion
while ( adc12_get_status( ADC12B ) & (1<<(ulChannel-ADC8)) ) == 0 ) ;
// Read the value
ulValue=adc12_get_value( ADC12B, ulChannel-ADC8 ) ;
// Stop the ADC12B
// adc12_stop( ADC12B ) ; // never do adc12_stop() else we have to reconfigure the ADC12B each time
// Enable the corresponding channel
adc12_disable_channel( ADC12B, ulChannel-ADC8 ) ;
break ;
// Compiler could yell because we don't handle DAC pins
default :
ulValue=0 ;
break ;
}
#endif
return ulValue ;
}
@@ -99,7 +121,7 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
}
else
{
if ( ulValue == 255)
if ( ulValue == 255 )
{
digitalWrite( ulPin, HIGH ) ;
}