Add support for Model M USB C Controller #7393

ashpil · 2019-11-17T19:49:01Z

Description

Types of Changes

Issues Fixed or Closed by This PR

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

keyboards/ashpil/modelm_usbc/rules.mk

keyboards/ashpil/modelm_usbc/modelm_usbc.c

keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c

keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c

keyboards/ashpil/modelm_usbc/keymaps/default/config.h

keyboards/ashpil/modelm_usbc/config.h

Co-Authored-By: fauxpark <[email protected]>

ashpil · 2019-11-18T01:35:07Z

That should be it! Fixed all the stuff. Thanks for the review you guys, I'm really inexperienced with C and basically was following templates, so the code looks so much better now.

noroadsleft

Default keymap needs COMBO_COUNT and COMBO_TERM defined in keyboards/ashpil/modelm_usbc/keymaps/default/config.h. Without those defines the keymap doesn't compile.

(Aside: We should maybe do something about this in core.)

ashpil · 2019-11-18T02:33:04Z

Default keymap needs COMBO_COUNT and COMBO_TERM defined in keyboards/ashpil/modelm_usbc/keymaps/default/config.h. Without those defines the keymap doesn't compile.

(Aside: We should maybe do something about this in core.)

Just got rid of the combo in the default keymap to fix that. I think it's better to keep default simple.

keyboards/ashpil/modelm_usbc/rules.mk

fauxpark · 2019-11-18T02:45:05Z

It may be a good idea to turn on Bootmagic Lite in the rules.mk, as now the default keymap has no easily accessible way to reset the board.

Also, this might be better placed in converter/ like the original.

ashpil · 2019-11-18T03:35:51Z

Also, this might be better placed in converter/ like the original.

Is there a set definition anywhere on what exactly belongs in converter/ ? Because I was surprised the original went there in the first place- as it's not a converter, it's a replacement. Rather than converting from PS/2 to USB, it's directly starting in USB. Converter would be a misnomer.

ashpil · 2019-11-18T03:42:00Z

It may be a good idea to turn on Bootmagic Lite in the rules.mk, as now the default keymap has no easily accessible way to reset the board.

Decided to just add the reset combo back to the default keymap. Seems simpler than doing bootmagic.

Co-Authored-By: James Young <[email protected]>

keyboards/ashpil/modelm_usbc/config.h

keyboards/ashpil/modelm_usbc/rules.mk

keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk

keyboards/ashpil/modelm_usbc/README.md

keyboards/ashpil/modelm_usbc/modelm_usbc.h

Co-Authored-By: fauxpark <[email protected]>

keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c

keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c

keyboards/ashpil/modelm_usbc/info.json

Co-Authored-By: fauxpark <[email protected]>

ashpil · 2019-11-20T02:21:37Z

Sweet, done! Thanks for helping make this so much better.

keyboards/ashpil/modelm_usbc/info.json

Co-Authored-By: James Young <[email protected]>

noroadsleft

Okay this should be the very last things. If I find anything else wrong after this I'll fix it in another PR.

keyboards/ashpil/modelm_usbc/info.json

Co-Authored-By: James Young <[email protected]>

noroadsleft

🎉

noroadsleft · 2019-11-20T06:05:49Z

Thanks!

* added usb c model m * added readme * Update keyboards/ashpil/modelm_usbc/rules.mk * Update keyboards/ashpil/modelm_usbc/rules.mk * Update keyboards/ashpil/modelm_usbc/rules.mk * Update keyboards/ashpil/modelm_usbc/rules.mk * Update keyboards/ashpil/modelm_usbc/rules.mk * Update keyboards/ashpil/modelm_usbc/rules.mk * cleaned up code * removed combo from keymap * added reset to default * Update keyboards/ashpil/modelm_usbc/rules.mk * bootmagic and simplifying default * Update rules.mk * removed duplicates * updated readme * Update keyboards/ashpil/modelm_usbc/README.md * Update modelm_usbc.h * Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c * Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c * Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c * full support for either ANSI or ISO * Update keyboards/ashpil/modelm_usbc/info.json * Update keyboards/ashpil/modelm_usbc/info.json * Update keyboards/ashpil/modelm_usbc/info.json * Resize the ISO Enter key * ANSI Enter and Left Shift keys resize

ashpil added 2 commits November 16, 2019 16:18

added usb c model m

25f3878

added readme

7eff6a7

fauxpark requested changes Nov 17, 2019

View reviewed changes

fauxpark added the keyboard label Nov 17, 2019

fauxpark requested a review from a team November 17, 2019 23:32

zvecr requested changes Nov 17, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/config.h Outdated Show resolved Hide resolved

ashpil and others added 7 commits November 17, 2019 17:09

Update keyboards/ashpil/modelm_usbc/rules.mk

9cced33

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/rules.mk

