mirror of https://github.com/noisymime/Arduino.git
Fix syntax error on wiring_analog
This commit is contained in:
Cristian Maglie
parent
f77fcec4e9
commit
1c9738e3db
|
|
@ -1,156 +1,135 @@
|
|||
/*
|
||||
Copyright (c) 2011 Arduino. All right reserved.
|
||||
Copyright (c) 2011 Arduino. All right reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the GNU Lesser General Public License for more details.
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
//#include "wiring_private.h"
|
||||
#include "Arduino.h"
|
||||
#include "variant.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
eAnalogReference analog_reference = AR_DEFAULT;
|
||||
|
||||
eAnalogReference analog_reference = AR_DEFAULT ;
|
||||
|
||||
void analogReference( eAnalogReference ulMode )
|
||||
{
|
||||
analog_reference = ulMode ;
|
||||
void analogReference(eAnalogReference ulMode) {
|
||||
analog_reference = ulMode;
|
||||
}
|
||||
|
||||
uint32_t analogRead( uint32_t ulPin )
|
||||
{
|
||||
uint32_t ulValue=0 ;
|
||||
uint32_t ulChannel ;
|
||||
uint32_t analogRead(uint32_t ulPin) {
|
||||
uint32_t ulValue = 0;
|
||||
uint32_t ulChannel;
|
||||
|
||||
ulChannel=g_APinDescription[ulPin].ulAnalogChannel ;
|
||||
if (ulPin < A0)
|
||||
ulPin += A0;
|
||||
|
||||
#if defined SAM3U4E
|
||||
switch ( ulChannel )
|
||||
{
|
||||
// Handling ADC 10 bits channels
|
||||
case ADC0 :
|
||||
case ADC1 :
|
||||
case ADC2 :
|
||||
case ADC3 :
|
||||
case ADC4 :
|
||||
case ADC5 :
|
||||
case ADC6 :
|
||||
case ADC7 :
|
||||
// Enable the corresponding channel
|
||||
adc_enable_channel( ADC, ulChannel ) ;
|
||||
ulChannel = g_APinDescription[ulPin].ulAnalogChannel;
|
||||
|
||||
// Start the ADC
|
||||
adc_start( ADC ) ;
|
||||
#if defined __SAM3U4E__
|
||||
switch ( ulChannel )
|
||||
{
|
||||
// Handling ADC 10 bits channels
|
||||
case ADC0 :
|
||||
case ADC1 :
|
||||
case ADC2 :
|
||||
case ADC3 :
|
||||
case ADC4 :
|
||||
case ADC5 :
|
||||
case ADC6 :
|
||||
case ADC7 :
|
||||
// Enable the corresponding channel
|
||||
adc_enable_channel( ADC, ulChannel );
|
||||
|
||||
// Wait for end of conversion
|
||||
while ( adc_get_status( ADC ) & (1<<ulChannel) ) == 0 ) ;
|
||||
// Start the ADC
|
||||
adc_start( ADC );
|
||||
|
||||
// Read the value
|
||||
ulValue=adc_get_value( ADC, ulChannel ) ;
|
||||
// Wait for end of conversion
|
||||
while ((adc_get_status(ADC) & (1<<ulChannel)) == 0);
|
||||
|
||||
// Disable the corresponding channel
|
||||
adc_disable_channel( ADC, ulChannel ) ;
|
||||
// Read the value
|
||||
ulValue=adc_get_value( ADC, ulChannel );
|
||||
|
||||
// Stop the ADC
|
||||
// adc_stop( ADC ) ; // never do adc_stop() else we have to reconfigure the ADC each time
|
||||
break ;
|
||||
// Disable the corresponding channel
|
||||
adc_disable_channel( ADC, ulChannel );
|
||||
|
||||
// Handling ADC 12 bits channels
|
||||
case ADC8 :
|
||||
case ADC9 :
|
||||
case ADC10 :
|
||||
case ADC11 :
|
||||
case ADC12 :
|
||||
case ADC13 :
|
||||
case ADC14 :
|
||||
case ADC15 :
|
||||
// Enable the corresponding channel
|
||||
adc12_enable_channel( ADC12B, ulChannel-ADC8 ) ;
|
||||
// Stop the ADC
|
||||
// adc_stop( ADC ) ; // never do adc_stop() else we have to reconfigure the ADC each time
|
||||
break;
|
||||
|
||||
// Start the ADC12B
|
||||
adc12_start( ADC12B ) ;
|
||||
// Handling ADC 12 bits channels
|
||||
case ADC8 :
|
||||
case ADC9 :
|
||||
case ADC10 :
|
||||
case ADC11 :
|
||||
case ADC12 :
|
||||
case ADC13 :
|
||||
case ADC14 :
|
||||
case ADC15 :
|
||||
// Enable the corresponding channel
|
||||
adc12_enable_channel( ADC12B, ulChannel-ADC8 );
|
||||
|
||||
// Wait for end of conversion
|
||||
while ( adc12_get_status( ADC12B ) & (1<<(ulChannel-ADC8)) ) == 0 ) ;
|
||||
// Start the ADC12B
|
||||
adc12_start( ADC12B );
|
||||
|
||||
// Read the value
|
||||
ulValue=adc12_get_value( ADC12B, ulChannel-ADC8 ) ;
|
||||
// Wait for end of conversion
|
||||
while ((adc12_get_status(ADC12B) & (1<<(ulChannel-ADC8))) == 0);
|
||||
|
||||
// Stop the ADC12B
|
||||
// adc12_stop( ADC12B ) ; // never do adc12_stop() else we have to reconfigure the ADC12B each time
|
||||
// Read the value
|
||||
ulValue=adc12_get_value( ADC12B, ulChannel-ADC8 );
|
||||
|
||||
// Disable the corresponding channel
|
||||
adc12_disable_channel( ADC12B, ulChannel-ADC8 ) ;
|
||||
break ;
|
||||
// Stop the ADC12B
|
||||
// adc12_stop( ADC12B ) ; // never do adc12_stop() else we have to reconfigure the ADC12B each time
|
||||
|
||||
// Compiler could yell because we don't handle DAC pins
|
||||
default :
|
||||
ulValue=0 ;
|
||||
break ;
|
||||
}
|
||||
// Disable 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 ;
|
||||
return ulValue;
|
||||
}
|
||||
|
||||
// Right now, PWM output only works on the pins with
|
||||
// hardware support. These are defined in the appropriate
|
||||
// pins_*.c file. For the rest of the pins, we default
|
||||
// to digital output.
|
||||
void analogWrite( uint32_t ulPin, uint32_t ulValue )
|
||||
{
|
||||
pinMode( ulPin, OUTPUT ) ;
|
||||
void analogWrite(uint32_t ulPin, uint32_t ulValue) {
|
||||
pinMode(ulPin, OUTPUT);
|
||||
|
||||
if ( ulValue == 0 )
|
||||
{
|
||||
digitalWrite( ulPin, LOW ) ;
|
||||
if (ulValue == 0) {
|
||||
digitalWrite(ulPin, LOW);
|
||||
} else if (ulValue == 255) {
|
||||
digitalWrite(ulPin, HIGH);
|
||||
} else if ((g_APinDescription[ulPin].ulPinAttribute && PIN_ATTR_PWM)
|
||||
== PIN_ATTR_PWM) {
|
||||
// Setup PWM for this pin
|
||||
} else if ((g_APinDescription[ulPin].ulPinAttribute && PIN_ATTR_TIMER)
|
||||
== PIN_ATTR_TIMER) {
|
||||
// Setup Timer for this pin
|
||||
} else if (ulValue < 128) {
|
||||
digitalWrite(ulPin, LOW);
|
||||
} else {
|
||||
digitalWrite(ulPin, HIGH);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( ulValue == 255 )
|
||||
{
|
||||
digitalWrite( ulPin, HIGH ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( (g_APinDescription[ulPin].ulPinAttribute && PIN_ATTR_PWM) == PIN_ATTR_PWM )
|
||||
{
|
||||
// Setup PWM for this pin
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( (g_APinDescription[ulPin].ulPinAttribute && PIN_ATTR_TIMER) == PIN_ATTR_TIMER )
|
||||
{
|
||||
// Setup Timer for this pin
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( ulValue < 128 )
|
||||
{
|
||||
digitalWrite( ulPin, LOW ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
digitalWrite( ulPin, HIGH ) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
Loading…
Reference in New Issue