Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compile error at the DigiKeyboard and DigiMouse library if platformIO is used #93

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix compile error at the DigiKeyboard and DigiMouse library if platformIO is used #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5cc89
fix compile error if platformIO is used
LuckyTurtleDev May 28, 2019
60eaeb5
fix compile error if platformIO is used
LuckyTurtleDev May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions digistump-avr/libraries/DigisparkKeyboard/DigiKeyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,24 @@ static uchar idleRate; // in 4 ms units
* for the second INPUT item.
*/
const PROGMEM char usbHidReportDescriptor[USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH] = { /* USB report descriptor */
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x06, // USAGE (Keyboard)
0xa1, 0x01, // COLLECTION (Application)
0x05, 0x07, // USAGE_PAGE (Keyboard)
0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)
0x95, 0x08, // REPORT_COUNT (8)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (simultaneous keystrokes)
0x75, 0x08, // REPORT_SIZE (8)
0x25, 0x65, // LOGICAL_MAXIMUM (101)
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0 // END_COLLECTION
(char) 0x05, (char) 0x01, // USAGE_PAGE (Generic Desktop)
(char) 0x09, (char) 0x06, // USAGE (Keyboard)
(char) 0xa1, (char) 0x01, // COLLECTION (Application)
(char) 0x05, (char) 0x07, // USAGE_PAGE (Keyboard)
(char) 0x19, (char) 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
(char) 0x29, (char) 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
(char) 0x15, (char) 0x00, // LOGICAL_MINIMUM (0)
(char) 0x25, (char) 0x01, // LOGICAL_MAXIMUM (1)
(char) 0x75, (char) 0x01, // REPORT_SIZE (1)
(char) 0x95, (char) 0x08, // REPORT_COUNT (8)
(char) 0x81, (char) 0x02, // INPUT (Data,Var,Abs)
(char) 0x95, (char) 0x01, // REPORT_COUNT (simultaneous keystrokes)
(char) 0x75, (char) 0x08, // REPORT_SIZE (8)
(char) 0x25, (char) 0x65, // LOGICAL_MAXIMUM (101)
(char) 0x19, (char) 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
(char) 0x29, (char) 0x65, // USAGE_MAXIMUM (Keyboard Application)
(char) 0x81, (char) 0x00, // INPUT (Data,Ary,Abs)
(char) 0xc0 // END_COLLECTION
};


Expand Down
58 changes: 29 additions & 29 deletions digistump-avr/libraries/DigisparkMouse/DigiMouse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,35 @@ static unsigned long last_report_time = 0;
char usb_hasCommed = 0;

const PROGMEM unsigned char mouse_usbHidReportDescriptor[] = { /* USB report descriptor */
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x02, // USAGE (Mouse)
0xa1, 0x01, // COLLECTION (Application)
0x09, 0x01, // USAGE_PAGE (Pointer)
0xa1, 0x00, // COLLECTION (Physical)
0x05, 0x09, // USAGE_PAGE (Button)
0x19, 0x01, // USAGE_MINIMUM (Button 1)
0x29, 0x03, // USAGE_MAXIMUM (Button 3)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x95, 0x03, // REPORT_COUNT (3)
0x75, 0x01, // REPORT_SIZE (1)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x05, // REPORT_SIZE (5)
0x81, 0x01, // Input(Cnst)
0x05, 0x01, // USAGE_PAGE(Generic Desktop)
0x09, 0x30, // USAGE(X)
0x09, 0x31, // USAGE(Y)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x02, // REPORT_COUNT (2)
0x81, 0x06, // INPUT (Data,Var,Rel)
0x09, 0x38, // Usage (Wheel)
0x95, 0x01, // Report Count (1),
0x81, 0x06, // Input (Data, Variable, Relative)
0xc0, // END_COLLECTION
0xc0 // END_COLLECTION
(unsigned char) 0x05, (unsigned char) 0x01, // USAGE_PAGE (Generic Desktop)
(unsigned char) 0x09, (unsigned char) 0x02, // USAGE (Mouse)
(unsigned char) 0xa1, (unsigned char) 0x01, // COLLECTION (Application)
(unsigned char) 0x09, (unsigned char) 0x01, // USAGE_PAGE (Pointer)
(unsigned char) 0xa1, (unsigned char) 0x00, // COLLECTION (Physical)
(unsigned char) 0x05, (unsigned char) 0x09, // USAGE_PAGE (Button)
(unsigned char) 0x19, (unsigned char) 0x01, // USAGE_MINIMUM (Button 1)
(unsigned char) 0x29, (unsigned char) 0x03, // USAGE_MAXIMUM (Button 3)
(unsigned char) 0x15, (unsigned char) 0x00, // LOGICAL_MINIMUM (0)
(unsigned char) 0x25, (unsigned char) 0x01, // LOGICAL_MAXIMUM (1)
(unsigned char) 0x95, (unsigned char) 0x03, // REPORT_COUNT (3)
(unsigned char) 0x75, (unsigned char) 0x01, // REPORT_SIZE (1)
(unsigned char) 0x81, (unsigned char) 0x02, // INPUT (Data,Var,Abs)
(unsigned char) 0x95, (unsigned char) 0x01, // REPORT_COUNT (1)
(unsigned char) 0x75, (unsigned char) 0x05, // REPORT_SIZE (5)
(unsigned char) 0x81, (unsigned char) 0x01, // Input(Cnst)
(unsigned char) 0x05, (unsigned char) 0x01, // USAGE_PAGE(Generic Desktop)
(unsigned char) 0x09, (unsigned char) 0x30, // USAGE(X)
(unsigned char) 0x09, (unsigned char) 0x31, // USAGE(Y)
(unsigned char) 0x15, (unsigned char) 0x81, // LOGICAL_MINIMUM (-127)
(unsigned char) 0x25, (unsigned char) 0x7f, // LOGICAL_MAXIMUM (127)
(unsigned char) 0x75, (unsigned char) 0x08, // REPORT_SIZE (8)
(unsigned char) 0x95, (unsigned char) 0x02, // REPORT_COUNT (2)
(unsigned char) 0x81, (unsigned char) 0x06, // INPUT (Data,Var,Rel)
(unsigned char) 0x09, (unsigned char) 0x38, // Usage (Wheel)
(unsigned char) 0x95, (unsigned char) 0x01, // Report Count (1),
(unsigned char) 0x81, (unsigned char) 0x06, // Input (Data, Variable, Relative)
(unsigned char) 0xc0, // END_COLLECTION
(unsigned char) 0xc0 // END_COLLECTION
};


Expand Down