b281fe1

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/rules.mk

2227b16

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/rules.mk

90b03c2

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/rules.mk

5102632

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/rules.mk

3da5131

Co-Authored-By: fauxpark <[email protected]>

cleaned up code

1219225

drashna approved these changes Nov 18, 2019

View reviewed changes

noroadsleft requested changes Nov 18, 2019

View reviewed changes

removed combo from keymap

7b3b5b0

noroadsleft requested changes Nov 18, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/rules.mk Outdated Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/rules.mk Outdated Show resolved Hide resolved

added reset to default

dda3588

Update keyboards/ashpil/modelm_usbc/rules.mk

22851f7

Co-Authored-By: James Young <[email protected]>

fauxpark requested changes Nov 18, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/config.h Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/rules.mk Outdated Show resolved Hide resolved

ashpil added 3 commits November 17, 2019 20:00

bootmagic and simplifying default

bfae471

Update rules.mk

81db2da

Update rules.mk

0c15e27

noroadsleft reviewed Nov 18, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk Outdated Show resolved Hide resolved

noroadsleft reviewed Nov 18, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk Outdated Show resolved Hide resolved

fauxpark requested changes Nov 18, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/README.md Outdated Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/modelm_usbc.h Outdated Show resolved Hide resolved

Update keyboards/ashpil/modelm_usbc/README.md

1154f94

Co-Authored-By: fauxpark <[email protected]>

drashna approved these changes Nov 19, 2019

View reviewed changes

Update modelm_usbc.h

7dcf67e

ashpil requested a review from zvecr November 19, 2019 05:34

fauxpark requested changes Nov 19, 2019

View reviewed changes

ashpil and others added 4 commits November 19, 2019 17:39

Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c

adf1a66

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c

3161054

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c

9d5ffdd

Co-Authored-By: fauxpark <[email protected]>

full support for either ANSI or ISO

d6bd43b

noroadsleft requested changes Nov 20, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/info.json Outdated Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/info.json Outdated Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/info.json Outdated Show resolved Hide resolved

ashpil and others added 3 commits November 19, 2019 18:32

Update keyboards/ashpil/modelm_usbc/info.json

9c383cd

Co-Authored-By: James Young <[email protected]>

Update keyboards/ashpil/modelm_usbc/info.json

b8a94c9

Co-Authored-By: James Young <[email protected]>

Update keyboards/ashpil/modelm_usbc/info.json

385df31

Co-Authored-By: James Young <[email protected]>

fauxpark approved these changes Nov 20, 2019

View reviewed changes

ashpil requested a review from noroadsleft November 20, 2019 05:05

noroadsleft requested changes Nov 20, 2019

View reviewed changes

keyboards/ashpil/modelm_usbc/info.json Outdated Show resolved Hide resolved

keyboards/ashpil/modelm_usbc/info.json Outdated Show resolved Hide resolved

ashpil and others added 2 commits November 19, 2019 21:26

Resize the ISO Enter key

40378e2

Co-Authored-By: James Young <[email protected]>

ANSI Enter and Left Shift keys resize

84a9490

Co-Authored-By: James Young <[email protected]>

noroadsleft approved these changes Nov 20, 2019

View reviewed changes

noroadsleft merged commit acd02e4 into qmk:master Nov 20, 2019

ashpil mentioned this pull request Mar 25, 2021

[Request for comments] Several build targets for the IBM Model M are cluttered in different folders #12370

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Model M USB C Controller #7393

Add support for Model M USB C Controller #7393

ashpil commented Nov 17, 2019 •

edited

Loading

ashpil commented Nov 18, 2019

noroadsleft left a comment

ashpil commented Nov 18, 2019

fauxpark commented Nov 18, 2019 •

edited

Loading

ashpil commented Nov 18, 2019 •

edited

Loading

ashpil commented Nov 18, 2019

ashpil commented Nov 20, 2019

noroadsleft left a comment

noroadsleft left a comment

noroadsleft commented Nov 20, 2019

Add support for Model M USB C Controller #7393

Add support for Model M USB C Controller #7393

Conversation

ashpil commented Nov 17, 2019 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

ashpil commented Nov 18, 2019

noroadsleft left a comment

Choose a reason for hiding this comment

ashpil commented Nov 18, 2019

fauxpark commented Nov 18, 2019 • edited Loading

ashpil commented Nov 18, 2019 • edited Loading

ashpil commented Nov 18, 2019

ashpil commented Nov 20, 2019

noroadsleft left a comment

Choose a reason for hiding this comment

noroadsleft left a comment

Choose a reason for hiding this comment

noroadsleft commented Nov 20, 2019

ashpil commented Nov 17, 2019 •

edited

Loading

fauxpark commented Nov 18, 2019 •

edited

Loading

ashpil commented Nov 18, 2019 •

edited

Loading