clang-formatted

Author: ladyada

src/Adafruit_TinyUSB.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Ha Thach for Adafruit Industries
@@ -22,13 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "Arduino.h"
 #include "Adafruit_TinyUSB.h"
+#include "Arduino.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
-
 //------------- IMPLEMENTATION -------------//
-

src/Adafruit_TinyUSB.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Ha Thach for Adafruit Industries
@@ -25,9 +25,9 @@
 #ifndef ADAFRUIT_TINYUSB_H_
 #define ADAFRUIT_TINYUSB_H_
 
-#include "Adafruit_USBD_MSC.h"
 #include "Adafruit_USBD_HID.h"
 #include "Adafruit_USBD_MIDI.h"
+#include "Adafruit_USBD_MSC.h"
 #include "Adafruit_USBD_WebUSB.h"
 
 #endif /* ADAFRUIT_TINYUSB_H_ */

src/Adafruit_USBD_HID.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Ha Thach for Adafruit Industries
@@ -24,16 +24,15 @@
 
 #include "Adafruit_USBD_HID.h"
 
-#define EPOUT   0x00
-#define EPIN    0x80
+#define EPOUT 0x00
+#define EPIN 0x80
 
-uint8_t const _ascii2keycode[128][2] =  { HID_ASCII_TO_KEYCODE };
+uint8_t const _ascii2keycode[128][2] = {HID_ASCII_TO_KEYCODE};
 
-static Adafruit_USBD_HID* _hid_dev = NULL;
+static Adafruit_USBD_HID *_hid_dev = NULL;
 
 //------------- IMPLEMENTATION -------------//
