aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/config.h6
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/hotswap.h45
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/info.json91
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c34
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md1
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c61
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/rules.mk3
7 files changed, 165 insertions, 76 deletions
diff --git a/keyboards/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h
index 7f19723b7..9879dadd5 100644
--- a/keyboards/cmm_studio/saka68/hotswap/config.h
+++ b/keyboards/cmm_studio/saka68/hotswap/config.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25#define PRODUCT_ID 0x5348 25#define PRODUCT_ID 0x5348
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27#define MANUFACTURER CMM.Studio 27#define MANUFACTURER CMM.Studio
28#define PRODUCT Saka68 28#define PRODUCT Saka68 Hotswap
29 29
30/* key matrix size */ 30/* key matrix size */
31#define MATRIX_ROWS 5 31#define MATRIX_ROWS 5
@@ -45,7 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
45#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 } 45#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 }
46 46
47#define DIODE_DIRECTION COL2ROW 47#define DIODE_DIRECTION COL2ROW
48
49
50// generated by KBFirmware JSON to QMK Parser
51// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.h b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
index 69f782ad7..f8b45f098 100644
--- a/keyboards/cmm_studio/saka68/hotswap/hotswap.h
+++ b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
@@ -14,23 +14,34 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 #pragma once 17#pragma once
18 18
19 #include "quantum.h" 19#include "quantum.h"
20 20
21 #define LAYOUT( \ 21#define LAYOUT_68_ansi( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ 22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ 23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ 24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
25 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ 25 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
26 K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \ 26 K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \
27 ) { \ 27) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ 28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ 29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \ 30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \
31 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO }, \ 31 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO }, \
32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ 32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
33 } 33}
34 34
35 // generated by KBFirmware JSON to QMK Parser 35#define LAYOUT_68_iso( \
36 // https://noroadsleft.github.io/kbf_qmk_converter/ 36 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
37 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
38 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
39 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
40 K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \
41) { \
42 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
43 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \
44 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO }, \
45 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, KC_NO }, \
46 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
47}
diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json
index 9157e0923..2e4842771 100644
--- a/keyboards/cmm_studio/saka68/hotswap/info.json
+++ b/keyboards/cmm_studio/saka68/hotswap/info.json
@@ -1,9 +1,12 @@
1{ 1{
2 "keyboard_name": "CMM.Studio Saka68", 2 "keyboard_name": "CMM.Studio Saka68 Hotswap",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "CMMS-Freather",
5 "layout_aliases": {
6 "LAYOUT": "LAYOUT_68_ansi"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT": { 9 "LAYOUT_68_ansi": {
7 "layout": [ 10 "layout": [
8 {"label":"K00 (D2,D4)", "x":0, "y":0}, 11 {"label":"K00 (D2,D4)", "x":0, "y":0},
9 {"label":"K01 (D2,D6)", "x":1, "y":0}, 12 {"label":"K01 (D2,D6)", "x":1, "y":0},
@@ -21,6 +24,7 @@
21 {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2}, 24 {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
22 {"label":"K0E (D2,D3)", "x":15.25, "y":0}, 25 {"label":"K0E (D2,D3)", "x":15.25, "y":0},
23 {"label":"K0F (D2,D5)", "x":16.25, "y":0}, 26 {"label":"K0F (D2,D5)", "x":16.25, "y":0},
27
24 {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5}, 28 {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
25 {"label":"K11 (D1,D6)", "x":1.5, "y":1}, 29 {"label":"K11 (D1,D6)", "x":1.5, "y":1},
26 {"label":"K12 (D1,D7)", "x":2.5, "y":1}, 30 {"label":"K12 (D1,D7)", "x":2.5, "y":1},
@@ -37,6 +41,7 @@
37 {"label":"K1D (D1,B3)", "x":13.5, "y":1, "w":1.5}, 41 {"label":"K1D (D1,B3)", "x":13.5, "y":1, "w":1.5},
38 {"label":"K1E (D1,D3)", "x":15.25, "y":1}, 42 {"label":"K1E (D1,D3)", "x":15.25, "y":1},
39 {"label":"K1F (D1,D5)", "x":16.25, "y":1}, 43 {"label":"K1F (D1,D5)", "x":16.25, "y":1},
44
40 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75}, 45 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
41 {"label":"K21 (B0,D6)", "x":1.75, "y":2}, 46 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
42 {"label":"K22 (B0,D7)", "x":2.75, "y":2}, 47 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
@@ -50,6 +55,7 @@
50 {"label":"K2A (B0,F0)", "x":10.75, "y":2}, 55 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
51 {"label":"K2B (B0,B1)", "x":11.75, "y":2}, 56 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
52 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25}, 57 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
58
53 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25}, 59 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
54 {"label":"K32 (F6,D7)", "x":2.25, "y":3}, 60 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
55 {"label":"K33 (F6,B4)", "x":3.25, "y":3}, 61 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
@@ -63,6 +69,84 @@
63 {"label":"K3B (F6,B1)", "x":11.25, "y":3}, 69 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
64 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75}, 70 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
65 {"label":"K3E (F6,D3)", "x":15.25, "y":3}, 71 {"label":"K3E (F6,D3)", "x":15.25, "y":3},
72
73 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
74 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
75 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
76 {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
77 {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
78 {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
79 {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
80 {"label":"K4D (F7,B3)", "x":14.25, "y":4},
81 {"label":"K4E (F7,D3)", "x":15.25, "y":4},
82 {"label":"K4F (F7,D5)", "x":16.25, "y":4}
83 ]
84 },
85 "LAYOUT_68_iso": {
86 "layout": [
87 {"label":"K00 (D2,D4)", "x":0, "y":0},
88 {"label":"K01 (D2,D6)", "x":1, "y":0},
89 {"label":"K02 (D2,D7)", "x":2, "y":0},
90 {"label":"K03 (D2,B4)", "x":3, "y":0},
91 {"label":"K04 (D2,B5)", "x":4, "y":0},
92 {"label":"K05 (D2,B6)", "x":5, "y":0},
93 {"label":"K06 (D2,C6)", "x":6, "y":0},
94 {"label":"K07 (D2,F5)", "x":7, "y":0},
95 {"label":"K08 (D2,F4)", "x":8, "y":0},
96 {"label":"K09 (D2,F1)", "x":9, "y":0},
97 {"label":"K0A (D2,F0)", "x":10, "y":0},
98 {"label":"K0B (D2,B1)", "x":11, "y":0},
99 {"label":"K0C (D2,B2)", "x":12, "y":0},
100 {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
101 {"label":"K0E (D2,D3)", "x":15.25, "y":0},
102 {"label":"K0F (D2,D5)", "x":16.25, "y":0},
103
104 {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
105 {"label":"K11 (D1,D6)", "x":1.5, "y":1},
106 {"label":"K12 (D1,D7)", "x":2.5, "y":1},
107 {"label":"K13 (D1,B4)", "x":3.5, "y":1},
108 {"label":"K14 (D1,B5)", "x":4.5, "y":1},
109 {"label":"K15 (D1,B6)", "x":5.5, "y":1},
110 {"label":"K16 (D1,C6)", "x":6.5, "y":1},
111 {"label":"K17 (D1,F5)", "x":7.5, "y":1},
112 {"label":"K18 (D1,F4)", "x":8.5, "y":1},
113 {"label":"K19 (D1,F1)", "x":9.5, "y":1},
114 {"label":"K1A (D1,F0)", "x":10.5, "y":1},
115 {"label":"K1B (D1,B1)", "x":11.5, "y":1},
116 {"label":"K1C (D1,B2)", "x":12.5, "y":1},
117 {"label":"K1E (D1,D3)", "x":15.25, "y":1},
118 {"label":"K1F (D1,D5)", "x":16.25, "y":1},
119
120 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
121 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
122 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
123 {"label":"K23 (B0,B4)", "x":3.75, "y":2},
124 {"label":"K24 (B0,B5)", "x":4.75, "y":2},
125 {"label":"K25 (B0,B6)", "x":5.75, "y":2},
126 {"label":"K26 (B0,C6)", "x":6.75, "y":2},
127 {"label":"K27 (B0,F5)", "x":7.75, "y":2},
128 {"label":"K28 (B0,F4)", "x":8.75, "y":2},
129 {"label":"K29 (B0,F1)", "x":9.75, "y":2},
130 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
131 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
132 {"label":"K2C (B0,B2)", "x":12.75, "y":2},
133 {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
134
135 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
136 {"label":"K31 (F6,D6)", "x":1.25, "y":3},
137 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
138 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
139 {"label":"K34 (F6,B5)", "x":4.25, "y":3},
140 {"label":"K35 (F6,B6)", "x":5.25, "y":3},
141 {"label":"K36 (F6,C6)", "x":6.25, "y":3},
142 {"label":"K37 (F6,F5)", "x":7.25, "y":3},
143 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
144 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
145 {"label":"K3A (F6,F0)", "x":10.25, "y":3},
146 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
147 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
148 {"label":"K3E (F6,D3)", "x":15.25, "y":3},
149
66 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25}, 150 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
67 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25}, 151 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
68 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25}, 152 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
@@ -76,5 +160,4 @@
76 ] 160 ]
77 } 161 }
78 } 162 }
79 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
80} 163}
diff --git a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c
index 8f4ad5b4f..5b65e62b5 100644
--- a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c
@@ -14,23 +14,23 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 #include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_68_ansi(
21 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_SPC, 21 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_SPC,
22 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_SPC, 22 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_SPC,
23 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, 23 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,
24 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, 24 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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
28 [1] = LAYOUT( 28 [1] = LAYOUT_68_ansi(
29 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, 29 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,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ), 34 ),
35 35
36 }; 36};
diff --git a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md
deleted file mode 100644
index db71e7842..000000000
--- a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
1# The default keymap for Saka68
diff --git a/keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c b/keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c
index bd94987d8..603ca01ba 100644
--- a/keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c
@@ -14,38 +14,39 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 #include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_68_ansi(
21 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_SPC, 21 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_SPC,
22 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_SPC, 22 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_SPC,
23 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, 23 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,
24 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, 24 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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27
28 [1] = LAYOUT_68_ansi(
29 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,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ),
27 35
28 [1] = LAYOUT( 36 [2] = LAYOUT_68_ansi(
29 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, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ), 42 ),
35 [2] = LAYOUT(
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
41 ),
42 43
43 [3] = LAYOUT( 44 [3] = LAYOUT_68_ansi(
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
49 ), 50 ),
50 51
51 }; 52};
diff --git a/keyboards/cmm_studio/saka68/hotswap/rules.mk b/keyboards/cmm_studio/saka68/hotswap/rules.mk
index 70867503b..f1b8f4cf8 100644
--- a/keyboards/cmm_studio/saka68/hotswap/rules.mk
+++ b/keyboards/cmm_studio/saka68/hotswap/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22 22
23# generated by KBFirmware JSON to QMK Parser 23LAYOUTS = 68_ansi 68_iso
24# https://noroadsleft.github.io/kbf_qmk_converter/