Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CMSIS / USB-FD name conflicts #18327

Merged
merged 1 commit into from
Jun 16, 2020

Conversation

ellensp
Copy link
Contributor

@ellensp ellensp commented Jun 16, 2020

Requirements

A LPC1768/9 based board.

#define SDSUPPORT
#define USB_FLASH_DRIVE_SUPPORT

and set some pins

    #define USB_CS_PIN    P0_16 //SDSS
    #define USB_INTR_PIN  P1_31 //SD_DETECT_PIN

Description

This Combination of hardware will not currently compile.
There are conflicts in the names of variables in the USB flashdrive subsystem and the LPC CMSIS
Renamed the variables not to conflict with LPC CMSIS

Benefits

It now compiles.

Related Issues

#18313

@thinkyhead thinkyhead merged commit 1c13428 into MarlinFirmware:bugfix-2.0.x Jun 16, 2020
@thinkyhead thinkyhead changed the title rename conflicting USB Flashdrive variables, added _FD_ to names. issue 18313 Fix CMSIS / USB-FD name conflicts Jun 16, 2020
@ellensp ellensp deleted the bugfix-2.0-#18313 branch June 29, 2020 13:49
jmp0x0000 pushed a commit to jmp0x0000/Marlin that referenced this pull request Aug 7, 2020
HairingX pushed a commit to HairingX/Marlin that referenced this pull request Jun 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants