Move Caterina_BL related defines into generic USBCore.h

[facchinm]

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

[ArduinoBot]

✅ Build completed.

Please test this code using one of the following:

⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-4967-BUILD-553-linux32.tar.xz
⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-4967-BUILD-553-linux64.tar.xz
⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-4967-BUILD-553-windows.zip
⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-4967-BUILD-553-macosx.zip
⬇️ http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-4967-BUILD-553-linuxarm.tar.xz

ℹ️ The linuxarm build is still experimental and may not be always available.

[NicoHood]

Will this fix NicoHood/HoodLoader2#28 ?

[cmaglie]

Yes, this should fix it.

[konakcc]

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]

@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]

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

[davidhaile]

Downgrading the AVR to 1.6.10 worked.