Merge pull request #60 from WattRex/feature/fw

Feature/fw
WattRex · Jun 13, 2023 · 6d5da96 · 6d5da96
2 parents 2001eb2 + 2e05421
commit 6d5da96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/firmware/STM32/Core/Src/stm32f3xx_it.c b/firmware/STM32/Core/Src/stm32f3xx_it.c
@@ -217,7 +217,7 @@ void DMA1_Channel1_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel1_IRQn 1 */
 	#ifdef EPC_CONF_USE_CUSTOM_HAL
 		/* USER CODE END TIM2_IRQn 0 */
-  	HAL_Adc1_Callback();
+  	HAL_AdcCallbackDMAChl1Cplt();
 		/* USER CODE BEGIN TIM2_IRQn 1 */
 	#endif
   /* USER CODE END DMA1_Channel1_IRQn 1 */
@@ -233,7 +233,7 @@ void DMA1_Channel2_IRQHandler(void)
   HAL_DMA_IRQHandler(&hdma_adc2);
   /* USER CODE BEGIN DMA1_Channel2_IRQn 1 */
 	#ifdef EPC_CONF_ADC_DMA_ENABLED
-  	HAL_Adc2_Callback();
+  	HAL_AdcCallbackDMAChl2Cplt();
 	#endif
   /* USER CODE END DMA1_Channel2_IRQn 1 */
 }

diff --git a/firmware/Sources/APP/APP_SALG/app_salg.c b/firmware/Sources/APP/APP_SALG/app_salg.c
@@ -136,7 +136,7 @@ APP_SALG_result_e APP_SalgInit(){
 	APP_SALG_result_e res= APP_SALG_RESULT_SUCCESS;
 	HAL_SYS_result_e sysRes = HAL_SysInit();
 	while(sysRes != HAL_SYS_RESULT_SUCCESS){
-		if(sysRes == HAL_SYS_RESULT_ERROR_CRIT || sysRes == HAL_SYS_RESULT_ERROR_COMM){
+		if(sysRes == HAL_SYS_RESULT_ERROR_CRIT){
 			// TODO: move it to hal_sys
 			/* Try re-initialization due to critical error */
 			__disable_irq();

diff --git a/firmware/Sources/Test/HAL/hal_adc_test.c b/firmware/Sources/Test/HAL/hal_adc_test.c
@@ -72,16 +72,16 @@ HAL_ADC_result_e TestAdcs(void){
 	res |= HAL_AdcGetValue(HAL_ADC_LS_VOLT, &ls_volt);
 	res |= HAL_AdcGetValue(HAL_ADC_HS_VOLT, &hs_volt);
 
-	res |= HAL_AdcGetValue(HAL_ADC_EXT_TEMP1, &temp1);
-	res |= HAL_AdcGetValue(HAL_ADC_EXT_TEMP2, &temp2);
+	res |= HAL_AdcGetValue(HAL_ADC_TEMP_ANOD, &temp1);
+	res |= HAL_AdcGetValue(HAL_ADC_TEMP_AMB, &temp2);
 	res |= HAL_AdcGetValue(HAL_ADC_INT_TEMP, &int_temp);
 
 	while(n_ints_rt % 2 == 0){	};
 	HAL_TmrStop(HAL_TMR_CLOCK_RT);
 	HAL_TmrStop(HAL_TMR_CLOCK_PWR_MEAS);
 
-	res |= HAL_AdcGetValue(HAL_ADC_EXT_TEMP1, &temp1);
-	res |= HAL_AdcGetValue(HAL_ADC_EXT_TEMP2, &temp2);
+	res |= HAL_AdcGetValue(HAL_ADC_TEMP_ANOD, &temp1);
+	res |= HAL_AdcGetValue(HAL_ADC_TEMP_AMB, &temp2);
 	res |= HAL_AdcGetValue(HAL_ADC_INT_TEMP, &int_temp);
 
 	return res;