From e632912905285a871bb00caf11c702a7a118ae78 Mon Sep 17 00:00:00 2001 From: NicoHood Date: Mon, 30 Nov 2015 17:59:50 +0100 Subject: [PATCH] Fix NKRO example issue #64 --- keywords.txt | 4 +++- src/MultiReport/ImprovedKeyboard.h | 3 +-- src/MultiReport/NKROKeyboard.h | 3 +-- src/SingleReport/BootKeyboard.h | 4 ++-- src/SingleReport/SingleNKROKeyboard.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keywords.txt b/keywords.txt index e5ce279..873224a 100644 --- a/keywords.txt +++ b/keywords.txt @@ -13,6 +13,8 @@ begin KEYWORD2 end KEYWORD2 press KEYWORD2 +add KEYWORD2 +remove KEYWORD2 release KEYWORD2 releaseAll KEYWORD2 @@ -36,7 +38,7 @@ set_key4 KEYWORD2 set_key5 KEYWORD2 set_key6 KEYWORD2 set_media KEYWORD2 -send_now KEYWORD2 +send KEYWORD2 buttons KEYWORD2 xAxis KEYWORD2 diff --git a/src/MultiReport/ImprovedKeyboard.h b/src/MultiReport/ImprovedKeyboard.h index d9185cf..d59486c 100644 --- a/src/MultiReport/ImprovedKeyboard.h +++ b/src/MultiReport/ImprovedKeyboard.h @@ -37,8 +37,7 @@ public: Keyboard_(void); void wakeupHost(void); -protected: - virtual inline int send(void) override; + virtual inline int send(void) final; }; extern Keyboard_ Keyboard; diff --git a/src/MultiReport/NKROKeyboard.h b/src/MultiReport/NKROKeyboard.h index 933c127..ef5c9b4 100644 --- a/src/MultiReport/NKROKeyboard.h +++ b/src/MultiReport/NKROKeyboard.h @@ -36,8 +36,7 @@ class NKROKeyboard_ : public NKROKeyboardAPI public: NKROKeyboard_(void); -protected: - virtual inline int send(void) override; + virtual int send(void) final; }; extern NKROKeyboard_ NKROKeyboard; diff --git a/src/SingleReport/BootKeyboard.h b/src/SingleReport/BootKeyboard.h index d5c9ff0..cd28a8f 100644 --- a/src/SingleReport/BootKeyboard.h +++ b/src/SingleReport/BootKeyboard.h @@ -63,6 +63,8 @@ public: void disableFeatureReport(void){ featureLength |= 0x8000; } + + virtual int send(void) final; protected: // Implementation of the PUSBListNode @@ -78,8 +80,6 @@ protected: uint8_t* featureReport; int featureLength; - - virtual int send(void) override; }; extern BootKeyboard_ BootKeyboard; diff --git a/src/SingleReport/SingleNKROKeyboard.h b/src/SingleReport/SingleNKROKeyboard.h index 422a47b..d5f2ead 100644 --- a/src/SingleReport/SingleNKROKeyboard.h +++ b/src/SingleReport/SingleNKROKeyboard.h @@ -37,6 +37,8 @@ public: SingleNKROKeyboard_(void); uint8_t getLeds(void); uint8_t getProtocol(void); + + virtual int send(void) final; protected: // Implementation of the PUSBListNode @@ -49,8 +51,6 @@ protected: uint8_t idle; uint8_t leds; - - virtual inline int send(void) override; }; extern SingleNKROKeyboard_ SingleNKROKeyboard;