Commit 6759e88

author

Martino Facchin

committed

remove setupUSB weak hook and replace with global constructors

1 parent 18a2f2a commit 6759e88Copy full SHA for 6759e88

File tree

7 files changed

-31

lines changed

hardware/arduino/avr/cores/arduino
- main.cpp
libraries
- HID
  - HID.cpp
- Keyboard
  - Keyboard.cpp
- MIDIUSB
  - MIDIUSB.cpp
  - MIDIUSB.h
- MouseAndKeyboard
  - MouseAndKeyboard.cpp
- Mouse
  - Mouse.cpp

7 files changed

-31

lines changed

`‎hardware/arduino/avr/cores/arduino/main.cpp‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ int main(void)`
`37`	`37`	`initVariant();`
`38`	`38`
`39`	`39`	`#if defined(USBCON)`
`40`		`- setupUSB();`
`41`	`40`	`USBDevice.attach();`
`42`	`41`	`#endif`
`43`	`42`

`‎libraries/HID/HID.cpp‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,7 @@ bool WEAK HID_Setup(Setup& setup, u8 i)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`-// to be called by begin(), will trigger USB disconnection and reconnection`
`115`		`-int8_t HID_Plug(void)`
	`114`	`+HID_::HID_(void)`
`116`	`115`	`{`
`117`	`116`	`static uint8_t endpointType[1];`
`118`	`117`
`@@ -137,17 +136,10 @@ int8_t HID_Plug(void)`
`137`	`136`	`D_HIDREPORT(getsizeof_hidReportDescriptor()),`
`138`	`137`	`D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)`
`139`	`138`	`};`
`140`		`-`
`141`		`- return HID_ENDPOINT_INT;`
`142`		`-}`
`143`		`-`
`144`		`-HID_::HID_(void)`
`145`		`-{`
`146`	`139`	`}`
`147`	`140`
`148`	`141`	`int HID_::begin(void)`
`149`	`142`	`{`
`150`		`- return HID_Plug();`
`151`	`143`	`}`
`152`	`144`
`153`	`145`	`#endif /* if defined(USBCON) */`

`‎libraries/Keyboard/Keyboard.cpp‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,6 @@ size_t getsizeof_hidReportDescriptor() {`
`200`	`200`	`return sizeof(_hidReportDescriptor);`
`201`	`201`	`}`
`202`	`202`
`203`		`-void WEAK setupUSB() {`
`204`		`- HID.begin();`
`205`		`-}`
`206`		`-`
`207`	`203`	`uint8_t USBPutChar(uint8_t c);`
`208`	`204`
`209`	`205`	`// press() adds the specified key (printing, non-printing, or modifier)`

`‎libraries/MIDIUSB/MIDIUSB.cpp‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,6 @@ ring_bufferMIDI midi_rx_buffer = {{0,0,0,0 }, 0, 0};`
`39`	`39`
`40`	`40`	`static MIDIDescriptor _midiInterface;`
`41`	`41`
`42`		`-void WEAK setupUSB() {`
`43`		`- MidiUSB.begin();`
`44`		`-}`
`45`		`-`
`46`	`42`	`int8_t WEAK MIDI_GetInterface(uint8_t* interfaceNum)`
`47`	`43`	`{`
`48`	`44`	`interfaceNum[0] += 2; // uses 2`
`@@ -171,9 +167,8 @@ void MIDI_::sendMIDI(midiEventPacket_t event)`
`171`	`167`	`write(data, 4);`
`172`	`168`	`}`
`173`	`169`
`174`		`-int8_tMIDI_plug(void)`
	`170`	`+MIDI_::MIDI_(void)`
`175`	`171`	`{`
`176`		`-`
`177`	`172`	`static uint8_t endpointType[2];`
`178`	`173`
`179`	`174`	`endpointType[0] = EP_TYPE_BULK_OUT_MIDI; // MIDI_ENDPOINT_OUT`
`@@ -210,13 +205,10 @@ int8_t MIDI_plug(void)`
`210`	`205`	`D_MIDI_JACK_EP(USB_ENDPOINT_IN(MIDI_ENDPOINT_IN),USB_ENDPOINT_TYPE_BULK,512),`
`211`	`206`	`D_MIDI_AC_JACK_EP (1, 3)`
`212`	`207`	`};`
`213`		`-`
`214`		`- return MIDI_ENDPOINT_IN;`
`215`	`208`	`}`
`216`	`209`
`217`	`210`	`int8_t MIDI_::begin()`
`218`	`211`	`{`
`219`		`- return MIDI_plug();`
`220`	`212`	`}`
`221`	`213`
`222`	`214`

`‎libraries/MIDIUSB/MIDIUSB.h‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ class MIDI_`
`26`	`26`	`// private:`
`27`	`27`	`// RingBuffer *_midi_rx_buffer;`
`28`	`28`	`public:`
	`29`	`+ MIDI_(void);`
	`30`	`+`
`29`	`31`	`int8_t begin();`
`30`	`32`
`31`	`33`	`virtual uint32_t available(void);`

`‎libraries/Mouse/Mouse.cpp‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ Mouse_ Mouse;`
`45`	`45`	`//================================================================================`
`46`	`46`	`// Mouse`
`47`	`47`
`48`		`-void WEAK setupUSB() {`
`49`		`- HID.begin();`
`50`		`-}`
`51`		`-`
`52`	`48`	`Mouse_::Mouse_(void) : _buttons(0)`
`53`	`49`	`{`
`54`	`50`	`}`

`‎libraries/MouseAndKeyboard/MouseAndKeyboard.cpp‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,6 @@ size_t getsizeof_hidReportDescriptor() {`
`91`	`91`	`return sizeof(_hidReportDescriptor);`
`92`	`92`	`}`
`93`	`93`
`94`		`-void WEAK setupUSB() {`
`95`		`- HID.begin();`
`96`		`-}`
`97`		`-`
`98`	`94`	`Mouse_ Mouse;`
`99`	`95`
`100`	`96`	`//================================================================================`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 6759e88

File tree

7 files changed

7 files changed

`‎hardware/arduino/avr/cores/arduino/main.cpp‎`

`‎libraries/HID/HID.cpp‎`

`‎libraries/Keyboard/Keyboard.cpp‎`

`‎libraries/MIDIUSB/MIDIUSB.cpp‎`

`‎libraries/MIDIUSB/MIDIUSB.h‎`

`‎libraries/Mouse/Mouse.cpp‎`

`‎libraries/MouseAndKeyboard/MouseAndKeyboard.cpp‎`

0 commit comments