diff --git a/libraries/FatFSUSB/src/FatFSUSB.h b/libraries/FatFSUSB/src/FatFSUSB.h index c9388a5..d79147f 100644 --- a/libraries/FatFSUSB/src/FatFSUSB.h +++ b/libraries/FatFSUSB/src/FatFSUSB.h @@ -19,6 +19,10 @@ #pragma once +#ifdef USE_TINYUSB +#error FatFSUSB is not compatible with Adafruit TinyUSB +#endif + #include class FatFSUSBClass { diff --git a/libraries/Joystick/src/Joystick.h b/libraries/Joystick/src/Joystick.h index 7c673db..56af706 100644 --- a/libraries/Joystick/src/Joystick.h +++ b/libraries/Joystick/src/Joystick.h @@ -18,11 +18,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _JOYSTICK_h -#define _JOYSTICK_h +#pragma once + +#ifdef USE_TINYUSB +#error Joystick is not compatible with Adafruit TinyUSB +#endif #include -#include "class/hid/hid.h" +#include //====================================================================== class Joystick_ : public HID_Joystick { @@ -31,5 +34,3 @@ public: virtual void send_now(void) override; }; extern Joystick_ Joystick; - -#endif /* _JOYSTICK_h */ diff --git a/libraries/Keyboard/src/Keyboard.h b/libraries/Keyboard/src/Keyboard.h index b0a6cfc..df4f6da 100644 --- a/libraries/Keyboard/src/Keyboard.h +++ b/libraries/Keyboard/src/Keyboard.h @@ -20,8 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef KEYBOARD_h -#define KEYBOARD_h +#pragma once + +#ifdef USE_TINYUSB +#error Keyboard is not compatible with Adafruit TinyUSB +#endif #include @@ -34,5 +37,3 @@ public: Keyboard_(void); }; extern Keyboard_ Keyboard; - -#endif diff --git a/libraries/Mouse/src/Mouse.h b/libraries/Mouse/src/Mouse.h index 839dbb3..bd8c551 100644 --- a/libraries/Mouse/src/Mouse.h +++ b/libraries/Mouse/src/Mouse.h @@ -19,8 +19,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOUSE_h -#define MOUSE_h +#pragma once + +#ifdef USE_TINYUSB +#error Mouse is not compatible with Adafruit TinyUSB +#endif #include @@ -30,5 +33,3 @@ public: virtual void move(int x, int y, signed char wheel = 0) override; }; extern Mouse_ Mouse; - -#endif diff --git a/libraries/MouseAbsolute/src/MouseAbsolute.h b/libraries/MouseAbsolute/src/MouseAbsolute.h index 4416513..b22560f 100644 --- a/libraries/MouseAbsolute/src/MouseAbsolute.h +++ b/libraries/MouseAbsolute/src/MouseAbsolute.h @@ -1,5 +1,5 @@ /* - Mouse.h + MouseAbsolute.h Copyright (c) 2015, Arduino LLC Original code (pre-library): Copyright (c) 2011, Peter Barrett @@ -19,8 +19,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOUSEABSOLUTE_h -#define MOUSEABSOLUTE_h +#pragma once + +#ifdef USE_TINYUSB +#error MouseAbsolute is not compatible with Adafruit TinyUSB +#endif #include @@ -30,5 +33,3 @@ public: virtual void move(int x, int y, signed char wheel = 0) override; }; extern MouseAbsolute_ MouseAbsolute; - -#endif diff --git a/libraries/SingleFileDrive/src/SingleFileDrive.h b/libraries/SingleFileDrive/src/SingleFileDrive.h index ccc733a..bf7c5d5 100644 --- a/libraries/SingleFileDrive/src/SingleFileDrive.h +++ b/libraries/SingleFileDrive/src/SingleFileDrive.h @@ -19,6 +19,10 @@ #pragma once +#ifdef USE_TINYUSB +#error SingleFileDrive is not compatible with Adafruit TinyUSB +#endif + #include class SingleFileDrive {