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

Adding TGR Tris/Tris CE Numpad #9139

Merged
merged 11 commits into from
May 27, 2020
Merged

Adding TGR Tris/Tris CE Numpad #9139

merged 11 commits into from
May 27, 2020

Conversation

halfenergized
Copy link
Contributor

@halfenergized halfenergized commented May 19, 2020 •
edited
Loading

Description

Adding TGR Tris/Tris CE Numpad (including VIA support)

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

@halfenergized halfenergized mentioned this pull request May 19, 2020
Merged
6 tasks
@halfenergized halfenergized changed the title Adding TGR Tris Numpad Adding TGR Tris/Tris CE Numpad May 19, 2020
zvecr
zvecr requested changes May 19, 2020
View reviewed changes
keyboards/tgr/tris/rules.mk Outdated Show resolved Hide resolved
keyboards/tgr/tris/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/tgr/tris/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@zvecr zvecr added keyboard via Adds via keymap and/or updates keyboard for via support labels May 19, 2020
drashna
drashna requested changes May 20, 2020
View reviewed changes
keyboards/tgr/tris/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/tgr/tris/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/tgr/tris/tris.h Outdated Show resolved Hide resolved
zvecr
zvecr requested changes May 21, 2020
View reviewed changes
keyboards/tgr/tris/info.json Outdated Show resolved Hide resolved
zvecr
zvecr reviewed May 21, 2020
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

have you tested ae2d683 against hardware? moving k43 in the bottom part of the layout macro is only required if that is its row and col, to which it previously was not. If so, it should be renamed to k53.

@halfenergized
Copy link
Contributor Author

have you tested ae2d683 against hardware? moving k43 in the bottom part of the layout macro is only required if that is its row and col, to which it previously was not. If so, it should be renamed to k53.

Yes, I have tested before the commit and it works properly. It is correctly named as k43 (not k53), as a follow up to this changes #9139 (comment)

@zvecr
Copy link
Member

zvecr commented May 23, 2020 •
edited
Loading

If it works as it is in the repo right now, then the naming is wrong. k43 but in location 5,3. Also your via config still has 4,3 which is why i question it being wrong. You can have different physical and electrical layouts and the comment by drashna was about aligning physical, to which in a later commit you then changed electrical.

You either need to:

  1. revert ae2d683
  2. rename k43 to k53 within both parts of the LAYOUT_numpad_6x4 macro (and update your via definition)

1 or 2, not what is in this PR right now

@halfenergized
Revert "update formatting"
d9cbdf9 
This reverts commit ae2d683.
@halfenergized
Copy link
Contributor Author

If it works as it is in the repo right now, then the naming is wrong. k43 but in location 5,3. Also your via config still has 4,3 which is why i question it being wrong. You can have different physical and electrical layouts and the comment by drashna was about aligning physical, to which in a later commit you then changed electrical.

You either need to:

  1. revert ae2d683
  2. rename k43 to k53 within both parts of the LAYOUT_numpad_6x4 macro (and update your via definition)

1 or 2, not what is in this PR right now

Ah, I see. Sorry for the confusion. I have reverted ae2d683 and tested the firmware, all normal.

@drashna drashna requested a review from a team May 25, 2020 03:51
@zvecr zvecr merged commit a9b3c0a into qmk:master May 27, 2020
@zvecr
Copy link
Member

zvecr commented May 27, 2020

Thanks!

nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Jun 11, 2020
Merge remote-tracking branch 'upstream/master'
f4d346a 
* upstream/master: (800 commits)
  Fix crkbd slave matrix print to require debug_matrix (qmk#9217)
  Keyboards/zsa updates (qmk#9214)
  Community layout support for KBDpad Mk.I (qmk#9220)
  Fix projectkb/alice LED indicator (qmk#9226)
  RSTHD keymap for Minidox (qmk#9178)
  Fix running qmk info without any arguments (qmk#9218)
  [Keymap] Update yttyx Planck keymap (qmk#9191)
  Documentation for keymap_extras (qmk#9194)
  Adding TGR Tris/Tris CE Numpad (qmk#9139)
  ISSI driver compile error fix (qmk#9169)
  Fix the path for generated keymaps (qmk#9213)
  Fix compiling json files (qmk#9210)
  [CLI] Add a subcommand for getting information about a keyboard (qmk#8666)
  [Keymap] Contributing Home-Row-Centric-Mousekey  Layout (qmk#9195)
  CLI: fix `json2c` subcommand and add/fix tests (qmk#9206)
  [Keymap] Ported ok60 to via (qmk#9179)
  [Docs] Japanese translation of docs/feature_pointing_device.md (qmk#8993)
  [Keymap] Niu keymap and README update (qmk#9190)
  [Keyboard] Add Key 65 by Fox Lab (qmk#9116)
  [Keymap] update helix/rev2:yshrsmz keymap (qmk#9047)
  ...
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@halfenergized @zvecr
@drashna @turky
Adding TGR Tris/Tris CE Numpad (qmk#9139)
ce81656 
* Add TGR Tris

* Update readme.md

* Update rules.mk

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/tris.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/info.json

Co-authored-by: Joel Challis <[email protected]>

* update formatting

* Revert "update formatting"

This reverts commit ae2d683.

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@halfenergized @zvecr
@drashna @jakobaa
Adding TGR Tris/Tris CE Numpad (qmk#9139)
ed53070 
* Add TGR Tris

* Update readme.md

* Update rules.mk

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/tris.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/info.json

Co-authored-by: Joel Challis <[email protected]>

* update formatting

* Revert "update formatting"

This reverts commit ae2d683.

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
@halfenergized @zvecr
@drashna @sjmacneil
Adding TGR Tris/Tris CE Numpad (qmk#9139)
4c0e588 
* Add TGR Tris

* Update readme.md

* Update rules.mk

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/tgr/tris/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/tris.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/tgr/tris/info.json

Co-authored-by: Joel Challis <[email protected]>

* update formatting

* Revert "update formatting"

This reverts commit ae2d683.

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@fauxpark fauxpark fauxpark approved these changes

@zvecr zvecr zvecr approved these changes

Assignees
No one assigned
Labels
keyboard via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@halfenergized @zvecr @drashna @fauxpark