Fixed Typo
This commit is contained in:
@@ -1,3 +1,15 @@
|
|||||||
add_library(Tasks UsbDataHandler.c UsbDataHandler.h)
|
cmake_minimum_required(VERSION 3.12)
|
||||||
target_include_directories(Tasks PUBLIC ./)
|
|
||||||
target_link_libraries(Tasks PUBLIC PROTOS)
|
project(Tasks C)
|
||||||
|
|
||||||
|
add_library(${PROJECT_NAME} STATIC "")
|
||||||
|
|
||||||
|
target_sources(${PROJECT_NAME}
|
||||||
|
PRIVATE
|
||||||
|
${CMAKE_CURRENT_LIST_DIR}/UsbDataHandler.c
|
||||||
|
INTERFACE
|
||||||
|
${CMAKE_CURRENT_LIST_DIR}/UsbDataHandler.h
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
|
||||||
|
target_link_libraries(${PROJECT_NAME} PUBLIC PROTOS)
|
||||||
@@ -65,7 +65,7 @@ uint16_t packetLength = 0;
|
|||||||
void UsbDataHandler_Task(void *argument);
|
void UsbDataHandler_Task(void *argument);
|
||||||
|
|
||||||
|
|
||||||
void UsbDataHander_Start(void) {
|
void UsbDataHandler_Start() {
|
||||||
/* Create the task */
|
/* Create the task */
|
||||||
osThreadId_t UsbDataHandler_TaskHandle = osThreadNew(UsbDataHandler_Task, NULL, &UsbDataHandler_TaskAttr);
|
osThreadId_t UsbDataHandler_TaskHandle = osThreadNew(UsbDataHandler_Task, NULL, &UsbDataHandler_TaskAttr);
|
||||||
|
|
||||||
|
|||||||
@@ -9,12 +9,10 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void UsbDataHandler_Start(void);
|
void UsbDataHandler_Start();
|
||||||
|
|
||||||
USBD_StatusTypeDef UsbDataHandler_RxCallback(uint8_t* Buf, uint32_t Len);
|
USBD_StatusTypeDef UsbDataHandler_RxCallback(uint8_t* Buf, uint32_t Len);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void DataClbk_FirmwareStart(void * msg, uint32_t length);
|
void DataClbk_FirmwareStart(void * msg, uint32_t length);
|
||||||
void DataClbk_FirmwarePackage(void * msg, uint32_t length);
|
void DataClbk_FirmwarePackage(void * msg, uint32_t length);
|
||||||
void DataClbk_FirmwarePackageAck(void * msg, uint32_t length);
|
void DataClbk_FirmwarePackageAck(void * msg, uint32_t length);
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ add_compile_options(
|
|||||||
-Wextra
|
-Wextra
|
||||||
-Wpedantic
|
-Wpedantic
|
||||||
-Wno-unused-parameter
|
-Wno-unused-parameter
|
||||||
-flto
|
-flto
|
||||||
)
|
)
|
||||||
|
|
||||||
add_link_options(
|
add_link_options(
|
||||||
@@ -102,13 +102,10 @@ add_compile_definitions(
|
|||||||
|
|
||||||
# Link directories setup
|
# Link directories setup
|
||||||
# Must be before executable is added
|
# Must be before executable is added
|
||||||
link_directories(${CMAKE_PROJECT_NAME} ${link_DIRS})
|
|
||||||
|
|
||||||
# Create an executable object type
|
# Create an executable object type
|
||||||
add_executable(${CMAKE_PROJECT_NAME})
|
|
||||||
|
|
||||||
# Add sources to executable
|
# Add sources to executable
|
||||||
target_sources(${CMAKE_PROJECT_NAME} PUBLIC ${sources_SRCS})
|
|
||||||
|
|
||||||
# Add include paths
|
# Add include paths
|
||||||
# these options need to be applied for the hole project
|
# these options need to be applied for the hole project
|
||||||
@@ -133,10 +130,14 @@ include_directories(${PROJECT_BINARY_DIR})
|
|||||||
|
|
||||||
# Add linked libraries
|
# Add linked libraries
|
||||||
# target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC protobuf-nanopb-static)
|
# target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC protobuf-nanopb-static)
|
||||||
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC uart_driver)
|
|
||||||
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC lwrb)
|
add_executable(${CMAKE_PROJECT_NAME})
|
||||||
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC PROTOS)
|
target_sources(${CMAKE_PROJECT_NAME} PUBLIC ${sources_SRCS})
|
||||||
|
|
||||||
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC Tasks)
|
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC Tasks)
|
||||||
|
#target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC PROTOS)
|
||||||
|
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC uart_driver)
|
||||||
|
#target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC lwrb)
|
||||||
|
|
||||||
# Compiler options
|
# Compiler options
|
||||||
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE
|
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE
|
||||||
@@ -153,9 +154,6 @@ target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE
|
|||||||
$<$<CONFIG:Release>:-O3 -g0>
|
$<$<CONFIG:Release>:-O3 -g0>
|
||||||
)
|
)
|
||||||
|
|
||||||
# Linker options
|
|
||||||
target_link_options(${CMAKE_PROJECT_NAME} PRIVATE
|
|
||||||
)
|
|
||||||
|
|
||||||
# Execute post-build to print size, generate hex and bin
|
# Execute post-build to print size, generate hex and bin
|
||||||
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
|
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
/* Private includes ----------------------------------------------------------*/
|
/* Private includes ----------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN Includes */
|
/* USER CODE BEGIN Includes */
|
||||||
|
#include "UsbDataHandler.h"
|
||||||
/* USER CODE END Includes */
|
/* USER CODE END Includes */
|
||||||
|
|
||||||
/* Private typedef -----------------------------------------------------------*/
|
/* Private typedef -----------------------------------------------------------*/
|
||||||
@@ -96,7 +96,7 @@ void MX_FREERTOS_Init(void) {
|
|||||||
defaultTaskHandle = osThreadNew(StartDefaultTask, NULL, &defaultTask_attributes);
|
defaultTaskHandle = osThreadNew(StartDefaultTask, NULL, &defaultTask_attributes);
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_THREADS */
|
/* USER CODE BEGIN RTOS_THREADS */
|
||||||
/* add threads, ... */
|
UsbDataHandler_Start();
|
||||||
/* USER CODE END RTOS_THREADS */
|
/* USER CODE END RTOS_THREADS */
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_EVENTS */
|
/* USER CODE BEGIN RTOS_EVENTS */
|
||||||
|
|||||||
Reference in New Issue
Block a user