Skip to content

Ability to use right alt aka. alt gr to reach all characters on non us/uk layouts #50

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

Closed
wants to merge 2 commits into from
Closed

Ability to use right alt aka. alt gr to reach all characters on non us/uk layouts #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c7a3e
Added possibility to use right alt / alt gr
nuuttihenriksson Sep 13, 2021
7152246
Update Keyboard.cpp
nuuttihenriksson Sep 13, 2021
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
43 changes: 28 additions & 15 deletions src/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
/*
Keyboard.cpp

Copyright (c) 2015, Arduino LLC
Original code (pre-library): Copyright (c) 2011, Peter Barrett

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Expand Down Expand Up @@ -80,10 +76,11 @@ void Keyboard_::sendReport(KeyReport* keys)
}

extern
const uint8_t _asciimap[128] PROGMEM;
const uint16_t _asciimap[128] PROGMEM;

#define SHIFT 0x80
const uint8_t _asciimap[128] =
#define ALTGR 0x100
const uint16_t _asciimap[128] =
{
0x00, // NUL
0x00, // SOH
Expand Down Expand Up @@ -232,14 +229,22 @@ size_t Keyboard_::press(uint8_t k)
_keyReport.modifiers |= (1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
uint16_t x;
memcpy_P(&x,&_asciimap[k],2);
if (!x) {
setWriteError();
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers |= 0x02; // the left shift modifier
k &= 0x7F;
if (x & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers |= 0x02; // the left shift modifier
x &= 0x7F;
k = (uint8_t)x;
} else if(x & 0x100) { // it's a character reached with alt gr aka. right alt
_keyReport.modifiers |= 0x05; // alt gr aka. right alt modifier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean

_keyReport.modifiers |= 0x40;

i.e.

_keyReport.modifiers |= (1<<(KEY_RIGHT_ALT-128));

x &= 0xFF;
k = (uint8_t)x;
} else {
k = (uint8_t)x;
}
}

Expand Down Expand Up @@ -276,13 +281,21 @@ size_t Keyboard_::release(uint8_t k)
_keyReport.modifiers &= ~(1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
uint16_t x;
memcpy_P(&x,&_asciimap[k],2);
if (!x) {
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
if (x & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers &= ~(0x02); // the left shift modifier
k &= 0x7F;
x &= 0x7F;
k = (uint8_t)x;
} else if(x & 0x100){ // it's a character reached with alt gr aka. right alt
_keyReport.modifiers &= ~(0x05); // alt gr aka. right alt modifier
x &= 0xFF;
k = (uint8_t)x;
} else {
k = (uint8_t)x;
}
}

Expand Down