Skip to content

Commit b275d9c

Browse files
committed
rework HID class functions scopes
1 parent b8fa4de commit b275d9c

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

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

+1-1
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

+1-6
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,9 @@ class HID_
4545
public:
4646
HID_(void);
4747
int begin(void);
48+
void SendReport(uint8_t id, const void* data, int len);
4849
};
4950

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

5853
typedef struct

libraries/Keyboard/Keyboard.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void Keyboard_::end(void)
2323

2424
void Keyboard_::sendReport(KeyReport* keys)
2525
{
26-
HID_SendReport(2,keys,sizeof(KeyReport));
26+
HID.SendReport(2,keys,sizeof(KeyReport));
2727
}
2828

2929
const u8 _hidReportDescriptor[] PROGMEM = {

libraries/Keyboard/Keyboard.h

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class Keyboard_ : public Print
7575
virtual void releaseAll(void);
7676
};
7777
extern Keyboard_ Keyboard;
78+
extern HID_ HID;
7879

7980
#endif
8081
#endif

libraries/Mouse/Mouse.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void Mouse_::move(signed char x, signed char y, signed char wheel)
7272
m[1] = x;
7373
m[2] = y;
7474
m[3] = wheel;
75-
HID_SendReport(1,m,4);
75+
HID.SendReport(1,m,4);
7676
}
7777

7878
void Mouse_::buttons(uint8_t b)

libraries/Mouse/Mouse.h

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class Mouse_
3535
bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
3636
};
3737
extern Mouse_ Mouse;
38+
extern HID_ HID;
3839

3940
#endif
4041
#endif

0 commit comments

Comments
 (0)