Skip to content

Commit 5defaea

Browse files
facchinmcmaglie
authored andcommitted
rework HID class functions scopes
1 parent 97a3771 commit 5defaea

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

hardware/arduino/avr/libraries/HID/HID.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ int HID_GetDescriptor(int8_t t)
6666
}
6767
}
6868

69-
void HID_SendReport(u8 id, const void* data, int len)
69+
void HID_::SendReport(u8 id, const void* data, int len)
7070
{
7171
USB_Send(HID_TX, &id, 1);
7272
USB_Send(HID_TX | TRANSFER_RELEASE,data,len);

hardware/arduino/avr/libraries/HID/HID.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,9 @@ class HID_
4747
public:
4848
HID_(void);
4949
int begin(void);
50+
void SendReport(uint8_t id, const void* data, int len);
5051
};
5152

52-
int8_t HID_Plug(void);
53-
int HID_GetInterface(u8* interfaceNum);
54-
int HID_GetDescriptor(int8_t t);
55-
bool HID_Setup(Setup& setup, u8 i);
56-
void HID_SendReport(uint8_t id, const void* data, int len);
57-
5853
extern HID_ HID;
5954

6055
typedef struct

libraries/Keyboard/Keyboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void Keyboard_::end(void)
4444

4545
void Keyboard_::sendReport(KeyReport* keys)
4646
{
47-
HID_SendReport(2,keys,sizeof(KeyReport));
47+
HID.SendReport(2,keys,sizeof(KeyReport));
4848
}
4949

5050
const u8 _hidReportDescriptor[] PROGMEM = {

libraries/Keyboard/Keyboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,6 @@ class Keyboard_ : public Print
9696
virtual void releaseAll(void);
9797
};
9898
extern Keyboard_ Keyboard;
99+
extern HID_ HID;
99100

100101
#endif

libraries/Mouse/Mouse.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void Mouse_::move(signed char x, signed char y, signed char wheel)
9393
m[1] = x;
9494
m[2] = y;
9595
m[3] = wheel;
96-
HID_SendReport(1,m,4);
96+
HID.SendReport(1,m,4);
9797
}
9898

9999
void Mouse_::buttons(uint8_t b)

libraries/Mouse/Mouse.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class Mouse_
5656
bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
5757
};
5858
extern Mouse_ Mouse;
59+
extern HID_ HID;
5960

6061
#endif
6162
#endif

0 commit comments

Comments
 (0)