Fix NKRO example issue #64

This commit is contained in:
NicoHood 2015-11-30 17:59:50 +01:00
parent a95361043b
commit e632912905
5 changed files with 9 additions and 9 deletions

View file

@ -13,6 +13,8 @@
begin KEYWORD2 begin KEYWORD2
end KEYWORD2 end KEYWORD2
press KEYWORD2 press KEYWORD2
add KEYWORD2
remove KEYWORD2
release KEYWORD2 release KEYWORD2
releaseAll KEYWORD2 releaseAll KEYWORD2
@ -36,7 +38,7 @@ set_key4 KEYWORD2
set_key5 KEYWORD2 set_key5 KEYWORD2
set_key6 KEYWORD2 set_key6 KEYWORD2
set_media KEYWORD2 set_media KEYWORD2
send_now KEYWORD2 send KEYWORD2
buttons KEYWORD2 buttons KEYWORD2
xAxis KEYWORD2 xAxis KEYWORD2

View file

@ -37,8 +37,7 @@ public:
Keyboard_(void); Keyboard_(void);
void wakeupHost(void); void wakeupHost(void);
protected: virtual inline int send(void) final;
virtual inline int send(void) override;
}; };
extern Keyboard_ Keyboard; extern Keyboard_ Keyboard;

View file

@ -36,8 +36,7 @@ class NKROKeyboard_ : public NKROKeyboardAPI
public: public:
NKROKeyboard_(void); NKROKeyboard_(void);
protected: virtual int send(void) final;
virtual inline int send(void) override;
}; };
extern NKROKeyboard_ NKROKeyboard; extern NKROKeyboard_ NKROKeyboard;

View file

@ -64,6 +64,8 @@ public:
featureLength |= 0x8000; featureLength |= 0x8000;
} }
virtual int send(void) final;
protected: protected:
// Implementation of the PUSBListNode // Implementation of the PUSBListNode
int getInterface(uint8_t* interfaceCount); int getInterface(uint8_t* interfaceCount);
@ -78,8 +80,6 @@ protected:
uint8_t* featureReport; uint8_t* featureReport;
int featureLength; int featureLength;
virtual int send(void) override;
}; };
extern BootKeyboard_ BootKeyboard; extern BootKeyboard_ BootKeyboard;

View file

@ -38,6 +38,8 @@ public:
uint8_t getLeds(void); uint8_t getLeds(void);
uint8_t getProtocol(void); uint8_t getProtocol(void);
virtual int send(void) final;
protected: protected:
// Implementation of the PUSBListNode // Implementation of the PUSBListNode
int getInterface(uint8_t* interfaceCount); int getInterface(uint8_t* interfaceCount);
@ -49,8 +51,6 @@ protected:
uint8_t idle; uint8_t idle;
uint8_t leds; uint8_t leds;
virtual inline int send(void) override;
}; };
extern SingleNKROKeyboard_ SingleNKROKeyboard; extern SingleNKROKeyboard_ SingleNKROKeyboard;