From ae2a004dfa0ad0fd6d626704610e431317cc19e7 Mon Sep 17 00:00:00 2001 From: Martin Ling <martin-git@earth.li> Date: Tue, 20 Aug 2019 23:01:05 +0100 Subject: [PATCH] Fix broken ADC init in SDK. This reverts part of ffce77e17c04519d1d416c2a4e223f78e3a35948. --- .../Libraries/CMSIS/Device/Maxim/MAX32665/Include/adc_regs.h | 3 +++ lib/sdk/Libraries/MAX32665PeriphDriver/Source/adc.c | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Include/adc_regs.h b/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Include/adc_regs.h index 99b3fec5..4e34efd0 100644 --- a/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Include/adc_regs.h +++ b/lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/Include/adc_regs.h @@ -122,6 +122,9 @@ typedef struct { #define MXC_F_ADC_CTRL_REFBUF_PWR_POS 3 /**< CTRL_REFBUF_PWR Position */ #define MXC_F_ADC_CTRL_REFBUF_PWR ((uint32_t)(0x1UL << MXC_F_ADC_CTRL_REFBUF_PWR_POS)) /**< CTRL_REFBUF_PWR Mask */ +#define MXC_F_ADC_CTRL_CHGPUMP_PWR_POS 4 /**< CTRL_CHGPUMP_PWR Position */ +#define MXC_F_ADC_CTRL_CHGPUMP_PWR ((uint32_t)(0x1UL << MXC_F_ADC_CTRL_CHGPUMP_PWR_POS)) /**< CTRL_CHGPUMP_PWR Mask */ + #define MXC_F_ADC_CTRL_REF_SEL_POS 4 /**< CTRL_REF_SEL Position */ #define MXC_F_ADC_CTRL_REF_SEL ((uint32_t)(0x1UL << MXC_F_ADC_CTRL_REF_SEL_POS)) /**< CTRL_REF_SEL Mask */ diff --git a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/adc.c b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/adc.c index 1fe9001b..8347d262 100644 --- a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/adc.c +++ b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/adc.c @@ -118,6 +118,7 @@ int ADC_Init(unsigned divisor, const sys_cfg_adc_t* sys_cfg) // Power up the ADC MXC_ADC->ctrl |= MXC_F_ADC_CTRL_PWR; MXC_ADC->ctrl |= MXC_F_ADC_CTRL_REFBUF_PWR; + MXC_ADC->ctrl |= MXC_F_ADC_CTRL_CHGPUMP_PWR; while ((MXC_ADC->intr & MXC_F_ADC_INTR_REF_READY_IF)>>MXC_F_ADC_INTR_REF_READY_IF_POS); ADC_ClearFlags(MXC_F_ADC_INTR_REF_READY_IF); -- GitLab