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.

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

Add the RMI-KB TKL-F13HS #19959

Closed
wants to merge 12 commits into from
Closed

Conversation

ramonimbao
Copy link
Contributor

Description

Adds the TKL-F13HS PCB. Leverages VIA custom UI code for RGB indicator control.

Types of Changes

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

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).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 28, 2023
keyboards/rmi_kb/tkl_f13hs/config.h Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/config.h Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/info.json Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/readme.md Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/keymaps/via/keymap.c Outdated Show resolved Hide resolved
ramonimbao and others added 5 commits March 1, 2023 17:31
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
- LED config moved from keymap to info.json
- Default RGB behavior moved from default keymap.c to tkl_f13hs.c
- VIA custom UI things moved from keymap to keyboard
@ramonimbao
Copy link
Contributor Author

I've updated my code!

  • Moved the LED config from the keymap to keyboard
  • Moved the default RGB behavior from the default keymap to keyboard as per lesshonor's review
  • Moved the VIA custom UI handling thing to keyboard as per drashna's review

keyboards/rmi_kb/tkl_f13hs/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/config.h Show resolved Hide resolved
keyboards/rmi_kb/tkl_f13hs/info.json Outdated Show resolved Hide resolved
ramonimbao and others added 3 commits March 8, 2023 14:01
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
@tzarc
Copy link
Member

tzarc commented Apr 3, 2023

Placing this PR on hold for the moment until we can get a bit of discussion going w.r.t. the prevalence of this VIA v3 situation and the relatively unmaintainable code.

@tzarc tzarc added the on hold label Apr 3, 2023
@ramonimbao
Copy link
Contributor Author

Is there anything I need to do?

Copy link
Contributor

Choose a reason for hiding this comment

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

can settings in this file that have data-driven equivalent be moved to info.json?

@@ -0,0 +1,3 @@
WS2812_DRIVER = vendor
Copy link
Contributor

Choose a reason for hiding this comment

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

migrate to info.json

Suggested change
WS2812_DRIVER = vendor

{"flags": 8, "matrix": [0, 0], "x": 0, "y": 0},
{"flags": 8, "matrix": [3, 0], "x": 2, "y": 27}
]
},
Copy link
Contributor

Choose a reason for hiding this comment

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

migrated from rules.mk

Suggested change
},
},
"ws2812": {
"driver": "vendor"
},

Copy link
Contributor

Choose a reason for hiding this comment

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

can method(s) for accessing bootloader be added please?

