Adding initial code for ADC1 on Teensy 3.1 (and 3.0).
- To use the second ADC just specify ADC2 for all the commands.
This commit is contained in:
Jacob Alexander
parent
7188d80f74
commit
36c0b5f417
@ -49,8 +49,8 @@
|
||||
// A3 FTM0_CH0 SWD Data
|
||||
|
||||
// Analog
|
||||
// Pin Pin Name
|
||||
// -----------------
|
||||
// Pin Pin Name Channel
|
||||
// ---------------------------
|
||||
// A0 14 D1
|
||||
// A1 15 C0
|
||||
// A2 16 B0
|
||||
@ -65,7 +65,7 @@
|
||||
// A11
|
||||
// A12
|
||||
// A13
|
||||
// A14 DAC (Teensy 3.1 Only)
|
||||
// A14 DAC (Teensy 3.1 Only)
|
||||
// A15 26 E1
|
||||
// A16 27 C9
|
||||
// A17 28 C8
|
||||
|
||||
@ -400,21 +400,3 @@ void analogWriteDAC0(int val)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -36,6 +36,11 @@
|
||||
|
||||
// ----- Defines -----
|
||||
|
||||
// ADC Clock divisor settings (F_BUS == 48000000)
|
||||
#define ADC_CFG1_6MHZ ADC_CFG1_ADIV(2) + ADC_CFG1_ADICLK(1)
|
||||
#define ADC_CFG1_12MHZ ADC_CFG1_ADIV(1) + ADC_CFG1_ADICLK(1)
|
||||
#define ADC_CFG1_24MHZ ADC_CFG1_ADIV(0) + ADC_CFG1_ADICLK(1)
|
||||
|
||||
|
||||
|
||||
// ----- Macros -----
|
||||
@ -44,6 +49,8 @@
|
||||
|
||||
// ----- Function Declarations -----
|
||||
|
||||
void cliFunc_adc ( char* args );
|
||||
void cliFunc_adcInit( char* args );
|
||||
void cliFunc_dac ( char* args );
|
||||
void cliFunc_dacVref( char* args );
|
||||
void cliFunc_echo ( char* args );
|
||||
@ -60,6 +67,8 @@ volatile uint8_t KeyIndex_BufferUsed;
|
||||
// Scan Module command dictionary
|
||||
char* scanCLIDictName = "ADC Test Module Commands";
|
||||
CLIDictItem scanCLIDict[] = {
|
||||
{ "adc", "Read the specified number of values from the ADC.", cliFunc_adc },
|
||||
{ "adcInit", "Intialize/calibrate ADC. Arg 1 specifies the pin.", cliFunc_adcInit },
|
||||
#if defined(_mk20dx256_) // DAC is only supported on Teensy 3.1
|
||||
{ "dac", "Set DAC output value, from 0 to 4095 (1/4096 Vref to Vref).", cliFunc_dac },
|
||||
{ "dacVref", "Set DAC Vref. 0 is 1.2V. 1 is 3.3V.", cliFunc_dacVref },
|
||||
@ -84,6 +93,10 @@ inline void Scan_setup()
|
||||
// Register Scan CLI dictionary
|
||||
CLI_registerDictionary( scanCLIDict, scanCLIDictName );
|
||||
|
||||
// ADC Setup
|
||||
VREF_TRM = 0x60;
|
||||
VREF_SC = 0xE1; // Enable 1.2V Vref
|
||||
|
||||
#if defined(_mk20dx256_) // DAC is only supported on Teensy 3.1
|
||||
// DAC Setup
|
||||
SIM_SCGC2 |= SIM_SCGC2_DAC0;
|
||||
@ -111,6 +124,7 @@ void Scan_finishedWithUSBBuffer( uint8_t sentKeys )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// Reset Keyboard
|
||||
void Scan_resetKeyboard()
|
||||
{
|
||||
@ -143,6 +157,164 @@ void cliFunc_echo( char* args )
|
||||
}
|
||||
}
|
||||
|
||||
void cliFunc_adc( char* args )
|
||||
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
|
||||
{
|
||||
}
|
||||
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
|
||||
{
|
||||
// Parse code from argument
|
||||
// NOTE: Only first argument is used
|
||||
char* arg1Ptr;
|
||||
char* arg2Ptr;
|
||||
CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
|
||||
|
||||
// Set the ADC Channel
|
||||
uint8_t channel = decToInt( arg1Ptr );
|
||||
__disable_irq();
|
||||
ADC0_SC1A = channel;
|
||||
__enable_irq();
|
||||
|
||||
// Number of ADC samples to display
|
||||
CLI_argumentIsolation( arg2Ptr, &arg1Ptr, &arg2Ptr );
|
||||
int displayedADC = decToInt( arg1Ptr );
|
||||
|
||||
// Poll ADC until it gets a value, making sure to serve interrupts on each attempt
|
||||
while ( displayedADC > 0 )
|
||||
{
|
||||
__disable_irq();
|
||||
|
||||
// ADC Sample is ready
|
||||
if ( (ADC0_SC1A & ADC_SC1_COCO) )
|
||||
{
|
||||
int result = ADC0_RA;
|
||||
printInt32( result );
|
||||
displayedADC--;
|
||||
}
|
||||
|
||||
__enable_irq();
|
||||
yield(); // Make sure interrupts actually get serviced
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void cliFunc_adcInit( char* args )
|
||||
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
|
||||
{
|
||||
}
|
||||
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
|
||||
{
|
||||
// Parse code from argument
|
||||
// NOTE: Only first argument is used
|
||||
char* arg1Ptr;
|
||||
char* arg2Ptr;
|
||||
CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
|
||||
|
||||
// Make sure calibration has stopped
|
||||
ADC0_SC3 = 0;
|
||||
|
||||
// Select bit resolution
|
||||
int bitResolution = decToInt( arg1Ptr );
|
||||
switch ( bitResolution )
|
||||
{
|
||||
case 8: // 8-bit
|
||||
ADC0_CFG1 = ADC_CFG1_24MHZ + ADC_CFG1_MODE(0);
|
||||
ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
|
||||
break;
|
||||
|
||||
case 10: // 10-bit
|
||||
ADC0_CFG1 = ADC_CFG1_12MHZ + ADC_CFG1_MODE(2) + ADC_CFG1_ADLSMP;
|
||||
ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(3);
|
||||
break;
|
||||
|
||||
case 12: // 12-bit
|
||||
ADC0_CFG1 = ADC_CFG1_12MHZ + ADC_CFG1_MODE(1) + ADC_CFG1_ADLSMP;
|
||||
ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
|
||||
break;
|
||||
|
||||
case 16: // 16-bit
|
||||
ADC0_CFG1 = ADC_CFG1_12MHZ + ADC_CFG1_MODE(3) + ADC_CFG1_ADLSMP;
|
||||
ADC0_CFG2 = ADC_CFG2_MUXSEL + ADC_CFG2_ADLSTS(2);
|
||||
break;
|
||||
|
||||
default: return; // Do nothing, invalid arg
|
||||
}
|
||||
|
||||
// Select Vref
|
||||
CLI_argumentIsolation( arg2Ptr, &arg1Ptr, &arg2Ptr );
|
||||
int vRef = decToInt( arg1Ptr );
|
||||
switch ( vRef )
|
||||
{
|
||||
case 0: // 1.2V internal Vref
|
||||
ADC0_SC2 = ADC_SC2_REFSEL(1);
|
||||
break;
|
||||
|
||||
case 1: // Vcc/Ext Vref
|
||||
ADC0_SC2 = ADC_SC2_REFSEL(0);
|
||||
break;
|
||||
|
||||
default: return; // Do nothing, invalid arg
|
||||
}
|
||||
|
||||
// Hardware averaging (and start calibration)
|
||||
CLI_argumentIsolation( arg2Ptr, &arg1Ptr, &arg2Ptr );
|
||||
int hardwareAvg = decToInt( arg1Ptr );
|
||||
switch ( hardwareAvg )
|
||||
{
|
||||
case 0: // No hardware averaging
|
||||
ADC0_SC3 = ADC_SC3_CAL; // Just start calibration
|
||||
break;
|
||||
|
||||
case 4: // 4 sample averaging
|
||||
ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(0);
|
||||
break;
|
||||
|
||||
case 8: // 8 sample averaging
|
||||
ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(1);
|
||||
break;
|
||||
|
||||
case 16: // 16 sample averaging
|
||||
ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(2);
|
||||
break;
|
||||
|
||||
case 32: // 32 sample averaging
|
||||
ADC0_SC3 = ADC_SC3_CAL + ADC_SC3_AVGE + ADC_SC3_AVGS(3);
|
||||
break;
|
||||
|
||||
default: return; // Do nothing, invalid arg
|
||||
}
|
||||
|
||||
// Wait for calibration
|
||||
while ( ADC0_SC3 & ADC_SC3_CAL );
|
||||
|
||||
// Set calibration
|
||||
uint16_t sum;
|
||||
|
||||
// XXX Why is PJRC doing this? Is the self-calibration not good enough? -HaaTa
|
||||
// ADC Plus-Side Gain Register
|
||||
__disable_irq(); // Disable interrupts
|
||||
sum = ADC0_CLPS + ADC0_CLP4 + ADC0_CLP3 + ADC0_CLP2 + ADC0_CLP1 + ADC0_CLP0;
|
||||
sum = (sum / 2) | 0x8000;
|
||||
ADC0_PG = sum;
|
||||
|
||||
info_msg("Calibration ADC0_PG (Plus-Side Gain Register) set to: ");
|
||||
printInt16( sum );
|
||||
print( NL );
|
||||
|
||||
// ADC Minus-Side Gain Register
|
||||
// XXX I don't think this is necessary when doing single-ended (as opposed to differential) -HaaTa
|
||||
// K20P64M72SF1RM.pdf 31.3.10 pg. 666
|
||||
sum = ADC0_CLMS + ADC0_CLM4 + ADC0_CLM3 + ADC0_CLM2 + ADC0_CLM1 + ADC0_CLM0;
|
||||
sum = (sum / 2) | 0x8000;
|
||||
ADC0_MG = sum;
|
||||
|
||||
info_msg("Calibration ADC0_MG (Minus-Side Gain Register) set to: ");
|
||||
printInt16( sum );
|
||||
print( NL );
|
||||
__enable_irq(); // Re-enable interrupts
|
||||
}
|
||||
#endif
|
||||
|
||||
void cliFunc_dac( char* args )
|
||||
{
|
||||
#if defined(_mk20dx256_) // DAC is only supported on Teensy 3.1
|
||||
@ -174,8 +346,7 @@ void cliFunc_dacVref( char* args )
|
||||
switch ( decToInt( arg1Ptr ) )
|
||||
{
|
||||
case 0:
|
||||
// XXX Doesn't seem to work...
|
||||
DAC0_C0 = DAC_C0_DACEN; // 1.2V ref is DACREF_1
|
||||
DAC0_C0 = DAC_C0_DACEN; // 1.2V Vref is DACREF_1
|
||||
break;
|
||||
case 1:
|
||||
DAC0_C0 = DAC_C0_DACEN | DAC_C0_DACRFS; // 3.3V VDDA is DACREF_2
|
||||
|
||||
Reference in New Issue
Block a user