Skip to content

Commit 83fa3bb

Browse files
hathachhathach
authored
Merge pull request #3419 from hathach/remove-sprintf
remove the usage snprintf
2 parents 2b9a778 + 49a8529 commit 83fa3bb

File tree

46 files changed

+264
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+264
-386
lines changed

‎examples/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
#set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
43
include(${CMAKE_CURRENT_SOURCE_DIR}/../hw/bsp/family_support.cmake)
54

65
project(tinyusb_examples C CXX ASM)
@@ -27,3 +26,9 @@ add_custom_target(tinyusb_metrics
2726
COMMENT "Generating average code size metrics"
2827
VERBATIM
2928
)
29+
30+
#add_custom_command(TARGET tinyusb_metrics POST_BUILD
31+
# COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/metrics.py compare ${TOP}/cmake-build/cmake-build-${BOARD}/metrics.json ${CMAKE_BINARY_DIR}/metrics.json
32+
# COMMENT "Generating average code size metrics"
33+
# VERBATIM
34+
# )

‎examples/device/audio_4_channel_mic/CMakeLists.txt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,34 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(audio_4_channel_mic C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Add libm for GCC
3229
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
33-
target_link_libraries(${PROJECT} PUBLIC m)
30+
target_link_libraries(${PROJECT_NAME} PUBLIC m)
3431
endif()
3532

3633
# Configure compilation flags and libraries for the example without RTOS.
3734
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
38-
family_configure_device_example(${PROJECT} noos)
35+
family_configure_device_example(${PROJECT_NAME} noos)

‎examples/device/audio_4_channel_mic_freertos/CMakeLists.txt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,34 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(audio_4_channel_mic_freertos C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Add libm for GCC
3229
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
33-
target_link_libraries(${PROJECT} PUBLIC m)
30+
target_link_libraries(${PROJECT_NAME} PUBLIC m)
3431
endif()
3532

3633
# Configure compilation flags and libraries for the example with FreeRTOS.
3734
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
38-
family_configure_device_example(${PROJECT} freertos)
35+
family_configure_device_example(${PROJECT_NAME} freertos)

‎examples/device/audio_test/CMakeLists.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(audio_test C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Configure compilation flags and libraries for the example without RTOS.
3229
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
33-
family_configure_device_example(${PROJECT} noos)
30+
family_configure_device_example(${PROJECT_NAME} noos)

‎examples/device/audio_test_freertos/CMakeLists.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(audio_test_freertos C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Configure compilation flags and libraries for the example with FreeRTOS.
3229
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
33-
family_configure_device_example(${PROJECT} freertos)
30+
family_configure_device_example(${PROJECT_NAME} freertos)

‎examples/device/audio_test_multi_rate/CMakeLists.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(audio_test_multi_rate C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Configure compilation flags and libraries for the example without RTOS.
3229
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
33-
family_configure_device_example(${PROJECT} noos)
30+
family_configure_device_example(${PROJECT_NAME} noos)

‎examples/device/board_test/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(board_test C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
@@ -18,7 +15,7 @@ endif()
1815
if (RTOS STREQUAL zephyr)
1916
set(EXE_NAME app)
2017
else()
21-
set(EXE_NAME ${PROJECT})
18+
set(EXE_NAME ${PROJECT_NAME})
2219
add_executable(${EXE_NAME})
2320
endif()
2421

‎examples/device/cdc_dual_ports/CMakeLists.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(cdc_dual_ports C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2421
)
2522

2623
# Example include
27-
target_include_directories(${PROJECT} PUBLIC
24+
target_include_directories(${PROJECT_NAME} PUBLIC
2825
${CMAKE_CURRENT_SOURCE_DIR}/src
2926
)
3027

3128
# Configure compilation flags and libraries for the example without RTOS.
3229
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
33-
family_configure_device_example(${PROJECT} noos)
30+
family_configure_device_example(${PROJECT_NAME} noos)

‎examples/device/cdc_msc/CMakeLists.txt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
cmake_minimum_required(VERSION 3.20)
2-
#set_property(GLOBAL PROPERTY USE_FOLDERS ON)
32

43
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
54

6-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
7-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
8-
9-
project(${PROJECT} C CXX ASM)
5+
project(cdc_msc C CXX ASM)
106

117
# Checks this example is valid for the family and initializes the project
12-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
139

1410
# Espressif has its own cmake build system
1511
if(FAMILY STREQUAL "espressif")
@@ -19,7 +15,7 @@ endif()
1915
if (RTOS STREQUAL zephyr)
2016
set(EXE_NAME app)
2117
else()
22-
set(EXE_NAME ${PROJECT})
18+
set(EXE_NAME ${PROJECT_NAME})
2319
add_executable(${EXE_NAME})
2420
endif()
2521

‎examples/device/cdc_msc_freertos/CMakeLists.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,30 @@ cmake_minimum_required(VERSION 3.20)
22

33
include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
44

5-
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
6-
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
7-
8-
project(${PROJECT} C CXX ASM)
5+
project(cdc_msc_freertos C CXX ASM)
96

107
# Checks this example is valid for the family and initializes the project
11-
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
8+
family_initialize_project(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR})
129

1310
# Espressif has its own cmake build system
1411
if(FAMILY STREQUAL "espressif")
1512
return()
1613
endif()
1714

18-
add_executable(${PROJECT})
15+
add_executable(${PROJECT_NAME})
1916

2017
# Example source
21-
target_sources(${PROJECT} PUBLIC
18+
target_sources(${PROJECT_NAME} PUBLIC
2219
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
2320
${CMAKE_CURRENT_SOURCE_DIR}/src/msc_disk.c
2421
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
2522
)
2623

2724
# Example include
28-
target_include_directories(${PROJECT} PUBLIC
25+
target_include_directories(${PROJECT_NAME} PUBLIC
2926
${CMAKE_CURRENT_SOURCE_DIR}/src
3027
)
3128

3229
# Configure compilation flags and libraries for the example with FreeRTOS.
3330
# See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
34-
family_configure_device_example(${PROJECT} freertos)
31+
family_configure_device_example(${PROJECT_NAME} freertos)

0 commit comments

Comments
 (0)