Skip to content

Commit d788265

Browse files
committed
complete rename
1 parent 8905f95 commit d788265

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_TinyUSB_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "tusb.h"
2929

3030
#ifdef __cplusplus
31-
#include "Adafruit_USBDevice.h"
31+
#include "Adafruit_USBD_Device.h"
3232
#include "Adafruit_USBD_CDC.h"
3333
#endif
3434

cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBD_CDC.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424

2525
#ifdef NRF52840_XXAA
2626

27-
#include "Adafruit_USBD_CDC.h"
2827
#include "Arduino.h"
29-
#include "tusb.h"
28+
#include "Adafruit_USBD_CDC.h"
3029

3130
#define EPOUT 0x00
3231
#define EPIN 0x80

cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBD_CDC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef ADAFRUIT_USBD_CDC_H_
2626
#define ADAFRUIT_USBD_CDC_H_
2727

28-
#include "Adafruit_USBDevice.h"
28+
#include "Adafruit_USBD_Device.h"
2929
#include "Stream.h"
3030

3131
class Adafruit_USBD_CDC : public Stream, Adafruit_USBD_Interface

cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDevice.cpp renamed to cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBD_Device.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#ifdef NRF52840_XXAA
2626

27-
#include "Adafruit_USBDevice.h"
27+
#include "Adafruit_USBD_Device.h"
2828

2929
extern "C"
3030
{
@@ -66,9 +66,9 @@ tud_desc_set_t tud_desc_set =
6666

6767
} // extern C
6868

69-
Adafruit_TinyUSB_Device USBDevice;
69+
Adafruit_USBD_Device USBDevice;
7070

71-
Adafruit_TinyUSB_Device::Adafruit_TinyUSB_Device(void)
71+
Adafruit_USBD_Device::Adafruit_USBD_Device(void)
7272
{
7373
tusb_desc_device_t desc_dev =
7474
{
@@ -131,7 +131,7 @@ Adafruit_TinyUSB_Device::Adafruit_TinyUSB_Device(void)
131131
// Add interface descriptor
132132
// - Interface number will be updated to match current count
133133
// - Endpoint number is updated to be unique
134-
bool Adafruit_TinyUSB_Device::addInterface(Adafruit_USBD_Interface& itf)
134+
bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
135135
{
136136
uint8_t* desc = _desc_cfg+_desc_cfglen;
137137
uint16_t len = itf.getDescriptor(desc, sizeof(_desc_cfg)-_desc_cfglen);
@@ -173,7 +173,7 @@ bool Adafruit_TinyUSB_Device::addInterface(Adafruit_USBD_Interface& itf)
173173
return true;
174174
}
175175

176-
bool Adafruit_TinyUSB_Device::begin(uint16_t vid, uint16_t pid)
176+
bool Adafruit_USBD_Device::begin(uint16_t vid, uint16_t pid)
177177
{
178178
_desc_device.idVendor = vid;
179179
_desc_device.idProduct = pid;

cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDevice.h renamed to cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBD_Device.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
* THE SOFTWARE.
2323
*/
2424

25-
#ifndef ADAFRUIT_USBDEVICE_H_
26-
#define ADAFRUIT_USBDEVICE_H_
25+
#ifndef ADAFRUIT_USBD_DEVICE_H_
26+
#define ADAFRUIT_USBD_DEVICE_H_
2727

2828
#include "tusb.h"
2929

@@ -33,7 +33,7 @@ class Adafruit_USBD_Interface
3333
virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize) = 0;
3434
};
3535

36-
class Adafruit_TinyUSB_Device
36+
class Adafruit_USBD_Device
3737
{
3838
private:
3939
tusb_desc_device_t _desc_device;
@@ -47,13 +47,13 @@ class Adafruit_TinyUSB_Device
4747
uint8_t _epout_count;
4848

4949
public:
50-
Adafruit_TinyUSB_Device(void);
50+
Adafruit_USBD_Device(void);
5151

5252
bool addInterface(Adafruit_USBD_Interface& itf);
5353

5454
bool begin(uint16_t vid, uint16_t pid);
5555
};
5656

57-
extern Adafruit_TinyUSB_Device USBDevice;
57+
extern Adafruit_USBD_Device USBDevice;
5858

59-
#endif /* ADAFRUIT_USBDEVICE_H_ */
59+
#endif /* ADAFRUIT_USBD_DEVICE_H_ */

0 commit comments

Comments
 (0)