From aaa60c6778517eb721d42da00adafdb20c4c3f8b Mon Sep 17 00:00:00 2001 From: NepEgor Date: Thu, 28 Oct 2021 21:51:13 +0300 Subject: [PATCH] Moved usbd to separate library --- include/usbd_device.h | 41 ------------------- lib/usb_device/include/usb_device.h | 20 +++++++++ .../usb_device/include}/usbd_descriptors.h | 0 .../usb_device/include}/usbd_hid_custom.h | 0 .../usb_device/include}/usbd_hid_custom_if.h | 0 lib/usb_device/library.json | 10 +++++ lib/usb_device/src/usb_device.cpp | 18 ++++++++ .../usb_device/src}/usbd_decriptors.cpp | 0 .../usb_device/src}/usbd_hid_custom.cpp | 0 .../usb_device/src}/usbd_hid_custom_if.cpp | 0 src/main.cpp | 4 +- src/usbd_device.cpp | 22 ---------- 12 files changed, 50 insertions(+), 65 deletions(-) delete mode 100644 include/usbd_device.h create mode 100644 lib/usb_device/include/usb_device.h rename {include => lib/usb_device/include}/usbd_descriptors.h (100%) rename {include => lib/usb_device/include}/usbd_hid_custom.h (100%) rename {include => lib/usb_device/include}/usbd_hid_custom_if.h (100%) create mode 100644 lib/usb_device/library.json create mode 100644 lib/usb_device/src/usb_device.cpp rename {src => lib/usb_device/src}/usbd_decriptors.cpp (100%) rename {src => lib/usb_device/src}/usbd_hid_custom.cpp (100%) rename {src => lib/usb_device/src}/usbd_hid_custom_if.cpp (100%) delete mode 100644 src/usbd_device.cpp diff --git a/include/usbd_device.h b/include/usbd_device.h deleted file mode 100644 index 8a8eb05..0000000 --- a/include/usbd_device.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef USBD_DEVICE_H -#define USBD_DEVICE_H - -#include - -#include "touch_controls_all.h" - -class USBD_Device -{ - private: - // 0 - right bumper - // 1 - left bumper - // 2 - right trigger full - // 3 - left trigger full - // 4 - right trackpad - // 5 - left trackpad - // 6 - right front grip - // 7 - right rear grip - // 8 - left front grip - // 9 - left rear grip - uint16_t button_map[10]; - - // Trackpads - // 0 - right, 1 - left - TouchJoystick* tjoystick[2]; - TouchDpad* tdpad[2]; - - // TODO triggers - - public: - USBD_Device(); - - void begin(); - void end(); - - void addTouchJoystick(TouchJoystick* tjoystick); - void addTouchDpad(TouchDpad* tdpad); - -}; - -#endif \ No newline at end of file diff --git a/lib/usb_device/include/usb_device.h b/lib/usb_device/include/usb_device.h new file mode 100644 index 0000000..9538dda --- /dev/null +++ b/lib/usb_device/include/usb_device.h @@ -0,0 +1,20 @@ +#ifndef USB_DEVICE_H +#define USB_DEVICE_H + +#include + +class USB_Device +{ + private: + + + public: + USB_Device(); + + void begin(); + void end(); + + +}; + +#endif \ No newline at end of file diff --git a/include/usbd_descriptors.h b/lib/usb_device/include/usbd_descriptors.h similarity index 100% rename from include/usbd_descriptors.h rename to lib/usb_device/include/usbd_descriptors.h diff --git a/include/usbd_hid_custom.h b/lib/usb_device/include/usbd_hid_custom.h similarity index 100% rename from include/usbd_hid_custom.h rename to lib/usb_device/include/usbd_hid_custom.h diff --git a/include/usbd_hid_custom_if.h b/lib/usb_device/include/usbd_hid_custom_if.h similarity index 100% rename from include/usbd_hid_custom_if.h rename to lib/usb_device/include/usbd_hid_custom_if.h diff --git a/lib/usb_device/library.json b/lib/usb_device/library.json new file mode 100644 index 0000000..590e536 --- /dev/null +++ b/lib/usb_device/library.json @@ -0,0 +1,10 @@ +{ + "name": "usb_device", + "version": "1.0.0", + "description": "", + "keywords": "", + "dependencies": + { + "hid_def" : "*" + } +} \ No newline at end of file diff --git a/lib/usb_device/src/usb_device.cpp b/lib/usb_device/src/usb_device.cpp new file mode 100644 index 0000000..58e8a62 --- /dev/null +++ b/lib/usb_device/src/usb_device.cpp @@ -0,0 +1,18 @@ +#include "usb_device.h" + +#include "usbd_hid_custom_if.h" + +USB_Device::USB_Device(void) +{ + +} + +void USB_Device::begin(void) +{ + HID_Custom_Init(); +} + +void USB_Device::end(void) +{ + HID_Custom_DeInit(); +} diff --git a/src/usbd_decriptors.cpp b/lib/usb_device/src/usbd_decriptors.cpp similarity index 100% rename from src/usbd_decriptors.cpp rename to lib/usb_device/src/usbd_decriptors.cpp diff --git a/src/usbd_hid_custom.cpp b/lib/usb_device/src/usbd_hid_custom.cpp similarity index 100% rename from src/usbd_hid_custom.cpp rename to lib/usb_device/src/usbd_hid_custom.cpp diff --git a/src/usbd_hid_custom_if.cpp b/lib/usb_device/src/usbd_hid_custom_if.cpp similarity index 100% rename from src/usbd_hid_custom_if.cpp rename to lib/usb_device/src/usbd_hid_custom_if.cpp diff --git a/src/main.cpp b/src/main.cpp index 479c6ce..6b9485c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,8 +2,8 @@ //#include "usbd_hid_custom_if.h" -#include "usbd_device.h" -USBD_Device device; +#include "usb_device.h" +USB_Device device; #include "trackpad.h" TrackPad trackpad_right(0); diff --git a/src/usbd_device.cpp b/src/usbd_device.cpp deleted file mode 100644 index a23c83e..0000000 --- a/src/usbd_device.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "usbd_device.h" - -#include "usbd_hid_custom_if.h" - -const int16_t usb_x = 512; -const int16_t usb_y = 512; -const int16_t usb_r = 512; - -USBD_Device::USBD_Device(void) -{ - -} - -void USBD_Device::begin(void) -{ - HID_Custom_Init(); -} - -void USBD_Device::end(void) -{ - HID_Custom_DeInit(); -}