Skip to content

Commit

Permalink
add clang to pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
hathach committed Mar 22, 2023
1 parent c497d50 commit d274581
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 16 deletions.
21 changes: 20 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,27 @@
# SPDX-License-Identifier: Unlicense

repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v15.0.7
hooks:
- id: clang-format
exclude: |
(?x)^(
examples/|
src/class|
src/common|
src/device|
src/host|
src/osal|
src/portable|
src/tusb_option.h|
src/tusb.c|
src/tusb.h
)
types_or: [c++, c, header]

- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
hooks:
- id: codespell
#args: [-w]
args: [-w]
19 changes: 10 additions & 9 deletions src/Adafruit_TinyUSB.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
#define ADAFRUIT_TINYUSB_H_

// Error message for Core that must select TinyUSB via menu
#if !defined(USE_TINYUSB) && ( defined(ARDUINO_ARCH_SAMD) || \
(defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)) )
#if !defined(USE_TINYUSB) && \
(defined(ARDUINO_ARCH_SAMD) || \
(defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)))
#error TinyUSB is not selected, please select it in "Tools->Menu->USB Stack"
#endif

Expand All @@ -39,23 +40,23 @@
#include "arduino/Adafruit_USBD_Device.h"

#if CFG_TUD_CDC
#include "arduino/Adafruit_USBD_CDC.h"
#include "arduino/Adafruit_USBD_CDC.h"
#endif

#if CFG_TUD_HID
#include "arduino/hid/Adafruit_USBD_HID.h"
#include "arduino/hid/Adafruit_USBD_HID.h"
#endif

#if CFG_TUD_MIDI
#include "arduino/midi/Adafruit_USBD_MIDI.h"
#include "arduino/midi/Adafruit_USBD_MIDI.h"
#endif

#if CFG_TUD_MSC
#include "arduino/msc/Adafruit_USBD_MSC.h"
#include "arduino/msc/Adafruit_USBD_MSC.h"
#endif

#if CFG_TUD_VENDOR
#include "arduino/webusb/Adafruit_USBD_WebUSB.h"
#include "arduino/webusb/Adafruit_USBD_WebUSB.h"
#endif

// Initialize device hardware, stack, also Serial as CDC
Expand All @@ -70,11 +71,11 @@ void TinyUSB_Device_Init(uint8_t rhport);
#include "arduino/Adafruit_USBH_Host.h"

#if CFG_TUH_CDC
#include "arduino/cdc/Adafruit_USBH_CDC.h"
#include "arduino/cdc/Adafruit_USBH_CDC.h"
#endif

#if CFG_TUH_MSC
#include "arduino/msc/Adafruit_USBH_MSC.h"
#include "arduino/msc/Adafruit_USBH_MSC.h"
#endif

#endif
Expand Down
6 changes: 3 additions & 3 deletions src/arduino/Adafruit_USBH_Host.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class Adafruit_USBH_Host {
//
//// USBHost has a high chance to conflict with other usb stack
//// only define if supported BSP
//#ifdef USE_TINYUSB
//#define USBHost TinyUSBHost
//#endif
// #ifdef USE_TINYUSB
// #define USBHost TinyUSBHost
// #endif

#endif /* ADAFRUIT_USBH_HOST_H_ */
6 changes: 3 additions & 3 deletions src/arduino/ports/rp2040/tusb_config_rp2040.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@ extern int serial1_printf(const char *__restrict __format, ...);
#define CFG_TUH_HUB 1

// max device support (excluding hub device): 1 hub typically has 4 ports
#define CFG_TUH_DEVICE_MAX (3*CFG_TUH_HUB + 1)
#define CFG_TUH_DEVICE_MAX (3 * CFG_TUH_HUB + 1)

// Enable tuh_edpt_xfer() API
//#define CFG_TUH_API_EDPT_XFER 1
// #define CFG_TUH_API_EDPT_XFER 1

// Number of mass storage
#define CFG_TUH_MSC 1

// Number of HIDs
// typical keyboard + mouse device can have 3,4 HID interfaces
#define CFG_TUH_HID (3*CFG_TUH_DEVICE_MAX)
#define CFG_TUH_HID (3 * CFG_TUH_DEVICE_MAX)

// Number of CDC interfaces
#define CFG_TUH_CDC 1
Expand Down

0 comments on commit d274581

Please sign in to comment.