Coldbox/TECware
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'new-PC'

Browse Source 
# Conflicts:
#   .mxproject
#   .vscode/c_cpp_properties.json
#   .vscode/settings.json
#   Core/Application/INIT_Initialization.c
#   Core/Application/MAIN_MainApplication.c
#   Core/Application/PECO_PeltierController.c
#   Core/Application/VARH_VariableHandler.c
#   Core/Application/VARH_VariableHandler.h
#   Core/Drivers/ANPI_AnalogPortsIn.c
#   Core/Drivers/CAND_CanDriver.c
#   Core/Drivers/CAND_CanDriver.h
#   Core/Drivers/TEMP_Temperature.c
#   Core/Drivers/TEMP_Temperature.h
#   Core/Inc/FreeRTOSConfig.h
#   Core/Inc/main.h
#   Core/Inc/stm32l4xx_hal_conf.h
#   Core/Inc/stm32l4xx_it.h
#   Core/Src/freertos.c
#   Core/Src/main.c
#   Core/Src/stm32l4xx_hal_msp.c
#   Core/Src/stm32l4xx_it.c
#   Core/Toolbox/UTIL_Utility.c
#   Core/Toolbox/UTIL_Utility.h
#   Makefile
#   PeltierControllerV3 Debug.launch
#   PeltierControllerV3.ioc
#   STM32Make.make
This commit is contained in:
pique_n
2022-10-19 12:47:30 +00:00
parent b0e950332c 39607106d2
commit 952e36b3cb
2 changed files with 204 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/Drivers/ANPI_AnalogPortsIn.c
View File

@ -222,7 +222,6 @@ VOID vTask( PVOID arg )
if( u32Flags & ANPI_ADC_FULL_COMPLETE ) u16Offset = BUFFER_HALF_SIZE;
else if( u32Flags & ANPI_ADC_HALF_COMPLETE ) u16Offset = 0;
else continue;
// aquire mutex: access to m_afcValues blocked for ANPI_flGetInputValue
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex