From 1d9b4d851eb6e837949106ac888d2821f2cb8beb Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Wed, 13 Apr 2022 21:27:04 +1000 Subject: [PATCH] Starting ADC setup --- source/Core/BSP/Magic/IRQ.cpp | 16 ++++++++++++ source/Core/BSP/Magic/IRQ.h | 2 +- source/Core/BSP/Magic/Setup.cpp | 44 +++++++++++++++++++++++++++++++-- 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/source/Core/BSP/Magic/IRQ.cpp b/source/Core/BSP/Magic/IRQ.cpp index bffe7757..8a1c6698 100644 --- a/source/Core/BSP/Magic/IRQ.cpp +++ b/source/Core/BSP/Magic/IRQ.cpp @@ -30,6 +30,22 @@ void ADC0_1_IRQHandler(void) { } } +void adc_fifo_irq(void) { + +} + +void start_adc_tip(void) { + // Reconfigure the ADC to measure the tip temp + // Single channel input mode + // The ADC has a 32 sample FiFo; we set this up to fire and interrupt at 16 samples + // Then using that IRQ to know that sampling is done and can be stored + +} +void start_adc_misc(void) { + // Reconfigure the ADC to measure all other inputs in scan mode when we are not measuring the tip + +} + static bool fastPWM; static void switchToSlowPWM(void); static void switchToFastPWM(void); diff --git a/source/Core/BSP/Magic/IRQ.h b/source/Core/BSP/Magic/IRQ.h index b6e0ed48..54298ed0 100644 --- a/source/Core/BSP/Magic/IRQ.h +++ b/source/Core/BSP/Magic/IRQ.h @@ -17,7 +17,7 @@ extern "C" { #endif void timer0_irq_callback(struct device *dev, void *args, uint32_t size, uint32_t state); - +void adc_fifo_irq(void); #ifdef __cplusplus } #endif diff --git a/source/Core/BSP/Magic/Setup.cpp b/source/Core/BSP/Magic/Setup.cpp index 50ebd78d..4cc721fe 100644 --- a/source/Core/BSP/Magic/Setup.cpp +++ b/source/Core/BSP/Magic/Setup.cpp @@ -11,10 +11,12 @@ #include "Pins.h" extern "C" { #include "bflb_platform.h" +#include "bl702_adc.h" #include "bl702_glb.h" #include "bl702_i2c.h" #include "bl702_pwm.h" #include "bl702_timer.h" +#include "hal_adc.h" #include "hal_clock.h" #include "hal_pwm.h" #include "hal_timer.h" @@ -29,6 +31,7 @@ uint16_t ADCReadings[ADC_NORM_SAMPLES]; // room for 32 lots of the pair of readi // Functions void setup_slow_PWM(); +void setup_adc(void); void hardware_init() { gpio_set_mode(OLED_RESET_Pin, GPIO_OUTPUT_MODE); // gpio_set_mode(KEY_A_Pin, GPIO_INPUT_PD_MODE); @@ -36,9 +39,46 @@ void hardware_init() { setup_slow_PWM(); } -struct device *timer0; +void setup_adc(void) { + // + ADC_CFG_Type adc_cfg = {}; + ADC_FIFO_Cfg_Type adc_fifo_cfg = {}; -volatile uint32_t cnt = 0; + CPU_Interrupt_Disable(GPADC_DMA_IRQn); + ADC_IntMask(ADC_INT_ALL, MASK); + + adc_cfg.clkDiv = ADC_CLK_DIV_32; + + adc_cfg.vref = ADC_VREF_3P2V; + adc_cfg.resWidth = ADC_DATA_WIDTH_16_WITH_128_AVERAGE; + adc_cfg.inputMode = ADC_INPUT_SINGLE_END; + + adc_cfg.v18Sel = ADC_V18_SEL_1P82V; + adc_cfg.v11Sel = ADC_V11_SEL_1P1V; + adc_cfg.gain1 = ADC_PGA_GAIN_1; + adc_cfg.gain2 = ADC_PGA_GAIN_2; + adc_cfg.chopMode = ADC_CHOP_MOD_AZ_PGA_ON; + adc_cfg.biasSel = ADC_BIAS_SEL_MAIN_BANDGAP; + adc_cfg.vcm = ADC_PGA_VCM_1V; + adc_cfg.offsetCalibEn = DISABLE; + adc_cfg.offsetCalibVal = 0; + + adc_fifo_cfg.dmaEn = DISABLE; + adc_fifo_cfg.fifoThreshold = ADC_FIFO_THRESHOLD_16; + + Interrupt_Handler_Register(GPADC_DMA_IRQn, adc_fifo_irq); + + ADC_Disable(); + ADC_Enable(); + + ADC_Reset(); + + ADC_Init(&adc_cfg); + + ADC_FIFO_Cfg(&adc_fifo_cfg); +} + +struct device *timer0; void setup_slow_PWM() {