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

wants to merge 3 commits into from

Conversation

13-bit
Copy link
Contributor

@13-bit 13-bit commented Dec 5, 2020

Description

Added a layout for the ISO Apple Standard Keyboard (M0118) to the ADB-USB converter.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna drashna requested a review from a team December 9, 2020 00:02
siggie0815
siggie0815 reviewed Dec 11, 2020
View reviewed changes
keyboards/converter/adb_usb/readme.md
@@ -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?

keyboards/converter/adb_usb/adb_usb.h
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.

siggie0815
siggie0815 reviewed Dec 11, 2020
View reviewed changes
keyboards/converter/adb_usb/adb_usb.h
* +---------------------------------------------------------+ +---+---+---+---+
* |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.

keyboards/converter/adb_usb/adb_usb.h
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, \
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.

@stale
Copy link

stale bot commented Jan 25, 2021

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@stale
Copy link

stale bot commented Mar 5, 2021

Thank you for your contribution!
This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.

@stale stale bot closed this Mar 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@siggie0815 siggie0815 siggie0815 left review comments

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
awaiting changes keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@13-bit @drashna @siggie0815