From 21ad1539417332820bf5bf544248ef59f4b3c072 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 20 Sep 2021 12:09:25 +0200 Subject: [PATCH] Add compile options --- CMakeLists.txt | 2 +- lib/AddLufa.cmake | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f51ad..714da3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ if(CMAKE_CROSSCOMPILING) endif() # mcu related settings - set(MCU_FLAGS -mmcu=atmega32u4 -DF_CPU=16000000L -DF_USB=F_CPU) + set(MCU_FLAGS -mmcu=atmega32u4 -DF_CPU=16000000L) add_compile_options(${MCU_FLAGS}) add_link_options(${MCU_FLAGS}) diff --git a/lib/AddLufa.cmake b/lib/AddLufa.cmake index ec381d5..e162ec2 100644 --- a/lib/AddLufa.cmake +++ b/lib/AddLufa.cmake @@ -6,6 +6,23 @@ add_library( lufa/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c lufa/LUFA/Drivers/USB/Core/ConfigDescriptors.c lufa/LUFA/Drivers/USB/Core/Events.c - ) +) -target_compile_features(LUFA PUBLIC c_std_11) +target_compile_definitions(LUFA PUBLIC + -D USB_DEVICE_ONLY + -D DEVICE_STATE_AS_GPIOR=0 + -D ORDERED_EP_CONFIG + -D FIXED_CONTROL_ENDPOINT_SIZE=8 + -D FIXED_NUM_CONFIGURATIONS=1 + -D USE_RAM_DESCRIPTORS +# -D USE_STATIC_OPTIONS= "(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" + -D NO_INTERNAL_SERIAL + -D NO_DEVICE_SELF_POWER + -D NO_DEVICE_REMOTE_WAKEUP + -D NO_SOF_EVENTS + -D F_USB=F_CPU + -D DEVICE_VID=0x2C99 + -D DEVICE_PID=0x0003 #could also be 0x0004. TBD. +) + +target_compile_features(LUFA PUBLIC c_std_99)