megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-07-05 10:08:07 +00:00
parent da7cba40a3 5d52d01825
commit bcf09d9f68
2 changed files with 122 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

230
keyboards/nopunin10did/jabberwocky/info.json
View file

@ -3,124 +3,124 @@
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/railroad",
"maintainer": "NoPunIn10Did",
"manufacturer": "NoPunIn10Did",
"width": 23.5,
"height": 7.75,
"width": 24.5,
"height": 6.625,
"layouts": {
"LAYOUT_rh_any": {
"layout": [
{"x":0.75, "y":0.25, "label":"Esc"},
{"x":2.25, "y":0.25, "label":"F1"},
{"x":3.25, "y":0.25, "label":"F2"},
{"x":4, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F3"},
{"x":5, "y":0.125, "r":14, "rx":4, "ry":2.5, "label":"F4"},
{"x":6, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F5"},
{"x":7, "y":0.375, "r":14, "rx":4, "ry":2.5, "label":"F6"},
{"x":9.25, "y":0.375, "r":-14, "rx":13.25, "ry":2.5, "label":"F7"},
{"x":10.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F8"},
{"x":11.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5, "label":"F9"},
{"x":12.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F10"},
{"x":13, "y":0.25, "label":"F11"},
{"x":14, "y":0.25, "label":"F12"},
{"x":15.125,"y":0.25, "label":"Print"},
{"x":16.125,"y":0.25, "label":"Scroll"},
{"x":17.25, "y":0.25, "label":"Ins"},
{"x":18.25, "y":0.25, "label":"Del"},
{"x":19.5, "y":0.25, "label":"Home"},
{"x":20.5, "y":0.25, "label":"End"},
{"x":21.5, "y":0.25, "label":"PgUp"},
{"x":22.5, "y":0.25, "label":"PgDn"},
{"x":2, "y":1.5, "label":"Grave"},
{"x":3, "y":1.5, "label":"1"},
{"x":4, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"2"},
{"x":5, "y":1.375, "r":14, "rx":4, "ry":2.5, "label":"3"},
{"x":6, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"4"},
{"x":7, "y":1.625, "r":14, "rx":4, "ry":2.5, "label":"5"},
{"x":9.25, "y":1.625, "r":-14, "rx":13.25, "ry":2.5, "label":"6"},
{"x":10.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"7"},
{"x":11.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5, "label":"8"},
{"x":12.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"9"},
{"x":13.25, "y":1.5, "label":"0"},
{"x":14.25, "y":1.5, "label":"Dash"},
{"x":15.25, "y":1.5, "label":"Equals"},
{"x":16.25, "y":1.5, "label":"Backspace"},
{"x":17.25, "y":1.5, "label":"Split BS"},
{"x":19.5, "y":1.5, "label":"NumLock"},
{"x":20.5, "y":1.5, "label":"P-Div"},
{"x":21.5, "y":1.5, "label":"P-Mult"},
{"x":22.5, "y":1.5, "label":"Pause"},
{"x":1.25, "y":2.5, "w":1.5, "label":"Tab"},
{"x":2.75, "y":2.5, "label":"Q"},
{"x":4, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"W"},
{"x":5, "y":2.375, "r":14, "rx":4, "ry":2.5, "label":"E"},
{"x":6, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"R"},
{"x":7, "y":2.625, "r":14, "rx":4, "ry":2.5, "label":"T"},
{"x":9.25, "y":2.625, "r":-14, "rx":13.25, "ry":2.5, "label":"Y"},
{"x":10.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"U"},
{"x":11.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5, "label":"I"},
{"x":12.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"O"},
{"x":13.5, "y":2.5, "label":"P"},
{"x":14.5, "y":2.5, "label":"L bracket"},
{"x":15.5, "y":2.5, "label":"R bracket"},
{"x":16.5, "y":2.5, "w":1.5, "label":"ANSI Backslash"},
{"x":19.5, "y":2.5, "label":"P-7"},
{"x":20.5, "y":2.5, "label":"P-8"},
{"x":21.5, "y":2.5, "label":"P-9"},
{"x":22.5, "y":2.5, "label":"P-Minus"},
{"x":0.75, "y":3.5, "w":1.75, "label":"Caps Lock"},
{"x":2.5, "y":3.5, "label":"A"},
{"x":4, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"S"},
{"x":5, "y":3.375, "r":14, "rx":4, "ry":2.5, "label":"D"},
{"x":6, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"F"},
{"x":7, "y":3.625, "r":14, "rx":4, "ry":2.5, "label":"G"},
{"x":9.25, "y":3.625, "r":-14, "rx":13.25, "ry":2.5, "label":"H"},
{"x":10.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"J"},
{"x":11.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5, "label":"K"},
{"x":12.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"L"},
{"x":13.75, "y":3.5, "label":"Semicolon"},
{"x":14.75, "y":3.5, "label":"Quote"},
{"x":15.75, "y":3.5, "label":"Non-US Hash"},
{"x":16.75, "y":3.5, "w":1.25, "label":"Enter"},
{"x":19.5, "y":3.5, "label":"P-4"},
{"x":20.5, "y":3.5, "label":"P-5"},
{"x":21.5, "y":3.5, "label":"P-6"},
{"x":22.5, "y":3.5, "label":"P-Plus"},
{"x":0, "y":4.5, "w":1.25, "label":"Left Shift"},
{"x":1.25, "y":4.5, "label":"Non-US Backslash"},
{"x":2.25, "y":4.5, "label":"Z"},
{"x":4, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"X"},
{"x":5, "y":4.375, "r":14, "rx":4, "ry":2.5, "label":"C"},
{"x":6, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"V"},
{"x":7, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"B"},
{"x":8, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"Layer"},
{"x":8.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"Layer"},
{"x":9.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"N"},
{"x":10.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"M"},
{"x":11.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5, "label":"Comma"},
{"x":12.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"Period"},
{"x":14, "y":4.5, "label":"Slash"},
{"x":15, "y":4.5, "label":"JIS Backslash"},
{"x":16, "y":4.5, "w":1.25, "label":"Right Shift"},
{"x":17.25, "y":4.5, "label":"Up"},
{"x":19.5, "y":4.5, "label":"P-1"},
{"x":20.5, "y":4.5, "label":"P-2"},
{"x":21.5, "y":4.5, "label":"P-3"},
{"x":22.5, "y":4.5, "label":"P-Enter"},
{"x":0.5, "y":5.5, "w":1.25, "label":"Left Ctrl"},
{"x":1.75, "y":5.5, "w":1.25, "label":"Left GUI"},
{"x":4.5, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Left Alt"},
{"x":5.75, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Menu"},
{"x":7, "y":5.625, "w":2, "r":14, "rx":4, "ry":2.5, "label":"Space"},
{"x":8.25, "y":5.625, "w":2.75, "r":-14, "rx":13.25, "ry":2.5, "label":"Space"},
{"x":11, "y":5.5, "w":1.25, "r":-14, "rx":13.25, "ry":2.5, "label":"Right Alt"},
{"x":13.75, "y":5.5, "w":1.25, "label":"Right GUI"},
{"x":15, "y":5.5, "w":1.25, "label":"Right Ctrl"},
{"x":16.25, "y":5.5, "label":"Left"},
{"x":17.25, "y":5.5, "label":"Down"},
{"x":18.25, "y":5.5, "label":"Right"},
{"x":19.5, "y":5.5, "label":"P-0"},
{"x":20.5, "y":5.5, "label":"P-00"},
{"x":21.5, "y":5.5, "label":"P-Decimal"},
{"x":22.5, "y":5.5, "label":"P-Enter"}
{"x":0.75, "y":0.25, "label":"Esc"},
{"x":2.25, "y":0.25, "label":"F1"},
{"x":3.25, "y":0.25, "label":"F2"},
{"x":4.25, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F3"},
{"x":5.25, "y":0.125, "r":14, "rx":4, "ry":2.5, "label":"F4"},
{"x":6.25, "y":0.25, "r":14, "rx":4, "ry":2.5, "label":"F5"},
{"x":7.25, "y":0.375, "r":14, "rx":4, "ry":2.5, "label":"F6"},
{"x":10.25, "y":0.375, "r":-14, "rx":13.25, "ry":2.5, "label":"F7"},
{"x":11.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F8"},
{"x":12.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5, "label":"F9"},
{"x":13.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5, "label":"F10"},
{"x":14.25, "y":0.25, "label":"F11"},
{"x":15.25, "y":0.25, "label":"F12"},
{"x":16.375, "y":0.25, "label":"Print"},
{"x":17.375, "y":0.25, "label":"Scroll"},
{"x":18.5, "y":0.25, "label":"Ins"},
{"x":19.5, "y":0.25, "label":"Del"},
{"x":20.75, "y":0.25, "label":"Home"},
{"x":21.75, "y":0.25, "label":"End"},
{"x":22.75, "y":0.25, "label":"PgUp"},
{"x":23.75, "y":0.25, "label":"PgDn"},
{"x":2, "y":1.5, "label":"Grave"},
{"x":3, "y":1.5, "label":"1"},
{"x":4.25, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"2"},
{"x":5.25, "y":1.375, "r":14, "rx":4, "ry":2.5, "label":"3"},
{"x":6.25, "y":1.5, "r":14, "rx":4, "ry":2.5, "label":"4"},
{"x":7.25, "y":1.625, "r":14, "rx":4, "ry":2.5, "label":"5"},
{"x":10.25, "y":1.625, "r":-14, "rx":13.25, "ry":2.5, "label":"6"},
{"x":11.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"7"},
{"x":12.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5, "label":"8"},
{"x":13.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5, "label":"9"},
{"x":14.5, "y":1.5, "label":"0"},
{"x":15.5, "y":1.5, "label":"Dash"},
{"x":16.5, "y":1.5, "label":"Equals"},
{"x":17.5, "y":1.5, "label":"Backspace"},
{"x":18.5, "y":1.5, "label":"Split BS"},
{"x":20.75, "y":1.5, "label":"NumLock"},
{"x":21.75, "y":1.5, "label":"P-Div"},
{"x":22.75, "y":1.5, "label":"P-Mult"},
{"x":23.75, "y":1.5, "label":"Pause"},
{"x":1.25, "y":2.5, "w":1.5, "label":"Tab"},
{"x":2.75, "y":2.5, "label":"Q"},
{"x":4.25, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"W"},
{"x":5.25, "y":2.375, "r":14, "rx":4, "ry":2.5, "label":"E"},
{"x":6.25, "y":2.5, "r":14, "rx":4, "ry":2.5, "label":"R"},
{"x":7.25, "y":2.625, "r":14, "rx":4, "ry":2.5, "label":"T"},
{"x":10.25, "y":2.625, "r":-14, "rx":13.25, "ry":2.5, "label":"y"},
{"x":11.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"U"},
{"x":12.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5, "label":"I"},
{"x":13.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5, "label":"O"},
{"x":14.75, "y":2.5, "label":"P"},
{"x":15.75, "y":2.5, "label":"L bracket"},
{"x":16.75, "y":2.5, "label":"R bracket"},
{"x":17.75, "y":2.5, "w":1.5, "label":"ANSI Backslash"},
{"x":20.75, "y":2.5, "label":"P-7"},
{"x":21.75, "y":2.5, "label":"P-8"},
{"x":22.75, "y":2.5, "label":"P-9"},
{"x":23.75, "y":2.5, "label":"P-Minus"},
{"x":0.75, "y":3.5, "w":1.75, "label":"Caps Lock"},
{"x":2.5, "y":3.5, "label":"A"},
{"x":4.25, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"S"},
{"x":5.25, "y":3.375, "r":14, "rx":4, "ry":2.5, "label":"D"},
{"x":6.25, "y":3.5, "r":14, "rx":4, "ry":2.5, "label":"F"},
{"x":7.25, "y":3.625, "r":14, "rx":4, "ry":2.5, "label":"G"},
{"x":10.25, "y":3.625, "r":-14, "rx":13.25, "ry":2.5, "label":"H"},
{"x":11.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"J"},
{"x":12.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5, "label":"K"},
{"x":13.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5, "label":"L"},
{"x":15, "y":3.5, "label":"Semicolon"},
{"x":16, "y":3.5, "label":"Quote"},
{"x":17, "y":3.5, "label":"Non-US Hash"},
{"x":18, "y":3.5, "w":1.25, "label":"Enter"},
{"x":20.75, "y":3.5, "label":"P-4"},
{"x":21.75, "y":3.5, "label":"P-5"},
{"x":22.75, "y":3.5, "label":"P-6"},
{"x":23.75, "y":3.5, "label":"P-Plus"},
{"x":0, "y":4.5, "w":1.25, "label":"Left Shift"},
{"x":1.25, "y":4.5, "label":"Non-US Backslash"},
{"x":2.25, "y":4.5, "label":"Z"},
{"x":4.25, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"X"},
{"x":5.25, "y":4.375, "r":14, "rx":4, "ry":2.5, "label":"C"},
{"x":6.25, "y":4.5, "r":14, "rx":4, "ry":2.5, "label":"V"},
{"x":7.25, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"B"},
{"x":8.25, "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"Layer"},
{"x":9.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"Layer"},
{"x":10.25, "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"N"},
{"x":11.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"M"},
{"x":12.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5, "label":"Comma"},
{"x":13.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5, "label":"Period"},
{"x":15.25, "y":4.5, "label":"Slash"},
{"x":16.25, "y":4.5, "label":"JIS Backslash"},
{"x":17.25, "y":4.5, "w":1.25, "label":"Right Shift"},
{"x":18.5, "y":4.5, "label":"Up"},
{"x":20.75, "y":4.5, "label":"P-1"},
{"x":21.75, "y":4.5, "label":"P-2"},
{"x":22.75, "y":4.5, "label":"P-3"},
{"x":23.75, "y":4.5, "label":"P-Enter"},
{"x":0.5, "y":5.5, "w":1.25, "label":"Left Ctrl"},
{"x":1.75, "y":5.5, "w":1.25, "label":"Left GUI"},
{"x":4.75, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Left Alt"},
{"x":6, "y":5.5, "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Menu"},
{"x":7.25, "y":5.625, "w":2, "r":14, "rx":4, "ry":2.5, "label":"Space"},
{"x":9.25, "y":5.625, "w":2.75, "r":-14, "rx":13.25, "ry":2.5, "label":"Space"},
{"x":12, "y":5.5, "w":1.25, "r":-14, "rx":13.25, "ry":2.5, "label":"Right Alt"},
{"x":15, "y":5.5, "w":1.25, "label":"Right GUI"},
{"x":16.25, "y":5.5, "w":1.25, "label":"Right Ctrl"},
{"x":17.5, "y":5.5, "label":"Left"},
{"x":18.5, "y":5.5, "label":"Down"},
{"x":19.5, "y":5.5, "label":"Right"},
{"x":20.75, "y":5.5, "label":"P-0"},
{"x":21.75, "y":5.5, "label":"P-00"},
{"x":22.75, "y":5.5, "label":"P-Decimal"},
{"x":23.75, "y":5.5, "label":"P-Enter"}
]
}
}

13
keyboards/nopunin10did/jabberwocky/readme.md
View file

@ -2,7 +2,7 @@
![Jabberwocky](https://diplomacyvariants.files.wordpress.com/2021/03/dexterous_jabberwocky.jpg)
A full-size, columnar-staggered, Alice-style keyboard. The Jabberwocky comes in two varieties currently:
A full-size, columnar-staggered, Alice-style keyboard. The Jabberwocky comes in two varieties currently:
* Dexterous (with numpad on the right side, pictured above)
* Sinister (with numpad on the left side)
@ -10,14 +10,15 @@ Both the Dexterous and Sinister use the same firmware. The numpad and the four
For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did.
* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as NoPunIn10Did.
* Hardware Supported: Dexterous Jabberwocky and Sinister Jabberwocky (2021 March)
* Hardware Availability: Currently by request only
To jump the bootloader, either:
* If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)* **OR**
* Use the physical reset switch near the USB port *(if provided for your version of the board)* **OR**
* Use the physical reset switch on the Elite C **OR**
To reset the board into bootloader mode, do one of the following:
* If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)*
* Use the physical reset switch near the USB port *(if provided for your version of the board)*
* Use the physical reset switch on the Elite C
* Briefly jump the Reset and Ground pins of the Elite C
Make example for this keyboard (after setting up your build environment):