pique_n 952e36b3cb Merge branch 'master' into 'new-PC' ...

# 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

2022-10-19 12:47:30 +00:00

..

Application

init new PC

2022-10-19 14:34:01 +02:00

Drivers

Merge branch 'master' into 'new-PC'

2022-10-19 12:47:30 +00:00

Inc

init new PC

2022-10-19 14:34:01 +02:00

Src

init new PC

2022-10-19 14:34:01 +02:00

Toolbox

init new PC

2022-10-19 14:34:01 +02:00

SDEF_StandardDefinitions.h

init new PC

2022-10-19 14:34:01 +02:00