![TKL-F13HS](https://i.imgur.com/6kBCSh4h.png)

* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
* Hardware Supported: RP2040
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* Hardware Supported: RP2040
* Hardware Supported: TKL-F13HS PCB

Comment on lines +36 to +131
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
{"matrix": [0, 1], "x":1.25, "y":0},
{"matrix": [0, 2], "x":2.25, "y":0},
{"matrix": [0, 3], "x":3.25, "y":0},
{"matrix": [0, 4], "x":4.25, "y":0},
{"matrix": [0, 5], "x":5.5, "y":0},
{"matrix": [0, 6], "x":6.5, "y":0},
{"matrix": [0, 7], "x":7.5, "y":0},
{"matrix": [0, 8], "x":8.5, "y":0},
{"matrix": [0, 9], "x":9.75, "y":0},
{"matrix": [0,10], "x":10.75, "y":0},
{"matrix": [0,11], "x":11.75, "y":0},
{"matrix": [0,12], "x":12.75, "y":0},
{"matrix": [0,13], "x":14, "y":0},
{"matrix": [0,14], "x":15.25, "y":0},
{"matrix": [0,15], "x":16.25, "y":0},
{"matrix": [0,16], "x":17.25, "y":0},

{"matrix": [1, 0], "x":0, "y":1.25},
{"matrix": [1, 1], "x":1, "y":1.25},
{"matrix": [1, 2], "x":2, "y":1.25},
{"matrix": [1, 3], "x":3, "y":1.25},
{"matrix": [1, 4], "x":4, "y":1.25},
{"matrix": [1, 5], "x":5, "y":1.25},
{"matrix": [1, 6], "x":6, "y":1.25},
{"matrix": [1, 7], "x":7, "y":1.25},
{"matrix": [1, 8], "x":8, "y":1.25},
{"matrix": [1, 9], "x":9, "y":1.25},
{"matrix": [1,10], "x":10, "y":1.25},
{"matrix": [1,11], "x":11, "y":1.25},
{"matrix": [1,12], "x":12, "y":1.25},
{"matrix": [1,13], "x":13, "y":1.25, "w":2},
{"matrix": [1,14], "x":15.25, "y":1.25},
{"matrix": [1,15], "x":16.25, "y":1.25},
{"matrix": [1,16], "x":17.25, "y":1.25},

{"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
{"matrix": [2, 1], "x":1.5, "y":2.25},
{"matrix": [2, 2], "x":2.5, "y":2.25},
{"matrix": [2, 3], "x":3.5, "y":2.25},
{"matrix": [2, 4], "x":4.5, "y":2.25},
{"matrix": [2, 5], "x":5.5, "y":2.25},
{"matrix": [2, 6], "x":6.5, "y":2.25},
{"matrix": [2, 7], "x":7.5, "y":2.25},
{"matrix": [2, 8], "x":8.5, "y":2.25},
{"matrix": [2, 9], "x":9.5, "y":2.25},
{"matrix": [2,10], "x":10.5, "y":2.25},
{"matrix": [2,11], "x":11.5, "y":2.25},
{"matrix": [2,12], "x":12.5, "y":2.25},
{"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
{"matrix": [2,14], "x":15.25, "y":2.25},
{"matrix": [2,15], "x":16.25, "y":2.25},
{"matrix": [2,16], "x":17.25, "y":2.25},

{"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
{"matrix": [3, 1], "x":1.75, "y":3.25},
{"matrix": [3, 2], "x":2.75, "y":3.25},
{"matrix": [3, 3], "x":3.75, "y":3.25},
{"matrix": [3, 4], "x":4.75, "y":3.25},
{"matrix": [3, 5], "x":5.75, "y":3.25},
{"matrix": [3, 6], "x":6.75, "y":3.25},
{"matrix": [3, 7], "x":7.75, "y":3.25},
{"matrix": [3, 8], "x":8.75, "y":3.25},
{"matrix": [3, 9], "x":9.75, "y":3.25},
{"matrix": [3,10], "x":10.75, "y":3.25},
{"matrix": [3,11], "x":11.75, "y":3.25},
{"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},

{"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
{"matrix": [4, 2], "x":2.25, "y":4.25},
{"matrix": [4, 3], "x":3.25, "y":4.25},
{"matrix": [4, 4], "x":4.25, "y":4.25},
{"matrix": [4, 5], "x":5.25, "y":4.25},
{"matrix": [4, 6], "x":6.25, "y":4.25},
{"matrix": [4, 7], "x":7.25, "y":4.25},
{"matrix": [4, 8], "x":8.25, "y":4.25},
{"matrix": [4, 9], "x":9.25, "y":4.25},
{"matrix": [4,10], "x":10.25, "y":4.25},
{"matrix": [4,11], "x":11.25, "y":4.25},
{"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
{"matrix": [4,13], "x":14, "y":4.25},
{"matrix": [4,15], "x":16.25, "y":4.25},

{"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
{"matrix": [5, 1], "x":1.5, "y":5.25},
{"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
{"matrix": [5, 7], "x":4, "y":5.25, "w":7},
{"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
{"matrix": [5,12], "x":12.5, "y":5.25},
{"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
{"matrix": [5,14], "x":15.25, "y":5.25},
{"matrix": [5,15], "x":16.25, "y":5.25},
{"matrix": [5,16], "x":17.25, "y":5.25}
Copy link
Contributor

@dunk2k dunk2k Nov 20, 2023

Choose a reason for hiding this comment

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

Suggested change
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
{"matrix": [0, 1], "x":1.25, "y":0},
{"matrix": [0, 2], "x":2.25, "y":0},
{"matrix": [0, 3], "x":3.25, "y":0},
{"matrix": [0, 4], "x":4.25, "y":0},
{"matrix": [0, 5], "x":5.5, "y":0},
{"matrix": [0, 6], "x":6.5, "y":0},
{"matrix": [0, 7], "x":7.5, "y":0},
{"matrix": [0, 8], "x":8.5, "y":0},
{"matrix": [0, 9], "x":9.75, "y":0},
{"matrix": [0,10], "x":10.75, "y":0},
{"matrix": [0,11], "x":11.75, "y":0},
{"matrix": [0,12], "x":12.75, "y":0},
{"matrix": [0,13], "x":14, "y":0},
{"matrix": [0,14], "x":15.25, "y":0},
{"matrix": [0,15], "x":16.25, "y":0},
{"matrix": [0,16], "x":17.25, "y":0},
{"matrix": [1, 0], "x":0, "y":1.25},
{"matrix": [1, 1], "x":1, "y":1.25},
{"matrix": [1, 2], "x":2, "y":1.25},
{"matrix": [1, 3], "x":3, "y":1.25},
{"matrix": [1, 4], "x":4, "y":1.25},
{"matrix": [1, 5], "x":5, "y":1.25},
{"matrix": [1, 6], "x":6, "y":1.25},
{"matrix": [1, 7], "x":7, "y":1.25},
{"matrix": [1, 8], "x":8, "y":1.25},
{"matrix": [1, 9], "x":9, "y":1.25},
{"matrix": [1,10], "x":10, "y":1.25},
{"matrix": [1,11], "x":11, "y":1.25},
{"matrix": [1,12], "x":12, "y":1.25},
{"matrix": [1,13], "x":13, "y":1.25, "w":2},
{"matrix": [1,14], "x":15.25, "y":1.25},
{"matrix": [1,15], "x":16.25, "y":1.25},
{"matrix": [1,16], "x":17.25, "y":1.25},
{"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
{"matrix": [2, 1], "x":1.5, "y":2.25},
{"matrix": [2, 2], "x":2.5, "y":2.25},
{"matrix": [2, 3], "x":3.5, "y":2.25},
{"matrix": [2, 4], "x":4.5, "y":2.25},
{"matrix": [2, 5], "x":5.5, "y":2.25},
{"matrix": [2, 6], "x":6.5, "y":2.25},
{"matrix": [2, 7], "x":7.5, "y":2.25},
{"matrix": [2, 8], "x":8.5, "y":2.25},
{"matrix": [2, 9], "x":9.5, "y":2.25},
{"matrix": [2,10], "x":10.5, "y":2.25},
{"matrix": [2,11], "x":11.5, "y":2.25},
{"matrix": [2,12], "x":12.5, "y":2.25},
{"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
{"matrix": [2,14], "x":15.25, "y":2.25},
{"matrix": [2,15], "x":16.25, "y":2.25},
{"matrix": [2,16], "x":17.25, "y":2.25},
{"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
{"matrix": [3, 1], "x":1.75, "y":3.25},
{"matrix": [3, 2], "x":2.75, "y":3.25},
{"matrix": [3, 3], "x":3.75, "y":3.25},
{"matrix": [3, 4], "x":4.75, "y":3.25},
{"matrix": [3, 5], "x":5.75, "y":3.25},
{"matrix": [3, 6], "x":6.75, "y":3.25},
{"matrix": [3, 7], "x":7.75, "y":3.25},
{"matrix": [3, 8], "x":8.75, "y":3.25},
{"matrix": [3, 9], "x":9.75, "y":3.25},
{"matrix": [3,10], "x":10.75, "y":3.25},
{"matrix": [3,11], "x":11.75, "y":3.25},
{"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
{"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
{"matrix": [4, 2], "x":2.25, "y":4.25},
{"matrix": [4, 3], "x":3.25, "y":4.25},
{"matrix": [4, 4], "x":4.25, "y":4.25},
{"matrix": [4, 5], "x":5.25, "y":4.25},
{"matrix": [4, 6], "x":6.25, "y":4.25},
{"matrix": [4, 7], "x":7.25, "y":4.25},
{"matrix": [4, 8], "x":8.25, "y":4.25},
{"matrix": [4, 9], "x":9.25, "y":4.25},
{"matrix": [4,10], "x":10.25, "y":4.25},
{"matrix": [4,11], "x":11.25, "y":4.25},
{"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
{"matrix": [4,13], "x":14, "y":4.25},
{"matrix": [4,15], "x":16.25, "y":4.25},
{"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
{"matrix": [5, 1], "x":1.5, "y":5.25},
{"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
{"matrix": [5, 7], "x":4, "y":5.25, "w":7},
{"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
{"matrix": [5,12], "x":12.5, "y":5.25},
{"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
{"matrix": [5,14], "x":15.25, "y":5.25},
{"matrix": [5,15], "x":16.25, "y":5.25},
{"matrix": [5,16], "x":17.25, "y":5.25}
"community_layouts": ["tkl_f13_ansi_tsangan"],
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
{"matrix": [0, 1], "x":1.25, "y":0},
{"matrix": [0, 2], "x":2.25, "y":0},
{"matrix": [0, 3], "x":3.25, "y":0},
{"matrix": [0, 4], "x":4.25, "y":0},
{"matrix": [0, 5], "x":5.5, "y":0},
{"matrix": [0, 6], "x":6.5, "y":0},
{"matrix": [0, 7], "x":7.5, "y":0},
{"matrix": [0, 8], "x":8.5, "y":0},
{"matrix": [0, 9], "x":9.75, "y":0},
{"matrix": [0,10], "x":10.75, "y":0},
{"matrix": [0,11], "x":11.75, "y":0},
{"matrix": [0,12], "x":12.75, "y":0},
{"matrix": [0,13], "x":14, "y":0},
{"matrix": [0,14], "x":15.25, "y":0},
{"matrix": [0,15], "x":16.25, "y":0},
{"matrix": [0,16], "x":17.25, "y":0},
{"matrix": [1, 0], "x":0, "y":1.25},
{"matrix": [1, 1], "x":1, "y":1.25},
{"matrix": [1, 2], "x":2, "y":1.25},
{"matrix": [1, 3], "x":3, "y":1.25},
{"matrix": [1, 4], "x":4, "y":1.25},
{"matrix": [1, 5], "x":5, "y":1.25},
{"matrix": [1, 6], "x":6, "y":1.25},
{"matrix": [1, 7], "x":7, "y":1.25},
{"matrix": [1, 8], "x":8, "y":1.25},
{"matrix": [1, 9], "x":9, "y":1.25},
{"matrix": [1,10], "x":10, "y":1.25},
{"matrix": [1,11], "x":11, "y":1.25},
{"matrix": [1,12], "x":12, "y":1.25},
{"matrix": [1,13], "x":13, "y":1.25, "w":2},
{"matrix": [1,14], "x":15.25, "y":1.25},
{"matrix": [1,15], "x":16.25, "y":1.25},
{"matrix": [1,16], "x":17.25, "y":1.25},
{"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
{"matrix": [2, 1], "x":1.5, "y":2.25},
{"matrix": [2, 2], "x":2.5, "y":2.25},
{"matrix": [2, 3], "x":3.5, "y":2.25},
{"matrix": [2, 4], "x":4.5, "y":2.25},
{"matrix": [2, 5], "x":5.5, "y":2.25},
{"matrix": [2, 6], "x":6.5, "y":2.25},
{"matrix": [2, 7], "x":7.5, "y":2.25},
{"matrix": [2, 8], "x":8.5, "y":2.25},
{"matrix": [2, 9], "x":9.5, "y":2.25},
{"matrix": [2,10], "x":10.5, "y":2.25},
{"matrix": [2,11], "x":11.5, "y":2.25},
{"matrix": [2,12], "x":12.5, "y":2.25},
{"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
{"matrix": [2,14], "x":15.25, "y":2.25},
{"matrix": [2,15], "x":16.25, "y":2.25},
{"matrix": [2,16], "x":17.25, "y":2.25},
{"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
{"matrix": [3, 1], "x":1.75, "y":3.25},
{"matrix": [3, 2], "x":2.75, "y":3.25},
{"matrix": [3, 3], "x":3.75, "y":3.25},
{"matrix": [3, 4], "x":4.75, "y":3.25},
{"matrix": [3, 5], "x":5.75, "y":3.25},
{"matrix": [3, 6], "x":6.75, "y":3.25},
{"matrix": [3, 7], "x":7.75, "y":3.25},
{"matrix": [3, 8], "x":8.75, "y":3.25},
{"matrix": [3, 9], "x":9.75, "y":3.25},
{"matrix": [3,10], "x":10.75, "y":3.25},
{"matrix": [3,11], "x":11.75, "y":3.25},
{"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
{"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
{"matrix": [4, 2], "x":2.25, "y":4.25},
{"matrix": [4, 3], "x":3.25, "y":4.25},
{"matrix": [4, 4], "x":4.25, "y":4.25},
{"matrix": [4, 5], "x":5.25, "y":4.25},
{"matrix": [4, 6], "x":6.25, "y":4.25},
{"matrix": [4, 7], "x":7.25, "y":4.25},
{"matrix": [4, 8], "x":8.25, "y":4.25},
{"matrix": [4, 9], "x":9.25, "y":4.25},
{"matrix": [4,10], "x":10.25, "y":4.25},
{"matrix": [4,11], "x":11.25, "y":4.25},
{"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
{"matrix": [4,13], "x":14, "y":4.25},
{"matrix": [4,15], "x":16.25, "y":4.25},
{"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
{"matrix": [5, 1], "x":1.5, "y":5.25},
{"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
{"matrix": [5, 7], "x":4, "y":5.25, "w":7},
{"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
{"matrix": [5,12], "x":12.5, "y":5.25},
{"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
{"matrix": [5,14], "x":15.25, "y":5.25},
{"matrix": [5,15], "x":16.25, "y":5.25},
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
"LAYOUT_tkl_f13_ansi_tsangan": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
{"matrix": [0, 1], "x":1.25, "y":0},
{"matrix": [0, 2], "x":2.25, "y":0},
{"matrix": [0, 3], "x":3.25, "y":0},
{"matrix": [0, 4], "x":4.25, "y":0},
{"matrix": [0, 5], "x":5.5, "y":0},
{"matrix": [0, 6], "x":6.5, "y":0},
{"matrix": [0, 7], "x":7.5, "y":0},
{"matrix": [0, 8], "x":8.5, "y":0},
{"matrix": [0, 9], "x":9.75, "y":0},
{"matrix": [0,10], "x":10.75, "y":0},
{"matrix": [0,11], "x":11.75, "y":0},
{"matrix": [0,12], "x":12.75, "y":0},
{"matrix": [0,13], "x":14, "y":0},
{"matrix": [0,14], "x":15.25, "y":0},
{"matrix": [0,15], "x":16.25, "y":0},
{"matrix": [0,16], "x":17.25, "y":0},
{"matrix": [1, 0], "x":0, "y":1.25},
{"matrix": [1, 1], "x":1, "y":1.25},
{"matrix": [1, 2], "x":2, "y":1.25},
{"matrix": [1, 3], "x":3, "y":1.25},
{"matrix": [1, 4], "x":4, "y":1.25},
{"matrix": [1, 5], "x":5, "y":1.25},
{"matrix": [1, 6], "x":6, "y":1.25},
{"matrix": [1, 7], "x":7, "y":1.25},
{"matrix": [1, 8], "x":8, "y":1.25},
{"matrix": [1, 9], "x":9, "y":1.25},
{"matrix": [1,10], "x":10, "y":1.25},
{"matrix": [1,11], "x":11, "y":1.25},
{"matrix": [1,12], "x":12, "y":1.25},
{"matrix": [1,13], "x":13, "y":1.25, "w":2},
{"matrix": [1,14], "x":15.25, "y":1.25},
{"matrix": [1,15], "x":16.25, "y":1.25},
{"matrix": [1,16], "x":17.25, "y":1.25},
{"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
{"matrix": [2, 1], "x":1.5, "y":2.25},
{"matrix": [2, 2], "x":2.5, "y":2.25},
{"matrix": [2, 3], "x":3.5, "y":2.25},
{"matrix": [2, 4], "x":4.5, "y":2.25},
{"matrix": [2, 5], "x":5.5, "y":2.25},
{"matrix": [2, 6], "x":6.5, "y":2.25},
{"matrix": [2, 7], "x":7.5, "y":2.25},
{"matrix": [2, 8], "x":8.5, "y":2.25},
{"matrix": [2, 9], "x":9.5, "y":2.25},
{"matrix": [2,10], "x":10.5, "y":2.25},
{"matrix": [2,11], "x":11.5, "y":2.25},
{"matrix": [2,12], "x":12.5, "y":2.25},
{"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
{"matrix": [2,14], "x":15.25, "y":2.25},
{"matrix": [2,15], "x":16.25, "y":2.25},
{"matrix": [2,16], "x":17.25, "y":2.25},
{"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
{"matrix": [3, 1], "x":1.75, "y":3.25},
{"matrix": [3, 2], "x":2.75, "y":3.25},
{"matrix": [3, 3], "x":3.75, "y":3.25},
{"matrix": [3, 4], "x":4.75, "y":3.25},
{"matrix": [3, 5], "x":5.75, "y":3.25},
{"matrix": [3, 6], "x":6.75, "y":3.25},
{"matrix": [3, 7], "x":7.75, "y":3.25},
{"matrix": [3, 8], "x":8.75, "y":3.25},
{"matrix": [3, 9], "x":9.75, "y":3.25},
{"matrix": [3,10], "x":10.75, "y":3.25},
{"matrix": [3,11], "x":11.75, "y":3.25},
{"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
{"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
{"matrix": [4, 2], "x":2.25, "y":4.25},
{"matrix": [4, 3], "x":3.25, "y":4.25},
{"matrix": [4, 4], "x":4.25, "y":4.25},
{"matrix": [4, 5], "x":5.25, "y":4.25},
{"matrix": [4, 6], "x":6.25, "y":4.25},
{"matrix": [4, 7], "x":7.25, "y":4.25},
{"matrix": [4, 8], "x":8.25, "y":4.25},
{"matrix": [4, 9], "x":9.25, "y":4.25},
{"matrix": [4,10], "x":10.25, "y":4.25},
{"matrix": [4,11], "x":11.25, "y":4.25},
{"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
{"matrix": [4,15], "x":16.25, "y":4.25},
{"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
{"matrix": [5, 1], "x":1.5, "y":5.25},
{"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
{"matrix": [5, 7], "x":4, "y":5.25, "w":7},
{"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
{"matrix": [5,12], "x":12.5, "y":5.25},
{"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
{"matrix": [5,14], "x":15.25, "y":5.25},
{"matrix": [5,15], "x":16.25, "y":5.25},
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
"LAYOUT_tkl_f13_ansi_wkl": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
{"matrix": [0, 1], "x":1.25, "y":0},
{"matrix": [0, 2], "x":2.25, "y":0},
{"matrix": [0, 3], "x":3.25, "y":0},
{"matrix": [0, 4], "x":4.25, "y":0},
{"matrix": [0, 5], "x":5.5, "y":0},
{"matrix": [0, 6], "x":6.5, "y":0},
{"matrix": [0, 7], "x":7.5, "y":0},
{"matrix": [0, 8], "x":8.5, "y":0},
{"matrix": [0, 9], "x":9.75, "y":0},
{"matrix": [0,10], "x":10.75, "y":0},
{"matrix": [0,11], "x":11.75, "y":0},
{"matrix": [0,12], "x":12.75, "y":0},
{"matrix": [0,13], "x":14, "y":0},
{"matrix": [0,14], "x":15.25, "y":0},
{"matrix": [0,15], "x":16.25, "y":0},
{"matrix": [0,16], "x":17.25, "y":0},
{"matrix": [1, 0], "x":0, "y":1.25},
{"matrix": [1, 1], "x":1, "y":1.25},
{"matrix": [1, 2], "x":2, "y":1.25},
{"matrix": [1, 3], "x":3, "y":1.25},
{"matrix": [1, 4], "x":4, "y":1.25},
{"matrix": [1, 5], "x":5, "y":1.25},
{"matrix": [1, 6], "x":6, "y":1.25},
{"matrix": [1, 7], "x":7, "y":1.25},
{"matrix": [1, 8], "x":8, "y":1.25},
{"matrix": [1, 9], "x":9, "y":1.25},
{"matrix": [1,10], "x":10, "y":1.25},
{"matrix": [1,11], "x":11, "y":1.25},
{"matrix": [1,12], "x":12, "y":1.25},
{"matrix": [1,13], "x":13, "y":1.25, "w":2},
{"matrix": [1,14], "x":15.25, "y":1.25},
{"matrix": [1,15], "x":16.25, "y":1.25},
{"matrix": [1,16], "x":17.25, "y":1.25},
{"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
{"matrix": [2, 1], "x":1.5, "y":2.25},
{"matrix": [2, 2], "x":2.5, "y":2.25},
{"matrix": [2, 3], "x":3.5, "y":2.25},
{"matrix": [2, 4], "x":4.5, "y":2.25},
{"matrix": [2, 5], "x":5.5, "y":2.25},
{"matrix": [2, 6], "x":6.5, "y":2.25},
{"matrix": [2, 7], "x":7.5, "y":2.25},
{"matrix": [2, 8], "x":8.5, "y":2.25},
{"matrix": [2, 9], "x":9.5, "y":2.25},
{"matrix": [2,10], "x":10.5, "y":2.25},
{"matrix": [2,11], "x":11.5, "y":2.25},
{"matrix": [2,12], "x":12.5, "y":2.25},
{"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
{"matrix": [2,14], "x":15.25, "y":2.25},
{"matrix": [2,15], "x":16.25, "y":2.25},
{"matrix": [2,16], "x":17.25, "y":2.25},
{"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
{"matrix": [3, 1], "x":1.75, "y":3.25},
{"matrix": [3, 2], "x":2.75, "y":3.25},
{"matrix": [3, 3], "x":3.75, "y":3.25},
{"matrix": [3, 4], "x":4.75, "y":3.25},
{"matrix": [3, 5], "x":5.75, "y":3.25},
{"matrix": [3, 6], "x":6.75, "y":3.25},
{"matrix": [3, 7], "x":7.75, "y":3.25},
{"matrix": [3, 8], "x":8.75, "y":3.25},
{"matrix": [3, 9], "x":9.75, "y":3.25},
{"matrix": [3,10], "x":10.75, "y":3.25},
{"matrix": [3,11], "x":11.75, "y":3.25},
{"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
{"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
{"matrix": [4, 2], "x":2.25, "y":4.25},
{"matrix": [4, 3], "x":3.25, "y":4.25},
{"matrix": [4, 4], "x":4.25, "y":4.25},
{"matrix": [4, 5], "x":5.25, "y":4.25},
{"matrix": [4, 6], "x":6.25, "y":4.25},
{"matrix": [4, 7], "x":7.25, "y":4.25},
{"matrix": [4, 8], "x":8.25, "y":4.25},
{"matrix": [4, 9], "x":9.25, "y":4.25},
{"matrix": [4,10], "x":10.25, "y":4.25},
{"matrix": [4,11], "x":11.25, "y":4.25},
{"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
{"matrix": [4,15], "x":16.25, "y":4.25},
{"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
{"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
{"matrix": [5, 7], "x":4, "y":5.25, "w":7},
{"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
{"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
{"matrix": [5,14], "x":15.25, "y":5.25},
{"matrix": [5,15], "x":16.25, "y":5.25},
{"matrix": [5,16], "x":17.25, "y":5.25}

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
[0] = LAYOUT(
[0] = LAYOUT_all(

Comment on lines +19 to +50
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
[0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

@ramonimbao ramonimbao closed this Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap on hold via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants