Index: firmware/source/adc.c =================================================================== diff -u -r40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3 -rcb5c7321fae3036d7a3641ae49097b4b361270f5 --- firmware/source/adc.c (.../adc.c) (revision 40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3) +++ firmware/source/adc.c (.../adc.c) (revision cb5c7321fae3036d7a3641ae49097b4b361270f5) @@ -83,10 +83,10 @@ adcREG1->OPMODECR |= 0x80000000U; /** - Setup prescaler */ - adcREG1->CLOCKCR = 9U; + adcREG1->CLOCKCR = 25U; /** - Setup memory boundaries */ - adcREG1->BNDCR = (uint32)((uint32)8U << 16U) | (8U + 8U); + adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 1U); adcREG1->BNDEND = (adcREG1->BNDEND & 0xFFFF0000U) | (2U); /** - Setup event group conversion mode @@ -95,8 +95,8 @@ * - Enable/Disable continuous conversion */ adcREG1->GxMODECR[0U] = (uint32)ADC_12_BIT - | (uint32)0x00000020U - | (uint32)0x00000002U; + | (uint32)0x00000000U + | (uint32)0x00000000U; /** - Setup event group hardware trigger * - Setup hardware trigger edge @@ -106,7 +106,7 @@ | (uint32)ADC1_EVENT; /** - Setup event group sample window */ - adcREG1->EVSAMP = 2U; + adcREG1->EVSAMP = 0U; /** - Setup event group sample discharge * - Setup discharge prescaler @@ -121,8 +121,8 @@ * - Enable/Disable continuous conversion */ adcREG1->GxMODECR[1U] = (uint32)ADC_12_BIT + | (uint32)0x00000020U | (uint32)0x00000000U - | (uint32)0x00000000U | (uint32)0x00000000U; /** - Setup group 1 hardware trigger @@ -133,7 +133,7 @@ | (uint32)ADC1_EVENT; /** - Setup group 1 sample window */ - adcREG1->G1SAMP = 2U; + adcREG1->G1SAMP = 0U; /** - Setup group 1 sample discharge * - Setup discharge prescaler @@ -160,7 +160,7 @@ | (uint32)ADC1_EVENT; /** - Setup group 2 sample window */ - adcREG1->G2SAMP = 2U; + adcREG1->G2SAMP = 0U; /** - Setup group 2 sample discharge * - Setup discharge prescaler @@ -224,16 +224,14 @@ 0x00000000U | 0x00000000U | 0x00000000U | - 0x00010000U | - 0x00020000U | 0x00000000U | 0x00000000U | 0x00000000U | 0x00000000U | 0x00000000U | - 0x00000000U, 0x00000000U | 0x00000000U | + 0x00000000U, 0x00000000U | 0x00000000U | 0x00000000U | @@ -250,6 +248,8 @@ 0x00000000U | 0x00000000U | 0x00000000U | + 0x00010000U | + 0x00020000U | 0x00000000U | 0x00000000U | 0x00000000U | @@ -333,11 +333,11 @@ /** - s_adcFiFoSize is used as constant table for channel selection */ static const uint32 s_adcFiFoSize[2U][3U] = { + {0U, + 2U, + 32U}, {16U, 16U, - 16U}, - {16U, - 16U, 16U} }; @@ -982,29 +982,31 @@ /* USER CODE BEGIN (35) */ /* USER CODE END */ -/** @fn void adc1Group0Interrupt(void) -* @brief ADC1 Event Group Interrupt Handler + +/* USER CODE BEGIN (38) */ +/* USER CODE END */ +/** @fn void adc1Group1Interrupt(void) +* @brief ADC1 Group 1 Interrupt Handler */ -#pragma CODE_STATE(adc1Group0Interrupt, 32) -#pragma INTERRUPT(adc1Group0Interrupt, FIQ) +#pragma CODE_STATE(adc1Group1Interrupt, 32) +#pragma INTERRUPT(adc1Group1Interrupt, FIQ) -/* SourceId : ADC_SourceId_014 */ +/* SourceId : ADC_SourceId_015 */ /* DesignId : ADC_DesignId_013 */ /* Requirements : HL_SR197, HL_SR196 */ -void adc1Group0Interrupt(void) +void adc1Group1Interrupt(void) { -/* USER CODE BEGIN (36) */ +/* USER CODE BEGIN (39) */ /* USER CODE END */ - adcREG1->GxINTFLG[0U] = 9U; + adcREG1->GxINTFLG[1U] = 9U; - adcNotification(adcREG1, adcGROUP0); + adcNotification(adcREG1, adcGROUP1); -/* USER CODE BEGIN (37) */ +/* USER CODE BEGIN (40) */ /* USER CODE END */ } -