minor fixes
This commit is contained in:
NicoHood
parent
962b1a725f
commit
5d71e559fa
4 changed files with 25 additions and 12 deletions
17
Readme.md
17
Readme.md
|
|
@ -7,6 +7,21 @@ This project went through a lot of phases and has now reached a new Arduino ~~US
|
||||||
with a lot of new functions like extended HID. It also supports HoodLoader1+2.
|
with a lot of new functions like extended HID. It also supports HoodLoader1+2.
|
||||||
The idea is to enable enhanced USB functions to almost all 'standard' Arduino boards.
|
The idea is to enable enhanced USB functions to almost all 'standard' Arduino boards.
|
||||||
|
|
||||||
|
**Supported Arduinos (IDE 1.6.6 or higher!):**
|
||||||
|
* Uno (with HoodLoader2)
|
||||||
|
* Mega (with HoodLoader2)
|
||||||
|
* Leonardo
|
||||||
|
* (Pro)Micro
|
||||||
|
* Any other 8u2/16u/at90usb162/32u2/32u4 compatible board
|
||||||
|
|
||||||
|
**Supported HID devices:**
|
||||||
|
* Keyboard ~~with Leds out (modifiers + 6 keys pressed at the same time)~~
|
||||||
|
* Mouse (5 buttons, move, wheel)
|
||||||
|
* Absolute Mouse
|
||||||
|
* Consumer/Media Keys (4 keys for music player, web browser and more)
|
||||||
|
* System Key (for PC standby/shutdown)
|
||||||
|
* Gamepad (32 buttons, 4 16bit axis, 2 8bit axis, 2 D-Pads)
|
||||||
|
|
||||||
See the [wiki](https://github.com/NicoHood/HID/wiki/Features) for more information about features etc.
|
See the [wiki](https://github.com/NicoHood/HID/wiki/Features) for more information about features etc.
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -66,7 +81,7 @@ Version History
|
||||||
* Changed USB-Core into a simple library, only possible with Pluggable HID
|
* Changed USB-Core into a simple library, only possible with Pluggable HID
|
||||||
* Removed HID presets (like mouse + keyboard + consumer + system)
|
* Removed HID presets (like mouse + keyboard + consumer + system)
|
||||||
|
|
||||||
2.3 Release (xx.xx.2015) (never released)
|
2.3 Release (never released)
|
||||||
* Updated Libraries
|
* Updated Libraries
|
||||||
* Updated Arduino Core
|
* Updated Arduino Core
|
||||||
* Added Minor Consumer definitions
|
* Added Minor Consumer definitions
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ THE SOFTWARE.
|
||||||
|
|
||||||
#define CONSUMER_SCREENSAVER 0x19e
|
#define CONSUMER_SCREENSAVER 0x19e
|
||||||
|
|
||||||
|
#define CONSUMER_PROGRAMMABLE_BUTTON_CONFIGURATION 0x182
|
||||||
|
#define CONSUMER_CONTROL_CONFIGURATION 0x183
|
||||||
#define CONSUMER_EMAIL_READER 0x18A
|
#define CONSUMER_EMAIL_READER 0x18A
|
||||||
#define CONSUMER_CALCULATOR 0x192
|
#define CONSUMER_CALCULATOR 0x192
|
||||||
#define CONSUMER_EXPLORER 0x194
|
#define CONSUMER_EXPLORER 0x194
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ THE SOFTWARE.
|
||||||
//#define LAYOUT_FRENCH
|
//#define LAYOUT_FRENCH
|
||||||
//#define LAYOUT_FRENCH_BELGIAN
|
//#define LAYOUT_FRENCH_BELGIAN
|
||||||
//#define LAYOUT_FRENCH_SWISS
|
//#define LAYOUT_FRENCH_SWISS
|
||||||
//#define LAYOUT_GERMAN
|
#define LAYOUT_GERMAN
|
||||||
//#define LAYOUT_GERMAN_MAC
|
//#define LAYOUT_GERMAN_MAC
|
||||||
//#define LAYOUT_GERMAN_SWISS
|
//#define LAYOUT_GERMAN_SWISS
|
||||||
//#define LAYOUT_ICELANDIC
|
//#define LAYOUT_ICELANDIC
|
||||||
|
|
@ -102,13 +102,13 @@ THE SOFTWARE.
|
||||||
#define HID_REPORTID_TEENSY_KEYBOARD 9
|
#define HID_REPORTID_TEENSY_KEYBOARD 9
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "HID.h"
|
||||||
|
|
||||||
extern HID_ HID;
|
extern HID_ HID;
|
||||||
|
|
||||||
#include "HID-Tables.h"
|
#include "HID-Tables.h"
|
||||||
|
|
||||||
// Include all HID libraries (.a linkage required to work) properly
|
// Include all HID libraries (.a linkage required to work) properly
|
||||||
#include "ImprovedKeylayouts.h"
|
|
||||||
#include "ImprovedKeyboard.h"
|
|
||||||
#include "AbsoluteMouse.h"
|
#include "AbsoluteMouse.h"
|
||||||
#include "Consumer.h"
|
#include "Consumer.h"
|
||||||
#include "Gamepad.h"
|
#include "Gamepad.h"
|
||||||
|
|
@ -117,4 +117,7 @@ extern HID_ HID;
|
||||||
// Include Teensy HID afterwards to overwrite key definitions if used
|
// Include Teensy HID afterwards to overwrite key definitions if used
|
||||||
#ifdef USE_TEENSY_KEYBOARD
|
#ifdef USE_TEENSY_KEYBOARD
|
||||||
#include "TeensyKeyboard.h"
|
#include "TeensyKeyboard.h"
|
||||||
|
#else
|
||||||
|
#include "ImprovedKeylayouts.h"
|
||||||
|
#include "ImprovedKeyboard.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
THE SOFTWARE.
|
THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Include guard
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
|
@ -87,8 +88,6 @@ THE SOFTWARE.
|
||||||
// LAYOUT_US_ENGLISH
|
// LAYOUT_US_ENGLISH
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
|
||||||
#ifdef LAYOUT_US_ENGLISH
|
|
||||||
|
|
||||||
#define RAW_KEYBOARD_LEFT_CTRL (1 << 0)
|
#define RAW_KEYBOARD_LEFT_CTRL (1 << 0)
|
||||||
#define RAW_KEYBOARD_LEFT_SHIFT (1 << 1)
|
#define RAW_KEYBOARD_LEFT_SHIFT (1 << 1)
|
||||||
#define RAW_KEYBOARD_LEFT_ALT (1 << 2)
|
#define RAW_KEYBOARD_LEFT_ALT (1 << 2)
|
||||||
|
|
@ -323,9 +322,3 @@ static const uint8_t _asciimap[128] PROGMEM =
|
||||||
0x35|SHIFT, // ~
|
0x35|SHIFT, // ~
|
||||||
0 // DEL
|
0 // DEL
|
||||||
};
|
};
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
//TODO other layouts
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue