Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jun 20, 2023
2 parents 01cfc72 + 85b8044 commit a9f49a0
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
86 changes: 43 additions & 43 deletions keyboards/kj_modify/rs40/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rows": ["B13", "A10", "B1", "B10"]
},
"processor": "STM32F401",
"url": "https://www.aliexpress.com/store/911983021",
"url": "https://www.aliexpress.us/item/3256803963501165.html",
"usb": {
"device_version": "1.0.0",
"pid": "0x5253",
Expand All @@ -26,51 +26,51 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x": 0, "y": 0, "w": 1, "matrix": [0, 0], "label": "ESC"},
{"x": 1, "y": 0, "w": 1, "matrix": [0, 1], "label": "Q"},
{"x": 2, "y": 0, "w": 1, "matrix": [0, 2], "label": "W"},
{"x": 3, "y": 0, "w": 1, "matrix": [0, 3], "label": "E"},
{"x": 4, "y": 0, "w": 1, "matrix": [0, 4], "label": "R"},
{"x": 5, "y": 0, "w": 1, "matrix": [0, 5], "label": "T"},
{"x": 6, "y": 0, "w": 1, "matrix": [0, 6], "label": "Y"},
{"x": 7, "y": 0, "w": 1, "matrix": [0, 7], "label": "U"},
{"x": 8, "y": 0, "w": 1, "matrix": [0, 8], "label": "I"},
{"x": 9, "y": 0, "w": 1, "matrix": [0, 9], "label": "O"},
{"x": 10, "y": 0, "w": 1, "matrix": [0, 10], "label": "P"},
{"x": 11, "y": 0, "w": 1, "matrix": [0, 11], "label": "BACKSPACE"},
{"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
{"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
{"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
{"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
{"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
{"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
{"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
{"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
{"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
{"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
{"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
{"matrix": [0, 11], "label": "BACKSPACE", "x": 11, "y": 0},

{"x": 0, "y": 1, "w": 1.25, "matrix": [1, 0], "label": "CAPSLOCK"},
{"x": 1.25, "y": 1, "w": 1, "matrix": [1, 1], "label": "A"},
{"x": 2.25, "y": 1, "w": 1, "matrix": [1, 2], "label": "S"},
{"x": 3.25, "y": 1, "w": 1, "matrix": [1, 3], "label": "D"},
{"x": 4.25, "y": 1, "w": 1, "matrix": [1, 4], "label": "F"},
{"x": 5.25, "y": 1, "w": 1, "matrix": [1, 5], "label": "G"},
{"x": 6.25, "y": 1, "w": 1, "matrix": [1, 6], "label": "H"},
{"x": 7.25, "y": 1, "w": 1, "matrix": [1, 7], "label": "J"},
{"x": 8.25, "y": 1, "w": 1, "matrix": [1, 8], "label": "K"},
{"x": 9.25, "y": 1, "w": 1, "matrix": [1, 9], "label": "L"},
{"x": 10.25, "y": 1, "w": 1.75, "matrix": [1, 11], "label": "ENTER"},
{"matrix": [1, 0], "label": "CAPSLOCK", "x": 0, "y": 1, "w": 1.25},
{"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
{"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
{"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
{"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
{"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
{"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
{"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
{"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
{"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
{"matrix": [1, 11], "label": "ENTER", "x": 10.25, "y": 1, "w": 1.75},

{"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0], "label": "LSHIFT"},
{"x": 1.75, "y": 2, "w": 1, "matrix": [2, 2], "label": "Z"},
{"x": 2.75, "y": 2, "w": 1, "matrix": [2, 3], "label": "X"},
{"x": 3.75, "y": 2, "w": 1, "matrix": [2, 4], "label": "C"},
{"x": 4.75, "y": 2, "w": 1, "matrix": [2, 5], "label": "V"},
{"x": 5.75, "y": 2, "w": 1, "matrix": [2, 6], "label": "B"},
{"x": 6.75, "y": 2, "w": 1, "matrix": [2, 7], "label": "N"},
{"x": 7.75, "y": 2, "w": 1, "matrix": [2, 8], "label": "M"},
{"x": 8.75, "y": 2, "w": 1, "matrix": [2, 9], "label": "COMMA"},
{"x": 9.75, "y": 2, "w": 1, "matrix": [2, 10], "label": "PERIOD"},
{"x": 10.75, "y": 2, "w": 1.25, "matrix": [2, 11], "label": "RSHIFT"},
{"matrix": [2, 0], "label": "LSHIFT", "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 2], "label": "Z", "x": 1.75, "y": 2},
{"matrix": [2, 3], "label": "X", "x": 2.75, "y": 2},
{"matrix": [2, 4], "label": "C", "x": 3.75, "y": 2},
{"matrix": [2, 5], "label": "V", "x": 4.75, "y": 2},
{"matrix": [2, 6], "label": "B", "x": 5.75, "y": 2},
{"matrix": [2, 7], "label": "N", "x": 6.75, "y": 2},
{"matrix": [2, 8], "label": "M", "x": 7.75, "y": 2},
{"matrix": [2, 9], "label": "COMMA", "x": 8.75, "y": 2},
{"matrix": [2, 10], "label": "PERIOD", "x": 9.75, "y": 2},
{"matrix": [2, 11], "label": "RSHIFT", "x": 10.75, "y": 2, "w": 1.25},

{"x": 1, "y": 3, "w": 1.25, "matrix": [3, 0], "label": "LCTRL"},
{"x": 1.25, "y": 3, "w": 1, "matrix": [3, 1], "label": "FN2"},
{"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2], "label": "WIN"},
{"x": 3.5, "y": 3, "w": 2.25, "matrix": [3, 4], "label": "SPACE"},
{"x": 5.75, "y": 3, "w": 2.75, "matrix": [3, 7], "label": "FN"},
{"x": 8.5, "y": 3, "w": 1.25, "matrix": [3, 9], "label": "SLASH"},
{"x": 9.75, "y": 3, "w": 1, "matrix": [3, 10], "label": "SEMICOLON"},
{"x": 10.75, "y": 3, "w": 1.25, "matrix": [3, 11], "label": "RCTRL"}
{"matrix": [3, 0], "label": "LCTRL", "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "label": "FN2", "x": 1.25, "y": 3},
{"matrix": [3, 2], "label": "WIN", "x": 2.25, "y": 3, "w": 1.25},
{"matrix": [3, 4], "label": "SPACE", "x": 3.5, "y": 3, "w": 2.25},
{"matrix": [3, 7], "label": "FN", "x": 5.75, "y": 3, "w": 2.75},
{"matrix": [3, 9], "label": "SLASH", "x": 8.5, "y": 3, "w": 1.25},
{"matrix": [3, 10], "label": "SEMICOLON", "x": 9.75, "y": 3},
{"matrix": [3, 11], "label": "RCTRL", "x": 10.75, "y": 3, "w": 1.25}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/kj_modify/rs40/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A compact 40% keyboard with 42 keys.

* Keyboard Maintainer: [Audite Marlow](https://github.com/auditemarlow)
* Hardware Supported: RS40 PCB
* Hardware Availability: https://www.aliexpress.com/store/911983021
* Hardware Availability: [KJ-Modify Store on AliExpress](https://www.aliexpress.us/item/3256803963501165.html)

Make example for this keyboard (after setting up your build environment):

Expand Down

0 comments on commit a9f49a0

Please sign in to comment.