Skip to content

Move Caterina_BL related defines into generic USBCore.h #4967

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

Merged
merged 1 commit into from
May 18, 2016

Conversation

facchinm
Copy link
Member

In an excess of confidence, these defines were added to Leonardo's variant.h
3rd party boards sometimes avoid inheriting this variant but they still define USBCON, thus breaking the build

@NicoHood

In an excess of confidence, these defines were added to Leonardo's variant.h
3rd party boards sometimes avoid inheriting this variant but they still define USBCON, thus breaking the build
@NicoHood
Copy link
Contributor

Will this fix NicoHood/HoodLoader2#28 ?

@cmaglie
Copy link
Member

cmaglie commented May 18, 2016

Yes, this should fix it.

@cmaglie cmaglie added this to the Release 1.6.10 milestone May 18, 2016
@cmaglie cmaglie self-assigned this May 18, 2016
@cmaglie cmaglie merged commit a73c18c into arduino:master May 18, 2016
@konakcc
Copy link

konakcc commented Jun 13, 2016

I am getting this error with the MediaTek 7688 BSP and tried everything including nightly builds:

C:\Users\kenneth_coley\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.11\cores\arduino\CDC.cpp: In function 'bool CDC_Setup(USBSetup&)':

C:\Users\kenneth_coley\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.11\cores\arduino\CDC.cpp:104:29: error: 'MAGIC_KEY_POS' was not declared in this scope

uint16_t magic_key_pos = MAGIC_KEY_POS;

                         ^

C:\Users\kenneth_coley\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.11\cores\arduino\CDC.cpp:129:34: error: 'MAGIC_KEY' was not declared in this scope

 *(uint16_t *)magic_key_pos = MAGIC_KEY;

                              ^

exit status 1

Error compiling for board LinkIt Smart 7688 Duo.

The above links do not work.

@facchinm
Copy link
Member Author

@konakcc , you are using the nighly build of the IDE but the compiled core is still avr 1.6.11 release (since it lives in C:\Users\kenneth_coley\AppData\Local\Arduino15\packages\arduino\hardware\avr).
If you delete that folder and restart the nightly version it will compile correctly, just tested 😄

@konakcc
Copy link

konakcc commented Jun 14, 2016

Thanks, I was able to make it work by downgrading the AVR to 1.6.10

@davidhaile
Copy link

Downgrading the AVR to 1.6.10 worked.

@facchinm facchinm deleted the move_magic_key_defs branch January 4, 2017 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants