From 1d2e5d36b2e3ab400f70303168b524bb7d1c1516 Mon Sep 17 00:00:00 2001 From: NicoHood Date: Sat, 10 Oct 2015 20:57:36 +0200 Subject: [PATCH] inlined Keyboard implementation --- src/HID-APIs/KeyboardAPI.h | 31 ++++++++++--------- .../{KeyboardAPI.cpp => KeyboardAPI.hpp} | 4 +-- 2 files changed, 19 insertions(+), 16 deletions(-) rename src/HID-APIs/{KeyboardAPI.cpp => KeyboardAPI.hpp} (99%) diff --git a/src/HID-APIs/KeyboardAPI.h b/src/HID-APIs/KeyboardAPI.h index 788eb63..fc7eec8 100644 --- a/src/HID-APIs/KeyboardAPI.h +++ b/src/HID-APIs/KeyboardAPI.h @@ -46,21 +46,21 @@ class KeyboardAPI : public Print { public: //TODO nkro compatiblity, merge them - void begin(void); - void end(void); - size_t write(uint8_t k); - size_t press(uint8_t k); - size_t release(uint8_t k); - void releaseAll(void); - void send_now(void); + inline void begin(void); + inline void end(void); + inline size_t write(uint8_t k); + inline size_t press(uint8_t k); + inline size_t release(uint8_t k); + inline void releaseAll(void); + inline void send_now(void); - size_t writeKeycode(uint8_t k); - size_t pressKeycode(uint8_t k); - size_t releaseKeycode(uint8_t k); - size_t addKeyToReport(uint8_t k); - size_t addKeycodeToReport(uint8_t k); - size_t removeKeyFromReport(uint8_t k); - size_t removeKeycodeFromReport(uint8_t k); + inline size_t writeKeycode(uint8_t k); + inline size_t pressKeycode(uint8_t k); + inline size_t releaseKeycode(uint8_t k); + inline size_t addKeyToReport(uint8_t k); + inline size_t addKeycodeToReport(uint8_t k); + inline size_t removeKeyFromReport(uint8_t k); + inline size_t removeKeycodeFromReport(uint8_t k); // Sending is public in the base class for advanced users. virtual void SendReport(void* data, int length) = 0; @@ -68,3 +68,6 @@ public: protected: HID_KeyboardReport_Data_t _keyReport; }; + +// Implementation is inline +#include "KeyboardAPI.hpp" diff --git a/src/HID-APIs/KeyboardAPI.cpp b/src/HID-APIs/KeyboardAPI.hpp similarity index 99% rename from src/HID-APIs/KeyboardAPI.cpp rename to src/HID-APIs/KeyboardAPI.hpp index ccaf140..19abc82 100644 --- a/src/HID-APIs/KeyboardAPI.cpp +++ b/src/HID-APIs/KeyboardAPI.hpp @@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "KeyboardAPI.h" - +// Include guard +#pragma once void KeyboardAPI::begin(void) {