sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fauxpark
2023-03-29 16:00:41 +11:00
parent 4869b8061c 6bdbf77238
commit 9602938e9e
20 changed files with 690 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

549
keyboards/converter/modelm_ssk/info.json
View File

@@ -20,453 +20,108 @@
},
"processor": "at90usb1286",
"bootloader": "halfkay",
"layouts":
{
"LAYOUT":
{
"layout":
[
{
"label": "Esc",
"x": 0,
"y": 0
},
{
"label": "F1",
"x": 2,
"y": 0
},
{
"label": "F2",
"x": 3,
"y": 0
},
{
"label": "F3",
"x": 4,
"y": 0
},
{
"label": "F4",
"x": 5,
"y": 0
},
{
"label": "F5",
"x": 6.5,
"y": 0
},
{
"label": "F6",
"x": 7.5,
"y": 0
},
{
"label": "F7",
"x": 8.5,
"y": 0
},
{
"label": "F8",
"x": 9.5,
"y": 0
},
{
"label": "F9",
"x": 11,
"y": 0
},
{
"label": "F10",
"x": 12,
"y": 0
},
{
"label": "F11",
"x": 13,
"y": 0
},
{
"label": "F12",
"x": 14,
"y": 0
},
{
"label": "PrtSc",
"x": 15.25,
"y": 0
},
{
"label": "Scroll Lock",
"x": 16.25,
"y": 0
},
{
"label": "Pause",
"x": 17.25,
"y": 0
},
{
"label": "~",
"x": 0,
"y": 1.5
},
{
"label": "!",
"x": 1,
"y": 1.5
},
{
"label": "@",
"x": 2,
"y": 1.5
},
{
"label": "#",
"x": 3,
"y": 1.5
},
{
"label": "$",
"x": 4,
"y": 1.5
},
{
"label": "%",
"x": 5,
"y": 1.5
},
{
"label": "^",
"x": 6,
"y": 1.5
},
{
"label": "&",
"x": 7,
"y": 1.5
},
{
"label": "*",
"x": 8,
"y": 1.5
},
{
"label": "(",
"x": 9,
"y": 1.5
},
{
"label": ")",
"x": 10,
"y": 1.5
},
{
"label": "_",
"x": 11,
"y": 1.5
},
{
"label": "+",
"x": 12,
"y": 1.5
},
{
"label": "Backspace",
"x": 13,
"y": 1.5,
"w": 2
},
{
"label": "Insert",
"x": 15.25,
"y": 1.5
},
{
"label": "Home",
"x": 16.25,
"y": 1.5
},
{
"label": "PgUp",
"x": 17.25,
"y": 1.5
},
{
"label": "Tab",
"x": 0,
"y": 2.5,
"w": 1.5
},
{
"label": "Q",
"x": 1.5,
"y": 2.5
},
{
"label": "W",
"x": 2.5,
"y": 2.5
},
{
"label": "E",
"x": 3.5,
"y": 2.5
},
{
"label": "R",
"x": 4.5,
"y": 2.5
},
{
"label": "T",
"x": 5.5,
"y": 2.5
},
{
"label": "Y",
"x": 6.5,
"y": 2.5
},
{
"label": "U",
"x": 7.5,
"y": 2.5
},
{
"label": "I",
"x": 8.5,
"y": 2.5
},
{
"label": "O",
"x": 9.5,
"y": 2.5
},
{
"label": "P",
"x": 10.5,
"y": 2.5
},
{
"label": "{",
"x": 11.5,
"y": 2.5
},
{
"label": "}",
"x": 12.5,
"y": 2.5
},
{
"label": "|",
"x": 13.5,
"y": 2.5,
"w": 1.5
},
{
"label": "Delete",
"x": 15.25,
"y": 2.5
},
{
"label": "End",
"x": 16.25,
"y": 2.5
},
{
"label": "PgDn",
"x": 17.25,
"y": 2.5
},
{
"label": "Caps Lock",
"x": 0,
"y": 3.5,
"w": 1.5
},
{
"label": "A",
"x": 1.75,
"y": 3.5
},
{
"label": "S",
"x": 2.75,
"y": 3.5
},
{
"label": "D",
"x": 3.75,
"y": 3.5
},
{
"label": "F",
"x": 4.75,
"y": 3.5
},
{
"label": "G",
"x": 5.75,
"y": 3.5
},
{
"label": "H",
"x": 6.75,
"y": 3.5
},
{
"label": "J",
"x": 7.75,
"y": 3.5
},
{
"label": "K",
"x": 8.75,
"y": 3.5
},
{
"label": "L",
"x": 9.75,
"y": 3.5
},
{
"label": ":",
"x": 10.75,
"y": 3.5
},
{
"label": "\"",
"x": 11.75,
"y": 3.5
},
{
"label": "~",
"x": 12.75,
"y": 3.5
},
{
"label": "Enter",
"x": 13.75,
"y": 3.5,
"w": 1.25
},
{
"label": "Shift",
"x": 0,
"y": 4.5,
"w": 1.25
},
{
"label": "|",
"x": 1.25,
"y": 4.5
},
{
"label": "Z",
"x": 2.25,
"y": 4.5
},
{
"label": "X",
"x": 3.25,
"y": 4.5
},
{
"label": "C",
"x": 4.25,
"y": 4.5
},
{
"label": "V",
"x": 5.25,
"y": 4.5
},
{
"label": "B",
"x": 6.25,
"y": 4.5
},
{
"label": "N",
"x": 7.25,
"y": 4.5
},
{
"label": "M",
"x": 8.25,
"y": 4.5
},
{
"label": "<",
"x": 9.25,
"y": 4.5
},
{
"label": ">",
"x": 10.25,
"y": 4.5
},
{
"label": "?",
"x": 11.25,
"y": 4.5
},
{
"label": "Shift",
"x": 12.25,
"y": 4.5,
"w": 2.75
},
{
"label": "↑",
"x": 16.25,
"y": 4.5
},
{
"label": "Ctrl",
"x": 0,
"y": 5.5,
"w": 1.5
},
{
"label": "Alt",
"x": 2.5,
"y": 5.5,
"w": 1.5
},
{
"x": 4,
"y": 5.5,
"w": 7
},
{
"label": "Alt",
"x": 11,
"y": 5.5,
"w": 1.5
},
{
"label": "Ctrl",
"x": 13.5,
"y": 5.5,
"w": 1.5
},
{
"label": "←",
"x": 15.25,
"y": 5.5
},
{
"label": "↓",
"x": 16.25,
"y": 5.5
},
{
"label": "→",
"x": 17.25,
"y": 5.5
}
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [7, 2], "x": 0, "y": 0},
{"matrix": [5, 3], "x": 2, "y": 0},
{"matrix": [5, 4], "x": 3, "y": 0},
{"matrix": [6, 4], "x": 4, "y": 0},
{"matrix": [7, 4], "x": 5, "y": 0},
{"matrix": [7, 6], "x": 6.5, "y": 0},
{"matrix": [7, 8], "x": 7.5, "y": 0},
{"matrix": [6, 9], "x": 8.5, "y": 0},
{"matrix": [5, 9], "x": 9.5, "y": 0},
{"matrix": [5, 6], "x": 11, "y": 0},
{"matrix": [4, 6], "x": 12, "y": 0},
{"matrix": [4, 11], "x": 13, "y": 0},
{"matrix": [4, 12], "x": 14, "y": 0},
{"matrix": [4, 15], "x": 15.25, "y": 0},
{"matrix": [3, 15], "x": 16.25, "y": 0},
{"matrix": [1, 14], "x": 17.25, "y": 0},
{"matrix": [5, 2], "x": 0, "y": 1.5},
{"matrix": [4, 2], "x": 1, "y": 1.5},
{"matrix": [4, 3], "x": 2, "y": 1.5},
{"matrix": [4, 4], "x": 3, "y": 1.5},
{"matrix": [4, 5], "x": 4, "y": 1.5},
{"matrix": [5, 5], "x": 5, "y": 1.5},
{"matrix": [5, 7], "x": 6, "y": 1.5},
{"matrix": [4, 7], "x": 7, "y": 1.5},
{"matrix": [4, 8], "x": 8, "y": 1.5},
{"matrix": [4, 9], "x": 9, "y": 1.5},
{"matrix": [4, 10], "x": 10, "y": 1.5},
{"matrix": [5, 10], "x": 11, "y": 1.5},
{"matrix": [5, 8], "x": 12, "y": 1.5},
{"matrix": [6, 6], "x": 13, "y": 1.5, "w": 2},
{"matrix": [5, 12], "x": 15.25, "y": 1.5},
{"matrix": [5, 14], "x": 16.25, "y": 1.5},
{"matrix": [5, 13], "x": 17.25, "y": 1.5},
{"matrix": [6, 2], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [3, 2], "x": 1.5, "y": 2.5},
{"matrix": [3, 3], "x": 2.5, "y": 2.5},
{"matrix": [3, 4], "x": 3.5, "y": 2.5},
{"matrix": [3, 5], "x": 4.5, "y": 2.5},
{"matrix": [6, 5], "x": 5.5, "y": 2.5},
{"matrix": [6, 7], "x": 6.5, "y": 2.5},
{"matrix": [3, 7], "x": 7.5, "y": 2.5},
{"matrix": [3, 8], "x": 8.5, "y": 2.5},
{"matrix": [3, 9], "x": 9.5, "y": 2.5},
{"matrix": [3, 10], "x": 10.5, "y": 2.5},
{"matrix": [6, 10], "x": 11.5, "y": 2.5},
{"matrix": [6, 8], "x": 12.5, "y": 2.5},
{"matrix": [2, 6], "x": 13.5, "y": 2.5, "w": 1.5},
{"matrix": [5, 11], "x": 15.25, "y": 2.5},
{"matrix": [4, 14], "x": 16.25, "y": 2.5},
{"matrix": [4, 13], "x": 17.25, "y": 2.5},
{"matrix": [6, 3], "x": 0, "y": 3.5, "w": 1.5},
{"matrix": [2, 2], "x": 1.75, "y": 3.5},
{"matrix": [2, 3], "x": 2.75, "y": 3.5},
{"matrix": [2, 4], "x": 3.75, "y": 3.5},
{"matrix": [2, 5], "x": 4.75, "y": 3.5},
{"matrix": [7, 5], "x": 5.75, "y": 3.5},
{"matrix": [7, 7], "x": 6.75, "y": 3.5},
{"matrix": [2, 7], "x": 7.75, "y": 3.5},
{"matrix": [2, 8], "x": 8.75, "y": 3.5},
{"matrix": [2, 9], "x": 9.75, "y": 3.5},
{"matrix": [2, 10], "x": 10.75, "y": 3.5},
{"matrix": [7, 10], "x": 11.75, "y": 3.5},
{"matrix": [1, 10], "x": 12.75, "y": 3.5},
{"matrix": [1, 6], "x": 13.75, "y": 3.5, "w": 1.25},
{"matrix": [6, 1], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [7, 3], "x": 1.25, "y": 4.5},
{"matrix": [1, 2], "x": 2.25, "y": 4.5},
{"matrix": [1, 3], "x": 3.25, "y": 4.5},
{"matrix": [1, 4], "x": 4.25, "y": 4.5},
{"matrix": [1, 5], "x": 5.25, "y": 4.5},
{"matrix": [0, 5], "x": 6.25, "y": 4.5},
{"matrix": [0, 7], "x": 7.25, "y": 4.5},
{"matrix": [1, 7], "x": 8.25, "y": 4.5},
{"matrix": [1, 8], "x": 9.25, "y": 4.5},
{"matrix": [1, 9], "x": 10.25, "y": 4.5},
{"matrix": [0, 10], "x": 11.25, "y": 4.5},
{"matrix": [1, 1], "x": 12.25, "y": 4.5, "w": 2.75},
{"matrix": [7, 14], "x": 16.25, "y": 4.5},
{"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
{"matrix": [7, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [0, 6], "x": 4, "y": 5.5, "w": 7},
{"matrix": [0, 15], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [1, 0], "x": 13.5, "y": 5.5, "w": 1.5},
{"matrix": [0, 14], "x": 15.25, "y": 5.5},
{"matrix": [0, 11], "x": 16.25, "y": 5.5},
{"matrix": [0, 12], "x": 17.25, "y": 5.5}
]
}
}

45
keyboards/converter/modelm_ssk/modelm_ssk.h
View File

@@ -1,45 +0,0 @@
/* Copyright 2019-2021 iw0rm3r, tiltowait
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
/* This a shortcut to help you visually see your layout.
* The first section contains "names" for physical keys of the keyboard
* and defines their position on the board.
* The second section defines position of the keys on the switch matrix
* (where COLUMNS and ROWS crosses). */
#define LAYOUT( \
K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
\
K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, \
K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \
K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \
K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, \
K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H \
) \
{ \
/* 00 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C, K1H, KC_NO, KC_NO, K1L, K0G, K0H, KC_NO, K0F, K0D }, \
/* 01 */ { K0E, K1M, K1C, K1D, K1E, K1F, K2N, K1I, K1J, K1K, KC_NO, KC_NO, KC_NO, KC_NO, K5P, KC_NO }, \
/* 02 */ { KC_NO, KC_NO, K2B, K2C, K2D, K2E, K3N, K2H, K2I, K2J, K2K, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
/* 03 */ { KC_NO, KC_NO, K3B, K3C, K3D, K3E, KC_NO, K3H, K3I, K3J, K3K, KC_NO, KC_NO, KC_NO, KC_NO, K5O }, \
/* 04 */ { KC_NO, KC_NO, K4B, K4C, K4D, K4E, K5K, K4H, K4I, K4J, K4K, K5L, K5M, K3Q, K3P, K5N }, \
/* 05 */ { K0A, KC_NO, K4A, K5B, K5C, K4F, K5J, K4G, K4M, K5I, K4L, K3O, K4O, K4Q, K4P, KC_NO }, \
/* 06 */ { KC_NO, K1A, K3A, K2A, K5D, K3F, K4N, K3G, K3M, K5H, K3L, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
/* 07 */ { KC_NO, KC_NO, K5A, KC_NO, K5E, K2F, K5F, K2G, K5G, KC_NO, K2L, KC_NO, KC_NO, KC_NO, K1N, K0B }, \
}
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */