mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-30 06:55:51 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
e3ee87ee31
@ -4,7 +4,7 @@
|
||||
"maintainer": "jn-bernard",
|
||||
"bootloader": "stm32-dfu",
|
||||
"diode_direction": "COL2ROW",
|
||||
"features": {
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
@ -15,18 +15,116 @@
|
||||
"matrix_pins": {
|
||||
"rows": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
|
||||
"cols": ["A2","B8","A0","C15","C14","A14","A13","B7","B6","B5","B4","B3","A15","A10","A8","B15","B14","B12"],
|
||||
"unused": ["B13", "A1", "B9"]
|
||||
"ghost": true,
|
||||
"io_delay": 5
|
||||
"unused": ["B13", "A1", "B9"],
|
||||
"ghost": true,
|
||||
"io_delay": 5
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"url": "",
|
||||
"usb": {
|
||||
"polling_interval": 1,
|
||||
"polling_interval": 1,
|
||||
"device_version": "1.0.0",
|
||||
"pid": "0x0000",
|
||||
"vid": "0xFEED"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_iso": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F1", "x":1, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F2", "x":2, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F3", "x":3, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F4", "x":4, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F5", "x":5, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F6", "x":6, "y":0, "w":1, "h":0.8},
|
||||
{"label":"F7", "x":8, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"F8", "x":8.975, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"F9", "x":9.95, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"F10", "x":10.925, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"F11", "x":11.9, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"F12", "x":12.875, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"Print Screen", "x":13.85, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"Scroll Lock", "x":14.825, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"Pause", "x":15.8, "y":0, "w":0.975, "h":0.8},
|
||||
{"label":"Calculator", "x":16.775, "y":0, "w":0.975, "h":0.8},
|
||||
|
||||
{"label":"`~", "x":0, "y":0.8},
|
||||
{"label":"1!", "x":1, "y":0.8},
|
||||
{"label":"2@", "x":2, "y":0.8},
|
||||
{"label":"3#", "x":3, "y":0.8},
|
||||
{"label":"4$", "x":4, "y":0.8},
|
||||
{"label":"5%", "x":5, "y":0.8},
|
||||
{"label":"6^", "x":6, "y":0.8},
|
||||
{"label":"7&", "x":8, "y":0.8, "w":1.5},
|
||||
{"label":"8*", "x":9.5, "y":0.8},
|
||||
{"label":"9(", "x":10.5, "y":0.8},
|
||||
{"label":"0)", "x":11.5, "y":0.8},
|
||||
{"label":"-_", "x":12.5, "y":0.8},
|
||||
{"label":"=+", "x":13.5, "y":0.8},
|
||||
{"label":"Backspace", "x":14.5, "y":0.8, "w":2.25},
|
||||
{"label":"Delete", "x":16.75, "y":0.8, "h":2},
|
||||
{"label":"Home", "x":17.75, "y":0.8},
|
||||
|
||||
{"label":"Tab", "x":0, "y":1.8, "w":1.25},
|
||||
{"label":"Q", "x":1.25, "y":1.8},
|
||||
{"label":"W", "x":2.25, "y":1.8},
|
||||
{"label":"E", "x":3.25, "y":1.8},
|
||||
{"label":"R", "x":4.25, "y":1.8},
|
||||
{"label":"T", "x":5.25, "y":1.8, "w":1.75},
|
||||
{"label":"Y", "x":8, "y":1.8, "w":1.25},
|
||||
{"label":"U", "x":9.25, "y":1.8},
|
||||
{"label":"I", "x":10.25, "y":1.8},
|
||||
{"label":"O", "x":11.25, "y":1.8},
|
||||
{"label":"P", "x":12.25, "y":1.8},
|
||||
{"label":"[{", "x":13.25, "y":1.8},
|
||||
{"label":"]}", "x":14.25, "y":1.8},
|
||||
{"label":"End", "x":17.75, "y":1.8},
|
||||
|
||||
{"label":"Shift", "x":0, "y":2.8, "w":1.5},
|
||||
{"label":"A", "x":1.5, "y":2.8},
|
||||
{"label":"S", "x":2.5, "y":2.8},
|
||||
{"label":"D", "x":3.5, "y":2.8},
|
||||
{"label":"F", "x":4.5, "y":2.8},
|
||||
{"label":"G", "x":5.5, "y":2.8, "w":1.5},
|
||||
{"label":"H", "x":8, "y":2.8, "w":1.5},
|
||||
{"label":"J", "x":9.5, "y":2.8},
|
||||
{"label":"K", "x":10.5, "y":2.8},
|
||||
{"label":"L", "x":11.5, "y":2.8},
|
||||
{"label":";:", "x":12.5, "y":2.8},
|
||||
{"label":"'@", "x":13.5, "y":2.8},
|
||||
{"label":"#~", "x":14.5, "y":2.8},
|
||||
{"label":"Enter", "x":15.5, "y":1.8, "w":1.25, "h":2},
|
||||
{"label":"Insert", "x":16.75, "y":2.8},
|
||||
{"label":"Page Up", "x":17.75, "y":2.8},
|
||||
|
||||
{"label":"Shift", "x":0, "y":3.8},
|
||||
{"label":"\\|", "x":1, "y":3.8},
|
||||
{"label":"Z", "x":2, "y":3.8},
|
||||
{"label":"X", "x":3, "y":3.8},
|
||||
{"label":"C", "x":4, "y":3.8},
|
||||
{"label":"V", "x":5, "y":3.8},
|
||||
{"label":"B", "x":6, "y":3.8},
|
||||
{"label":"N", "x":8, "y":3.8, "w":2},
|
||||
{"label":"M", "x":10, "y":3.8},
|
||||
{"label":",<", "x":11, "y":3.8},
|
||||
{"label":".>", "x":12, "y":3.8},
|
||||
{"label":"/?", "x":13, "y":3.8},
|
||||
{"label":"Shift", "x":14, "y":3.8, "w":2.75},
|
||||
{"label":"\u2191", "x":16.75, "y":3.8},
|
||||
{"label":"Page Down", "x":17.75, "y":3.8},
|
||||
|
||||
{"label":"Ctrl", "x":0, "y":4.8, "w":1.5},
|
||||
{"label":"GUI", "x":1.5, "y":4.8, "w":1.5},
|
||||
{"label":"Alt", "x":3, "y":4.8, "w":1.5},
|
||||
{"label":"Space", "x":4.5, "y":4.8, "w":3},
|
||||
{"label":"Space", "x":7.5, "y":4.8, "w":3},
|
||||
{"label":"AltGr", "x":10.5, "y":4.8, "w":1.5},
|
||||
{"label":"App", "x":12, "y":4.8, "w":1.5},
|
||||
{"label":"Ctrl", "x":13.5, "y":4.8, "w":2.25},
|
||||
{"label":"\u2190", "x":15.75, "y":4.8},
|
||||
{"label":"\u2192", "x":16.75, "y":4.8},
|
||||
{"label":"\u2193", "x":17.75, "y":4.8}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,8 +16,6 @@ Flashing example for this keyboard:
|
||||
|
||||
make ms_sculpt:default:flash
|
||||
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
|
||||
## Bootloader
|
||||
|
||||
Enter the bootloader in 3 ways:
|
||||
@ -25,3 +23,5 @@ Enter the bootloader in 3 ways:
|
||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
|
||||
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
|
||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
|
||||
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user