diff options
| author | Nathan Conrad <[email protected]> | 2019-10-31 12:23:54 -0400 |
|---|---|---|
| committer | Nathan Conrad <[email protected]> | 2019-10-31 12:23:54 -0400 |
| commit | d35f86993fc1292c7981bf66bca2d3cae40766e3 (patch) | |
| tree | 4dd77aafc3c60c7a9a8c428986589f267f1b34c2 /examples/device/cdc_msc | |
| parent | cef388b7bd956adbc6af4904d4d95ca4120ebb7b (diff) | |
| parent | 4d329d46cc36a8df05580ea7b19f2ce7a8dc2bf7 (diff) | |
Merge remote-tracking branch 'origin/master' into ZLP_Request2
Diffstat (limited to 'examples/device/cdc_msc')
| -rw-r--r-- | examples/device/cdc_msc/ses/lpc13xx/lpc13xx.emProject | 2 | ||||
| -rw-r--r-- | examples/device/cdc_msc/src/main.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/examples/device/cdc_msc/ses/lpc13xx/lpc13xx.emProject b/examples/device/cdc_msc/ses/lpc13xx/lpc13xx.emProject index d07cc68ff..f25307dda 100644 --- a/examples/device/cdc_msc/ses/lpc13xx/lpc13xx.emProject +++ b/examples/device/cdc_msc/ses/lpc13xx/lpc13xx.emProject @@ -19,7 +19,7 @@ arm_target_interface_type="SWD" build_treat_warnings_as_errors="Yes" c_preprocessor_definitions="__LPC1347FBD64__;__LPC1300_FAMILY;__LPC134x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC13XX;CFG_TUSB_MEM_SECTION= __attribute__((section(".bss3")));CFG_TUSB_MEM_ALIGN=__attribute__ ((aligned(64)))" - c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_13xx/inc;$(rootDir)/src" + c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc13xx/lpc_chip_13xx/inc;$(rootDir)/src" debug_register_definition_file="$(ProjectDir)/LPC13Uxx_Registers.xml" debug_target_connection="J-Link" gcc_enable_all_warnings="Yes" diff --git a/examples/device/cdc_msc/src/main.c b/examples/device/cdc_msc/src/main.c index c6ed4a922..e1b9ab113 100644 --- a/examples/device/cdc_msc/src/main.c +++ b/examples/device/cdc_msc/src/main.c @@ -55,7 +55,6 @@ void cdc_task(void); int main(void) { board_init(); - tusb_init(); while (1) |