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

Jump to bottom

ADB-USB converter M0118 ISO layout #11128

Closed
wants to merge 3 commits into from
Closed

ADB-USB converter M0118 ISO layout #11128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e5892e
Added M0118 ISO layout to ADB-USB converter.
13-bit Dec 4, 2020
d3c4274
Updated changelog in ADB-USB converter readme.
13-bit Dec 5, 2020
83f63ad
Corrected the matrix location of the non-US backslash key on the M011…
13-bit Dec 9, 2020
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
42 changes: 42 additions & 0 deletions keyboards/converter/adb_usb/adb_usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,46 @@ Ported to QMK by Peter Roe <pete@13bit.me>
{ KC_NO, KC_NO, KC_NO, K7B, KC_NO, KC_NO, KC_NO, K7F } \
}

/* M0118 Apple Standard Keyboard ISO
* +-------+
* | power |
* +-------+
* +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+
* |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * |
* +---------------------------------------------------------+ +---+---+---+---+
* | tab | q | w | e | r | t | y | u | i | o | p | [ | ] |Ret| | 7 | 8 | 9 | + |
* +-----------------------------------------------------` | +---+---+---+---+
* | caps | a | s | d | f | g | h | j | k | l | ; | ' | # | | | 4 | 5 | 6 | - |
* +---------------------------------------------------------+ +---+---+---+---+
* |shif| \ | z | x | c | v | b | n | m | , | . | / |Shif| up| | 1 | 2 | 3 | |
* +---------------------------------------------------------+ +-------+---|ent|
* |ctrl|opt |comnd| |comnd |lef|rig|dwn| | 0 | . | |
Copy link

Choose a reason for hiding this comment

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

Right command key is physically the same as the left one. Therefore it should be left empty here.

* +---------------------------------------------------------+ +-------+---+---+
*/
#define LAYOUT_m0118_iso( \
K7F, \
K35,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K51,K4B,K43, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K24, K59,K5B,K5C,K45, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,K2A, K56,K57,K58,K4E, \
K38,K32,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,K7B,K3E, K53,K54,K55, \
Copy link

Choose a reason for hiding this comment

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

The ISO backslash actually is key code K0A. Here we just get the K32 because the swapping key codes function for ISO keyboards are not yet supported by the ADB implementation.
I opened #11168 as a first step towards a solution for this issue. As this is a core change it will not be in master until end of February. Until then having the K32 here does the job.

K36,K3A,K37, K31, K7C,K3B,K3C,K3D, K52, K41,K4C \
Copy link

Choose a reason for hiding this comment

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

Right command key is physically the same as the left one. Key Code K7C would be right alt/opt on an AEK. Hence remove it here.

) { \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
{ K08, K09, KC_NO, K0B, K0C, K0D, K0E, K0F }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
{ K30, K31, K32, K33, KC_NO, K35, K36, K37 }, \
{ K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO }, \
{ KC_NO, K41, KC_NO, K43, KC_NO, K45, KC_NO, K47 }, \
{ KC_NO, KC_NO, KC_NO, K4B, K4C, KC_NO, K4E, KC_NO }, \
{ KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \
{ K58, K59, KC_NO, K5B, K5C, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, K7B, K7C, KC_NO, KC_NO, K7F } \
}

#endif
1 change: 1 addition & 0 deletions keyboards/converter/adb_usb/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ QMK Port Changelog
---------
- 2018/09/16 - Initial release.
- 2018/12/23 - Fixed lock LED support.
- 2020/12/05 - Added M0118 ANSI layout.
Copy link

Choose a reason for hiding this comment

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

shouldn't this be ISO?