-Adafruit_USBD_HID::Adafruit_USBD_HID(void)
-{
+Adafruit_USBD_HID::Adafruit_USBD_HID(void) {
   _interval_ms = 10;
   _protocol = HID_PROTOCOL_NONE;
 
@@ -47,106 +46,107 @@ Adafruit_USBD_HID::Adafruit_USBD_HID(void)
   _set_report_cb = NULL;
 }
 
-void Adafruit_USBD_HID::setPollInterval(uint8_t interval_ms)
-{
+void Adafruit_USBD_HID::setPollInterval(uint8_t interval_ms) {
   _interval_ms = interval_ms;
 }
 
-void Adafruit_USBD_HID::setBootProtocol(uint8_t protocol)
-{
+void Adafruit_USBD_HID::setBootProtocol(uint8_t protocol) {
   _protocol = protocol;
 }
 
-void Adafruit_USBD_HID::enableOutEndpoint(bool enable)
-{
+void Adafruit_USBD_HID::enableOutEndpoint(bool enable) {
   _out_endpoint = enable;
 }
 
-void Adafruit_USBD_HID::setReportDescriptor(uint8_t const* desc_report, uint16_t len)
-{
+void Adafruit_USBD_HID::setReportDescriptor(uint8_t const *desc_report,
+                                            uint16_t len) {
   _desc_report = desc_report;
   _desc_report_len = len;
 }
 
-void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report, set_report_callback_t set_report)
-{
+void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report,
+                                          set_report_callback_t set_report) {
   _get_report_cb = get_report;
   _set_report_cb = set_report;
 }
 
-uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
-{
-  if ( !_desc_report_len ) return 0;
+uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t itfnum, uint8_t *buf,
+                                          uint16_t bufsize) {
+  if (!_desc_report_len)
+    return 0;
 
-  if ( _out_endpoint )
-  {
+  if (_out_endpoint) {
     // usb core will automatically update endpoint number
-    uint8_t desc[] = { TUD_HID_INOUT_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPOUT, EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms) };
+    uint8_t desc[] = {
+        TUD_HID_INOUT_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPOUT,
+                                 EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms)};
     uint16_t const len = sizeof(desc);
 
-    if ( bufsize < len ) return 0;
+    if (bufsize < len)
+      return 0;
     memcpy(buf, desc, len);
 
     return len;
-  }else
-  {
+  } else {
     // usb core will automatically update endpoint number
-    uint8_t desc[] = { TUD_HID_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms) };
+    uint8_t desc[] = {TUD_HID_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len,
+                                         EPIN, CFG_TUD_HID_BUFSIZE,
+                                         _interval_ms)};
     uint16_t const len = sizeof(desc);
 
-    if ( bufsize < len ) return 0;
+    if (bufsize < len)
+      return 0;
     memcpy(buf, desc, len);
 
     return len;
   }
 }
 
-bool Adafruit_USBD_HID::begin(void)
-{
-  if ( !USBDevice.addInterface(*this) ) return false;
+bool Adafruit_USBD_HID::begin(void) {
+  if (!USBDevice.addInterface(*this))
+    return false;
 
   _hid_dev = this;
   return true;
 }
 
-bool Adafruit_USBD_HID::ready(void)
-{
-  return tud_hid_ready();
-}
+bool Adafruit_USBD_HID::ready(void) { return tud_hid_ready(); }
 
-bool Adafruit_USBD_HID::sendReport(uint8_t report_id, void const* report, uint8_t len)
-{
+bool Adafruit_USBD_HID::sendReport(uint8_t report_id, void const *report,
+                                   uint8_t len) {
   return tud_hid_report(report_id, report, len);
 }
 
 //------------- TinyUSB callbacks -------------//
-extern "C"
-{
+extern "C" {
 
 // Invoked when received GET HID REPORT DESCRIPTOR
-// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
-uint8_t const * tud_hid_descriptor_report_cb(void)
-{
-  if (!_hid_dev) return NULL;
+// Application return pointer to descriptor, whose contents must exist long
+// enough for transfer to complete
+uint8_t const *tud_hid_descriptor_report_cb(void) {
+  if (!_hid_dev)
+    return NULL;
 
   return _hid_dev->_desc_report;
 }
 
 // Invoked when received GET_REPORT control request
 // Application must fill buffer report's content and return its length.
 // Return zero will cause the stack to STALL request
-uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen)
-{
-  if ( !(_hid_dev && _hid_dev->_get_report_cb) ) return 0;
+uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type,
+                               uint8_t *buffer, uint16_t reqlen) {
+  if (!(_hid_dev && _hid_dev->_get_report_cb))
+    return 0;
 
   return _hid_dev->_get_report_cb(report_id, report_type, buffer, reqlen);
 }
 
 // Invoked when received SET_REPORT control request or
 // received data on OUT endpoint ( Report ID = 0, Type = 0 )
-void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize)
-{
-  if ( !(_hid_dev && _hid_dev->_set_report_cb) ) return;
+void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type,
+                           uint8_t const *buffer, uint16_t bufsize) {
+  if (!(_hid_dev && _hid_dev->_set_report_cb))
+    return;
 
   _hid_dev->_set_report_cb(report_id, report_type, buffer, bufsize);
 }
@@ -157,56 +157,52 @@ void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uin
 // Keyboard
 //--------------------------------------------------------------------+
 
-bool Adafruit_USBD_HID::keyboardReport(uint8_t report_id, uint8_t modifier, uint8_t keycode[6])
-{
+bool Adafruit_USBD_HID::keyboardReport(uint8_t report_id, uint8_t modifier,
+                                       uint8_t keycode[6]) {
   return tud_hid_keyboard_report(report_id, modifier, keycode);
 }
 
-bool Adafruit_USBD_HID::keyboardPress(uint8_t report_id, char ch)
-{
-  uint8_t keycode[6] = { 0 };
-  uint8_t modifier   = 0;
+bool Adafruit_USBD_HID::keyboardPress(uint8_t report_id, char ch) {
+  uint8_t keycode[6] = {0};
+  uint8_t modifier = 0;
 
-  if ( _ascii2keycode[ch][0] ) modifier = KEYBOARD_MODIFIER_LEFTSHIFT;
+  if (_ascii2keycode[ch][0])
+    modifier = KEYBOARD_MODIFIER_LEFTSHIFT;
   keycode[0] = _ascii2keycode[ch][1];
 
   return tud_hid_keyboard_report(report_id, modifier, keycode);
 }
 
-bool Adafruit_USBD_HID::keyboardRelease(uint8_t report_id)
-{
+bool Adafruit_USBD_HID::keyboardRelease(uint8_t report_id) {
   return tud_hid_keyboard_report(report_id, 0, NULL);
 }
 
 //--------------------------------------------------------------------+
 // Mouse
 //--------------------------------------------------------------------+
 
-bool Adafruit_USBD_HID::mouseReport(uint8_t report_id, uint8_t buttons, int8_t x, int8_t y, int8_t vertical, int8_t horizontal)
-{
+bool Adafruit_USBD_HID::mouseReport(uint8_t report_id, uint8_t buttons,
+                                    int8_t x, int8_t y, int8_t vertical,
+                                    int8_t horizontal) {
   // cache mouse button for other API such as move, scroll
   _mouse_button = buttons;
 
   return tud_hid_mouse_report(report_id, buttons, x, y, vertical, horizontal);
 }
 
-bool Adafruit_USBD_HID::mouseMove(uint8_t report_id, int8_t x, int8_t y)
-{
+bool Adafruit_USBD_HID::mouseMove(uint8_t report_id, int8_t x, int8_t y) {
   return tud_hid_mouse_report(report_id, _mouse_button, x, y, 0, 0);
 }
 
-bool Adafruit_USBD_HID::mouseScroll(uint8_t report_id, int8_t scroll, int8_t pan)
-{
+bool Adafruit_USBD_HID::mouseScroll(uint8_t report_id, int8_t scroll,
+                                    int8_t pan) {
   return tud_hid_mouse_report(report_id, _mouse_button, 0, 0, scroll, pan);
 }
 
-bool Adafruit_USBD_HID::mouseButtonPress(uint8_t report_id, uint8_t buttons)
-{
+bool Adafruit_USBD_HID::mouseButtonPress(uint8_t report_id, uint8_t buttons) {
   return tud_hid_mouse_report(report_id, buttons, 0, 0, 0, 0);
 }
 
-bool Adafruit_USBD_HID::mouseButtonRelease(uint8_t report_id)
-{
+bool Adafruit_USBD_HID::mouseButtonRelease(uint8_t report_id) {
   return tud_hid_mouse_report(report_id, 0, 0, 0, 0, 0);
 }
-

src/Adafruit_USBD_HID.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Ha Thach for Adafruit Industries
@@ -27,55 +27,66 @@
 
 #include "Adafruit_TinyUSB_Core.h"
 
-class Adafruit_USBD_HID : Adafruit_USBD_Interface
-{
-  public:
-    typedef uint16_t (*get_report_callback_t) (uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen);
-    typedef void (*set_report_callback_t)(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize);
+class Adafruit_USBD_HID : Adafruit_USBD_Interface {
+public:
+  typedef uint16_t (*get_report_callback_t)(uint8_t report_id,
+                                            hid_report_type_t report_type,
+                                            uint8_t *buffer, uint16_t reqlen);
+  typedef void (*set_report_callback_t)(uint8_t report_id,
+                                        hid_report_type_t report_type,
+                                        uint8_t const *buffer,
+                                        uint16_t bufsize);
 
-    Adafruit_USBD_HID(void);
+  Adafruit_USBD_HID(void);
 
-    void setPollInterval(uint8_t interval_ms);
-    void setBootProtocol(uint8_t protocol); // 0: None, 1: Keyboard, 2:Mouse
-    void enableOutEndpoint(bool enable);
-    void setReportDescriptor(uint8_t const* desc_report, uint16_t len);
-    void setReportCallback(get_report_callback_t get_report, set_report_callback_t set_report);
+  void setPollInterval(uint8_t interval_ms);
+  void setBootProtocol(uint8_t protocol); // 0: None, 1: Keyboard, 2:Mouse
+  void enableOutEndpoint(bool enable);
+  void setReportDescriptor(uint8_t const *desc_report, uint16_t len);
+  void setReportCallback(get_report_callback_t get_report,
+                         set_report_callback_t set_report);
 
-    bool begin(void);
+  bool begin(void);
 
-    bool ready(void);
-    bool sendReport(uint8_t report_id, void const* report, uint8_t len);
+  bool ready(void);
+  bool sendReport(uint8_t report_id, void const *report, uint8_t len);
 
-    //------------- Keyboard API -------------//
-    bool keyboardReport(uint8_t report_id, uint8_t modifier, uint8_t keycode[6]);
-    bool keyboardPress(uint8_t report_id, char ch);
-    bool keyboardRelease(uint8_t report_id);
+  //------------- Keyboard API -------------//
+  bool keyboardReport(uint8_t report_id, uint8_t modifier, uint8_t keycode[6]);
+  bool keyboardPress(uint8_t report_id, char ch);
+  bool keyboardRelease(uint8_t report_id);
 
-    //------------- Mouse API -------------//
-    bool mouseReport(uint8_t report_id, uint8_t buttons, int8_t x, int8_t y, int8_t vertical, int8_t horizontal);
-    bool mouseMove(uint8_t report_id, int8_t x, int8_t y);
-    bool mouseScroll(uint8_t report_id, int8_t scroll, int8_t pan);
-    bool mouseButtonPress(uint8_t report_id, uint8_t buttons);
-    static inline bool mouseButtonRelease(uint8_t report_id);
+  //------------- Mouse API -------------//
+  bool mouseReport(uint8_t report_id, uint8_t buttons, int8_t x, int8_t y,
+                   int8_t vertical, int8_t horizontal);
+  bool mouseMove(uint8_t report_id, int8_t x, int8_t y);
+  bool mouseScroll(uint8_t report_id, int8_t scroll, int8_t pan);
+  bool mouseButtonPress(uint8_t report_id, uint8_t buttons);
+  static inline bool mouseButtonRelease(uint8_t report_id);
 
-    // from Adafruit_USBD_Interface
-    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
+  // from Adafruit_USBD_Interface
+  virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
+                                 uint16_t bufsize);
 
-  private:
-    uint8_t _interval_ms;
-    uint8_t _protocol;
-    bool    _out_endpoint;
-    uint8_t _mouse_button;
+private:
+  uint8_t _interval_ms;
+  uint8_t _protocol;
+  bool _out_endpoint;
+  uint8_t _mouse_button;
 
-    uint16_t _desc_report_len;
-    uint8_t const* _desc_report;
+  uint16_t _desc_report_len;
+  uint8_t const *_desc_report;
 
-    get_report_callback_t _get_report_cb;
-    set_report_callback_t _set_report_cb;
+  get_report_callback_t _get_report_cb;
+  set_report_callback_t _set_report_cb;
 
-    friend uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen);
-    friend void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize);
-    friend uint8_t const * tud_hid_descriptor_report_cb(void);
+  friend uint16_t tud_hid_get_report_cb(uint8_t report_id,
+                                        hid_report_type_t report_type,
+                                        uint8_t *buffer, uint16_t reqlen);
+  friend void tud_hid_set_report_cb(uint8_t report_id,
+                                    hid_report_type_t report_type,
+                                    uint8_t const *buffer, uint16_t bufsize);
+  friend uint8_t const *tud_hid_descriptor_report_cb(void);
 };
 
 #endif /* ADAFRUIT_USBD_HID_H_ */