Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "Middlewares/ST/STM32_USB_Device_Library"]
path = Middlewares/ST/STM32_USB_Device_Library
url = https://github.com/STMicroelectronics/stm32_mw_usb_device
[submodule "Middlewares/Third_Party/FatFs"]
path = Middlewares/Third_Party/FatFs
url = git@github.com:STMicroelectronics/stm32_mw_fatfs.git
4 changes: 2 additions & 2 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
"${workspaceRoot}/Middlewares/Third_Party/FatFs/src"
"${workspaceRoot}/Middlewares/Third_Party/FatFs/source"
],
"defines": [
"DEBUG=1",
Expand Down Expand Up @@ -46,7 +46,7 @@
"${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
"${workspaceRoot}/Middlewares/Third_Party/FatFs/src"
"${workspaceRoot}/Middlewares/Third_Party/FatFs/source"
],
"defines": [
"DEBUG=1",
Expand Down
27 changes: 14 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
cmake_policy(SET CMP0048 NEW)
project (libdaisy VERSION 1.0.0)
project(libdaisy VERSION 1.0.0)
cmake_minimum_required(VERSION 3.20)

set(TARGET daisy)


set(MODULE_DIR "${CMAKE_CURRENT_LIST_DIR}/src")

add_library(${TARGET} STATIC
Expand Down Expand Up @@ -201,11 +200,13 @@ add_library(${TARGET} STATIC
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c
Middlewares/Third_Party/FatFs/src/diskio.c
Middlewares/Third_Party/FatFs/src/ff.c
Middlewares/Third_Party/FatFs/src/ff_gen_drv.c
Middlewares/Third_Party/FatFs/source/diskio.c
Middlewares/Third_Party/FatFs/source/ff.c
Middlewares/Third_Party/FatFs/source/ff_gen_drv.c
Middlewares/Third_Party/FatFs/source/ffunicode.c
Middlewares/Third_Party/FatFs/source/ffsystem_baremetal.c
core/startup_stm32h750xx.c
)
)

target_include_directories(${TARGET} PUBLIC
${MODULE_DIR}
Expand All @@ -218,16 +219,16 @@ target_include_directories(${TARGET} PUBLIC
Middlewares/ST/STM32_USB_Host_Library/Core/Inc
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc
Middlewares/ST/STM32_USB_Host_Library/Class/MIDI/Inc
Middlewares/Third_Party/FatFs/src
Middlewares/Third_Party/FatFs/source
src
src/sys
src/usbd
src/usbh
)
)

set_target_properties(${TARGET} PROPERTIES
CXX_STANDARD 14
CXX_STANDARD_REQUIRED
C_STANDARD 11
C_STANDARD_REQUIRED
)
CXX_STANDARD 14
CXX_STANDARD_REQUIRED
C_STANDARD 11
C_STANDARD_REQUIRED
)
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,11 @@ Middlewares/Patched/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c \
Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c \
Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c \
Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c \
Middlewares/Third_Party/FatFs/src/diskio.c \
Middlewares/Third_Party/FatFs/src/ff.c \
Middlewares/Third_Party/FatFs/src/ff_gen_drv.c \
Middlewares/Third_Party/FatFs/source/diskio.c \
Middlewares/Third_Party/FatFs/source/ff.c \
Middlewares/Third_Party/FatFs/source/ff_gen_drv.c \
Middlewares/Third_Party/FatFs/source/ffunicode.c \
Middlewares/Third_Party/FatFs/source/ffsystem_baremetal.c \
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c \
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c \
Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c \
Expand Down Expand Up @@ -312,7 +314,7 @@ C_INCLUDES = \
-IMiddlewares/ST/STM32_USB_Host_Library/Core/Inc \
-IMiddlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc \
-IMiddlewares/ST/STM32_USB_Host_Library/Class/MIDI/Inc \
-IMiddlewares/Third_Party/FatFs/src \
-IMiddlewares/Third_Party/FatFs/source \
-I$(MODULE_DIR) \
-I.

Expand Down
1 change: 1 addition & 0 deletions Middlewares/Third_Party/FatFs
Submodule FatFs added at d05c51
141 changes: 0 additions & 141 deletions Middlewares/Third_Party/FatFs/src/diskio.c

This file was deleted.

80 changes: 0 additions & 80 deletions Middlewares/Third_Party/FatFs/src/diskio.h

This file was deleted.

Loading