diff --git a/Application/MLZR_GLASM b/Application/MLZR_GLASM index 5ed1270..613d6c6 160000 --- a/Application/MLZR_GLASM +++ b/Application/MLZR_GLASM @@ -1 +1 @@ -Subproject commit 5ed1270a6c7b6040362b8bf289f2001114df9ada +Subproject commit 613d6c69f838c477e6bf9034fc5eb4495e899205 diff --git a/CMakeLists.txt b/CMakeLists.txt index d66f74f..2ca615d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ target_sources(${CMAKE_PROJECT_NAME} PUBLIC ${sources_SRCS}) target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC Tasks CLS CLS_BSP BSP EE24 INA219 ulog ram_loader Vehicle) #target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC PROTOS) -target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC mlzr_comm TinyFrame uart_driver) +target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC mlzr_comm TinyFrame uart_driver mlzr_glasm) #target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC lwrb) target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index 3cc45d4..a75719f 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -163,6 +163,7 @@ void AddHeadlightMessages(); #include "CLS_BSP.h" #include "CLSAddress.h" #include "mlzr_comm.h" +#include "glasm.h" /* USER CODE END Header_StartDefaultTask */ void StartDefaultTask(void *argument) { @@ -174,6 +175,7 @@ void StartDefaultTask(void *argument) MLZR_INIT(); + GLASM_Init(); retSD = f_mount(&SDFatFS,SDPath,0); retSD = f_open(&SDFile, "counter.bin", FA_READ);