summaryrefslogtreecommitdiff
path: root/keyboards/cmm_studio
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-09-25 19:25:43 +0000
committerGitHub <noreply@github.com>2021-09-25 12:25:43 -0700
commit3296c26c9829ec261261a273130197235b05b05e (patch)
treeece2a33e559a37c5385e3fc83bfbba9e2e4ac6db /keyboards/cmm_studio
parent5c2d15573d32b839f0cf7915ef141812ab03bfdf (diff)
Saka68 Solder Refactor (#14596)
* rename LAYOUT to LAYOUT_68_ansi * tidy-up keymaps Adjusts indenting for readability/aesthetics. * add LAYOUT_68_iso macro * enable Community Layout support * add Split Backspace layout variants * remove KBFirmware Parser references * correct keyboard metadata
Diffstat (limited to 'keyboards/cmm_studio')
-rw-r--r--keyboards/cmm_studio/saka68/solder/config.h2
-rw-r--r--keyboards/cmm_studio/saka68/solder/info.json246
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c16
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c40
-rw-r--r--keyboards/cmm_studio/saka68/solder/rules.mk2
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.c3
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.h45
7 files changed, 315 insertions, 39 deletions
diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
index a886f01a4b..3dd09922cc 100644
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ b/keyboards/cmm_studio/saka68/solder/config.h
@@ -23,7 +23,7 @@
#define PRODUCT_ID 0x534B
#define DEVICE_VER 0x0001
#define MANUFACTURER CMM.Studio
-#define PRODUCT Saka68
+#define PRODUCT Saka68 Solder
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json
index 2719d4ee26..6856294471 100644
--- a/keyboards/cmm_studio/saka68/solder/info.json
+++ b/keyboards/cmm_studio/saka68/solder/info.json
@@ -1,9 +1,12 @@
{
- "keyboard_name": "CMM.Studio Saka68",
+ "keyboard_name": "CMM.Studio Saka68 Solder",
"url": "",
- "maintainer": "qmk",
+ "maintainer": "CMMS-Freather",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_68_ansi"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_68_ansi": {
"layout": [
{"label":"K00 (D1,D4)", "x":0, "y":0},
{"label":"K01 (D1,D6)", "x":1, "y":0},
@@ -21,6 +24,7 @@
{"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
{"label":"K0F (D1,D3)", "x":15.25, "y":0},
{"label":"K0G (D1,D5)", "x":16.25, "y":0},
+
{"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
{"label":"K11 (D0,D6)", "x":1.5, "y":1},
{"label":"K12 (D0,D7)", "x":2.5, "y":1},
@@ -37,6 +41,7 @@
{"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
{"label":"K1E (D0,D2)", "x":15.25, "y":1},
{"label":"K1F (D0,D3)", "x":16.25, "y":1},
+
{"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
{"label":"K21 (B0,D6)", "x":1.75, "y":2},
{"label":"K22 (B0,D7)", "x":2.75, "y":2},
@@ -50,6 +55,7 @@
{"label":"K2A (B0,F0)", "x":10.75, "y":2},
{"label":"K2B (B0,B1)", "x":11.75, "y":2},
{"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
+
{"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
{"label":"K32 (F6,D7)", "x":2.25, "y":3},
{"label":"K33 (F6,B4)", "x":3.25, "y":3},
@@ -63,6 +69,239 @@
{"label":"K3B (F6,B1)", "x":11.25, "y":3},
{"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
{"label":"K3E (F6,D2)", "x":15.25, "y":3},
+
+ {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
+ {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
+ {"label":"K4D (F7,B3)", "x":14.25, "y":4},
+ {"label":"K4E (F7,D2)", "x":15.25, "y":4},
+ {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ ]
+ },
+ "LAYOUT_68_ansi_split_bs": {
+ "layout": [
+ {"label":"K00 (D1,D4)", "x":0, "y":0},
+ {"label":"K01 (D1,D6)", "x":1, "y":0},
+ {"label":"K02 (D1,D7)", "x":2, "y":0},
+ {"label":"K03 (D1,B4)", "x":3, "y":0},
+ {"label":"K04 (D1,B5)", "x":4, "y":0},
+ {"label":"K05 (D1,B6)", "x":5, "y":0},
+ {"label":"K06 (D1,C6)", "x":6, "y":0},
+ {"label":"K07 (D1,F5)", "x":7, "y":0},
+ {"label":"K08 (D1,F4)", "x":8, "y":0},
+ {"label":"K09 (D1,F1)", "x":9, "y":0},
+ {"label":"K0A (D1,F0)", "x":10, "y":0},
+ {"label":"K0B (D1,B1)", "x":11, "y":0},
+ {"label":"K0C (D1,B2)", "x":12, "y":0},
+ {"label":"K0D (D1,B3)", "x":13, "y":0},
+ {"label":"K0E (D1,D2)", "x":14, "y":0},
+ {"label":"K0F (D1,D3)", "x":15.25, "y":0},
+ {"label":"K0G (D1,D5)", "x":16.25, "y":0},
+
+ {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
+ {"label":"K11 (D0,D6)", "x":1.5, "y":1},
+ {"label":"K12 (D0,D7)", "x":2.5, "y":1},
+ {"label":"K13 (D0,B4)", "x":3.5, "y":1},
+ {"label":"K14 (D0,B5)", "x":4.5, "y":1},
+ {"label":"K15 (D0,B6)", "x":5.5, "y":1},
+ {"label":"K16 (D0,C6)", "x":6.5, "y":1},
+ {"label":"K17 (D0,F5)", "x":7.5, "y":1},
+ {"label":"K18 (D0,F4)", "x":8.5, "y":1},
+ {"label":"K19 (D0,F1)", "x":9.5, "y":1},
+ {"label":"K1A (D0,F0)", "x":10.5, "y":1},
+ {"label":"K1B (D0,B1)", "x":11.5, "y":1},
+ {"label":"K1C (D0,B2)", "x":12.5, "y":1},
+ {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K1E (D0,D2)", "x":15.25, "y":1},
+ {"label":"K1F (D0,D3)", "x":16.25, "y":1},
+
+ {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
+ {"label":"K21 (B0,D6)", "x":1.75, "y":2},
+ {"label":"K22 (B0,D7)", "x":2.75, "y":2},
+ {"label":"K23 (B0,B4)", "x":3.75, "y":2},
+ {"label":"K24 (B0,B5)", "x":4.75, "y":2},
+ {"label":"K25 (B0,B6)", "x":5.75, "y":2},
+ {"label":"K26 (B0,C6)", "x":6.75, "y":2},
+ {"label":"K27 (B0,F5)", "x":7.75, "y":2},
+ {"label":"K28 (B0,F4)", "x":8.75, "y":2},
+ {"label":"K29 (B0,F1)", "x":9.75, "y":2},
+ {"label":"K2A (B0,F0)", "x":10.75, "y":2},
+ {"label":"K2B (B0,B1)", "x":11.75, "y":2},
+ {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
+
+ {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
+ {"label":"K32 (F6,D7)", "x":2.25, "y":3},
+ {"label":"K33 (F6,B4)", "x":3.25, "y":3},
+ {"label":"K34 (F6,B5)", "x":4.25, "y":3},
+ {"label":"K35 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K36 (F6,C6)", "x":6.25, "y":3},
+ {"label":"K37 (F6,F5)", "x":7.25, "y":3},
+ {"label":"K38 (F6,F4)", "x":8.25, "y":3},
+ {"label":"K39 (F6,F1)", "x":9.25, "y":3},
+ {"label":"K3A (F6,F0)", "x":10.25, "y":3},
+ {"label":"K3B (F6,B1)", "x":11.25, "y":3},
+ {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
+ {"label":"K3E (F6,D2)", "x":15.25, "y":3},
+
+ {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
+ {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
+ {"label":"K4D (F7,B3)", "x":14.25, "y":4},
+ {"label":"K4E (F7,D2)", "x":15.25, "y":4},
+ {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ ]
+ },
+ "LAYOUT_68_iso": {
+ "layout": [
+ {"label":"K00 (D1,D4)", "x":0, "y":0},
+ {"label":"K01 (D1,D6)", "x":1, "y":0},
+ {"label":"K02 (D1,D7)", "x":2, "y":0},
+ {"label":"K03 (D1,B4)", "x":3, "y":0},
+ {"label":"K04 (D1,B5)", "x":4, "y":0},
+ {"label":"K05 (D1,B6)", "x":5, "y":0},
+ {"label":"K06 (D1,C6)", "x":6, "y":0},
+ {"label":"K07 (D1,F5)", "x":7, "y":0},
+ {"label":"K08 (D1,F4)", "x":8, "y":0},
+ {"label":"K09 (D1,F1)", "x":9, "y":0},
+ {"label":"K0A (D1,F0)", "x":10, "y":0},
+ {"label":"K0B (D1,B1)", "x":11, "y":0},
+ {"label":"K0C (D1,B2)", "x":12, "y":0},
+ {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
+ {"label":"K0F (D1,D3)", "x":15.25, "y":0},
+ {"label":"K0G (D1,D5)", "x":16.25, "y":0},
+
+ {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
+ {"label":"K11 (D0,D6)", "x":1.5, "y":1},
+ {"label":"K12 (D0,D7)", "x":2.5, "y":1},
+ {"label":"K13 (D0,B4)", "x":3.5, "y":1},
+ {"label":"K14 (D0,B5)", "x":4.5, "y":1},
+ {"label":"K15 (D0,B6)", "x":5.5, "y":1},
+ {"label":"K16 (D0,C6)", "x":6.5, "y":1},
+ {"label":"K17 (D0,F5)", "x":7.5, "y":1},
+ {"label":"K18 (D0,F4)", "x":8.5, "y":1},
+ {"label":"K19 (D0,F1)", "x":9.5, "y":1},
+ {"label":"K1A (D0,F0)", "x":10.5, "y":1},
+ {"label":"K1B (D0,B1)", "x":11.5, "y":1},
+ {"label":"K1C (D0,B2)", "x":12.5, "y":1},
+ {"label":"K1E (D0,D2)", "x":15.25, "y":1},
+ {"label":"K1F (D0,D3)", "x":16.25, "y":1},
+
+ {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
+ {"label":"K21 (B0,D6)", "x":1.75, "y":2},
+ {"label":"K22 (B0,D7)", "x":2.75, "y":2},
+ {"label":"K23 (B0,B4)", "x":3.75, "y":2},
+ {"label":"K24 (B0,B5)", "x":4.75, "y":2},
+ {"label":"K25 (B0,B6)", "x":5.75, "y":2},
+ {"label":"K26 (B0,C6)", "x":6.75, "y":2},
+ {"label":"K27 (B0,F5)", "x":7.75, "y":2},
+ {"label":"K28 (B0,F4)", "x":8.75, "y":2},
+ {"label":"K29 (B0,F1)", "x":9.75, "y":2},
+ {"label":"K2A (B0,F0)", "x":10.75, "y":2},
+ {"label":"K2B (B0,B1)", "x":11.75, "y":2},
+ {"label":"K2C (B0,B2)", "x":12.75, "y":2},
+ {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
+
+ {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
+ {"label":"K31 (F6,D6)", "x":1.25, "y":3},
+ {"label":"K32 (F6,D7)", "x":2.25, "y":3},
+ {"label":"K33 (F6,B4)", "x":3.25, "y":3},
+ {"label":"K34 (F6,B5)", "x":4.25, "y":3},
+ {"label":"K35 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K36 (F6,C6)", "x":6.25, "y":3},
+ {"label":"K37 (F6,F5)", "x":7.25, "y":3},
+ {"label":"K38 (F6,F4)", "x":8.25, "y":3},
+ {"label":"K39 (F6,F1)", "x":9.25, "y":3},
+ {"label":"K3A (F6,F0)", "x":10.25, "y":3},
+ {"label":"K3B (F6,B1)", "x":11.25, "y":3},
+ {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
+ {"label":"K3E (F6,D2)", "x":15.25, "y":3},
+
+ {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
+ {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
+ {"label":"K4D (F7,B3)", "x":14.25, "y":4},
+ {"label":"K4E (F7,D2)", "x":15.25, "y":4},
+ {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+ ]
+ },
+ "LAYOUT_68_iso_split_bs": {
+ "layout": [
+ {"label":"K00 (D1,D4)", "x":0, "y":0},
+ {"label":"K01 (D1,D6)", "x":1, "y":0},
+ {"label":"K02 (D1,D7)", "x":2, "y":0},
+ {"label":"K03 (D1,B4)", "x":3, "y":0},
+ {"label":"K04 (D1,B5)", "x":4, "y":0},
+ {"label":"K05 (D1,B6)", "x":5, "y":0},
+ {"label":"K06 (D1,C6)", "x":6, "y":0},
+ {"label":"K07 (D1,F5)", "x":7, "y":0},
+ {"label":"K08 (D1,F4)", "x":8, "y":0},
+ {"label":"K09 (D1,F1)", "x":9, "y":0},
+ {"label":"K0A (D1,F0)", "x":10, "y":0},
+ {"label":"K0B (D1,B1)", "x":11, "y":0},
+ {"label":"K0C (D1,B2)", "x":12, "y":0},
+ {"label":"K0D (D1,B3)", "x":13, "y":0},
+ {"label":"K0E (D1,D2)", "x":14, "y":0},
+ {"label":"K0F (D1,D3)", "x":15.25, "y":0},
+ {"label":"K0G (D1,D5)", "x":16.25, "y":0},
+
+ {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
+ {"label":"K11 (D0,D6)", "x":1.5, "y":1},
+ {"label":"K12 (D0,D7)", "x":2.5, "y":1},
+ {"label":"K13 (D0,B4)", "x":3.5, "y":1},
+ {"label":"K14 (D0,B5)", "x":4.5, "y":1},
+ {"label":"K15 (D0,B6)", "x":5.5, "y":1},
+ {"label":"K16 (D0,C6)", "x":6.5, "y":1},
+ {"label":"K17 (D0,F5)", "x":7.5, "y":1},
+ {"label":"K18 (D0,F4)", "x":8.5, "y":1},
+ {"label":"K19 (D0,F1)", "x":9.5, "y":1},
+ {"label":"K1A (D0,F0)", "x":10.5, "y":1},
+ {"label":"K1B (D0,B1)", "x":11.5, "y":1},
+ {"label":"K1C (D0,B2)", "x":12.5, "y":1},
+ {"label":"K1E (D0,D2)", "x":15.25, "y":1},
+ {"label":"K1F (D0,D3)", "x":16.25, "y":1},
+
+ {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
+ {"label":"K21 (B0,D6)", "x":1.75, "y":2},
+ {"label":"K22 (B0,D7)", "x":2.75, "y":2},
+ {"label":"K23 (B0,B4)", "x":3.75, "y":2},
+ {"label":"K24 (B0,B5)", "x":4.75, "y":2},
+ {"label":"K25 (B0,B6)", "x":5.75, "y":2},
+ {"label":"K26 (B0,C6)", "x":6.75, "y":2},
+ {"label":"K27 (B0,F5)", "x":7.75, "y":2},
+ {"label":"K28 (B0,F4)", "x":8.75, "y":2},
+ {"label":"K29 (B0,F1)", "x":9.75, "y":2},
+ {"label":"K2A (B0,F0)", "x":10.75, "y":2},
+ {"label":"K2B (B0,B1)", "x":11.75, "y":2},
+ {"label":"K2C (B0,B2)", "x":12.75, "y":2},
+ {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
+
+ {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
+ {"label":"K31 (F6,D6)", "x":1.25, "y":3},
+ {"label":"K32 (F6,D7)", "x":2.25, "y":3},
+ {"label":"K33 (F6,B4)", "x":3.25, "y":3},
+ {"label":"K34 (F6,B5)", "x":4.25, "y":3},
+ {"label":"K35 (F6,B6)", "x":5.25, "y":3},
+ {"label":"K36 (F6,C6)", "x":6.25, "y":3},
+ {"label":"K37 (F6,F5)", "x":7.25, "y":3},
+ {"label":"K38 (F6,F4)", "x":8.25, "y":3},
+ {"label":"K39 (F6,F1)", "x":9.25, "y":3},
+ {"label":"K3A (F6,F0)", "x":10.25, "y":3},
+ {"label":"K3B (F6,B1)", "x":11.25, "y":3},
+ {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
+ {"label":"K3E (F6,D2)", "x":15.25, "y":3},
+
{"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
{"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
{"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
@@ -76,5 +315,4 @@
]
}
}
- ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
diff --git a/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
index 88f6db4ed3..0c99835847 100644
--- a/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
@@ -17,20 +17,20 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_68_ansi(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [1] = LAYOUT_68_ansi(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
index bd55f0d85b..12334284a0 100644
--- a/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
@@ -17,35 +17,35 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_68_ansi(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [1] = LAYOUT_68_ansi(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [2] = LAYOUT_68_ansi(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [3] = LAYOUT_68_ansi(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/cmm_studio/saka68/solder/rules.mk b/keyboards/cmm_studio/saka68/solder/rules.mk
index f2e5379ac1..077b060eea 100644
--- a/keyboards/cmm_studio/saka68/solder/rules.mk
+++ b/keyboards/cmm_studio/saka68/solder/rules.mk
@@ -19,3 +19,5 @@ NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
+
+LAYOUTS = 68_ansi 68_iso
diff --git a/keyboards/cmm_studio/saka68/solder/solder.c b/keyboards/cmm_studio/saka68/solder/solder.c
index 5ff4cf0b97..195c14023b 100644
--- a/keyboards/cmm_studio/saka68/solder/solder.c
+++ b/keyboards/cmm_studio/saka68/solder/solder.c
@@ -15,6 +15,3 @@
*/
#include "solder.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/solder/solder.h b/keyboards/cmm_studio/saka68/solder/solder.h
index 4d1d02163a..e1945eab46 100644
--- a/keyboards/cmm_studio/saka68/solder/solder.h
+++ b/keyboards/cmm_studio/saka68/solder/solder.h
@@ -18,7 +18,7 @@
#include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_68_ansi( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
@@ -32,5 +32,44 @@
{ K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
}
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+#define LAYOUT_68_ansi_split_bs( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO, KC_NO }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
+}
+
+#define LAYOUT_68_iso( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F, K0G }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
+}
+
+#define LAYOUT_68_iso_split_bs( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO, KC_NO }, \
+ { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, KC_NO }, \
+}