From 345dc26257238f8d361d1bed4b56d9d2114c4e99 Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 4 Apr 2015 20:55:18 +0200 Subject: [PATCH 1/3] Consumer Fixes --- avr/cores/hid/USB-Core/HID.cpp | 2 +- avr/cores/hid/USB-Core/HID.h | 2 +- avr/variants/micro_custom/pins_arduino.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/avr/cores/hid/USB-Core/HID.cpp b/avr/cores/hid/USB-Core/HID.cpp index d661d15..7ec2a40 100644 --- a/avr/cores/hid/USB-Core/HID.cpp +++ b/avr/cores/hid/USB-Core/HID.cpp @@ -69,7 +69,7 @@ const u8 _hidReportDescriptor[] = { #ifdef HID_RAWHID_ENABLE HID_REPORT_RAWHID(HID_REPORTID_RAWHID), // not working at the moment #endif -#ifdef HID_CONSUMER_ENABLE +#ifdef HID_CONSUMERCONTROL_ENABLE HID_REPORT_CONSUMERCONTROL(HID_REPORTID_CONSUMERCONTROL), #endif #ifdef HID_SYSTEM_ENABLE diff --git a/avr/cores/hid/USB-Core/HID.h b/avr/cores/hid/USB-Core/HID.h index 4188980..1ce2518 100644 --- a/avr/cores/hid/USB-Core/HID.h +++ b/avr/cores/hid/USB-Core/HID.h @@ -50,7 +50,7 @@ THE SOFTWARE. #if !defined(EXTERN_HID_REPORT) && !defined(HID_MOUSE_ENABLE) && !defined(HID_KEYBOARD_KEYS_ENABLE) \ && !defined(HID_KEYBOARD_LEDS_ENABLE) && !defined(HID_MOUSE_ABSOLUTE_ENABLE) && !defined(HID_RAWHID_ENABLE) \ -&& !defined(HID_CONSUMER_ENABLE) && !defined(HID_SYSTEM_ENABLE) && !defined(HID_GAMEPAD_ENABLE) +&& !defined(HID_CONSUMERCONTROL_ENABLE) && !defined(HID_SYSTEM_ENABLE) && !defined(HID_GAMEPAD_ENABLE) // by default enable mouse + keyboard api #define HID_MOUSE_ENABLE #define HID_KEYBOARD_KEYS_ENABLE diff --git a/avr/variants/micro_custom/pins_arduino.h b/avr/variants/micro_custom/pins_arduino.h index d83b4ef..987774f 100644 --- a/avr/variants/micro_custom/pins_arduino.h +++ b/avr/variants/micro_custom/pins_arduino.h @@ -40,7 +40,7 @@ You have to enable the specific hid apis on your own then, also the keyboard led */ #define HID_AUTOMATIC -#define HID_CUSTOM_SETTINGS +//#define HID_CUSTOM_SETTINGS //================================================================================ // Automatic From b4880564695e11437a18da7db211ca576769183b Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 4 Apr 2015 20:55:29 +0200 Subject: [PATCH 2/3] Consumer Custom test --- avr/variants/micro_custom/pins_arduino.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/avr/variants/micro_custom/pins_arduino.h b/avr/variants/micro_custom/pins_arduino.h index 987774f..37aa6fb 100644 --- a/avr/variants/micro_custom/pins_arduino.h +++ b/avr/variants/micro_custom/pins_arduino.h @@ -48,12 +48,13 @@ You have to enable the specific hid apis on your own then, also the keyboard led #ifdef HID_AUTOMATIC // pre selected hid reports with autoinclude of the api -#define HID_MOUSE_ENABLE // normal mouse with buttons + wheel +//#define HID_MOUSE_ENABLE // normal mouse with buttons + wheel //#define HID_MOUSE_ABSOLUTE_ENABLE // only works with system and without gamepad -#define HID_KEYBOARD_LEDS_ENABLE // leds OR keys +//#define HID_KEYBOARD_LEDS_ENABLE // leds OR keys //#define HID_KEYBOARD_KEYS_ENABLE //#define HID_RAWHID_ENABLE // currently not working -//#define HID_CONSUMERCONTROL_ENABLE +#define HID_CONSUMERCONTROL_ENABLE +#define HID_REPORTID_CONSUMERCONTROL 1 //#define HID_SYSTEMCONTROL_ENABLE //#define HID_GAMEPAD_ENABLE // only works without mouse absolute From e81627d7facdf04db568675eda788f67f315f39e Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 4 Apr 2015 21:04:53 +0200 Subject: [PATCH 3/3] Revert "Consumer Custom test" This reverts commit b4880564695e11437a18da7db211ca576769183b. --- avr/variants/micro_custom/pins_arduino.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/avr/variants/micro_custom/pins_arduino.h b/avr/variants/micro_custom/pins_arduino.h index 37aa6fb..987774f 100644 --- a/avr/variants/micro_custom/pins_arduino.h +++ b/avr/variants/micro_custom/pins_arduino.h @@ -48,13 +48,12 @@ You have to enable the specific hid apis on your own then, also the keyboard led #ifdef HID_AUTOMATIC // pre selected hid reports with autoinclude of the api -//#define HID_MOUSE_ENABLE // normal mouse with buttons + wheel +#define HID_MOUSE_ENABLE // normal mouse with buttons + wheel //#define HID_MOUSE_ABSOLUTE_ENABLE // only works with system and without gamepad -//#define HID_KEYBOARD_LEDS_ENABLE // leds OR keys +#define HID_KEYBOARD_LEDS_ENABLE // leds OR keys //#define HID_KEYBOARD_KEYS_ENABLE //#define HID_RAWHID_ENABLE // currently not working -#define HID_CONSUMERCONTROL_ENABLE -#define HID_REPORTID_CONSUMERCONTROL 1 +//#define HID_CONSUMERCONTROL_ENABLE //#define HID_SYSTEMCONTROL_ENABLE //#define HID_GAMEPAD_ENABLE // only works without mouse absolute