aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-01-20 00:18:11 +1100
committerNick Brassel <nick@tzarc.org>2021-01-20 00:18:11 +1100
commitd668fd3977c46bd5c9a5c50ce77ac86c85cc18ed (patch)
tree2ec8d5fe87f68c0eff23926305d020f94b5b4b61
parent6b0ed6a29b306bad8c1a8a55e45452b828109793 (diff)
parentd24fe4f1ca49b2143b3f3d260a0a63088b521673 (diff)
downloadqmk_firmware-d668fd3977c46bd5c9a5c50ce77ac86c85cc18ed.tar.gz
qmk_firmware-d668fd3977c46bd5c9a5c50ce77ac86c85cc18ed.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/config.h50
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/hotswap.c17
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/hotswap.h36
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/info.json82
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c36
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md1
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c51
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/keymaps/via/rules.mk (renamed from keyboards/cmm_studio/saka68/keymaps/via/rules.mk)0
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/readme.md21
-rw-r--r--keyboards/cmm_studio/saka68/hotswap/rules.mk25
-rw-r--r--keyboards/cmm_studio/saka68/solder/config.h (renamed from keyboards/cmm_studio/saka68/config.h)0
-rw-r--r--keyboards/cmm_studio/saka68/solder/info.json (renamed from keyboards/cmm_studio/saka68/info.json)2
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c (renamed from keyboards/cmm_studio/saka68/keymaps/default/keymap.c)2
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c (renamed from keyboards/cmm_studio/saka68/keymaps/via/keymap.c)4
-rw-r--r--keyboards/cmm_studio/saka68/solder/keymaps/via/rules.mk2
-rw-r--r--keyboards/cmm_studio/saka68/solder/readme.md17
-rw-r--r--keyboards/cmm_studio/saka68/solder/rules.mk (renamed from keyboards/cmm_studio/saka68/rules.mk)0
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.c (renamed from keyboards/cmm_studio/saka68/saka68.c)2
-rw-r--r--keyboards/cmm_studio/saka68/solder/solder.h (renamed from keyboards/cmm_studio/saka68/saka68.h)0
-rw-r--r--keyboards/ploopyco/opt_encoder.c28
-rw-r--r--keyboards/ploopyco/opt_encoder.h50
21 files changed, 397 insertions, 29 deletions
diff --git a/keyboards/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h
new file mode 100644
index 000000000..99ca2ae8d
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/config.h
@@ -0,0 +1,50 @@
1/*
2Copyright 2021 CMM.Studio Freather
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x434D
24#define PRODUCT_ID 0x5348
25#define DEVICE_VER 0x0001
26#define MANUFACTURER CMM.Studio
27#define PRODUCT Saka68
28
29/* key matrix size */
30#define MATRIX_ROWS 5
31#define MATRIX_COLS 16
32
33/*
34 * Keyboard Matrix Assignments
35 *
36 * Change this to how you wired your keyboard
37 * COLS: AVR pins used for columns, left to right
38 * ROWS: AVR pins used for rows, top to bottom
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 *
42 */
43#define MATRIX_ROW_PINS { D2, D1, B0, F6, F7 }
44#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 }
45
46#define DIODE_DIRECTION COL2ROW
47
48
49// generated by KBFirmware JSON to QMK Parser
50// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.c b/keyboards/cmm_studio/saka68/hotswap/hotswap.c
new file mode 100644
index 000000000..14454b58b
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/hotswap.c
@@ -0,0 +1,17 @@
1/* Copyright 2021 CMM.Studio Freather
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "hotswap.h"
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.h b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
new file mode 100644
index 000000000..69f782ad7
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
@@ -0,0 +1,36 @@
1/* Copyright 2021 CMM.Studio Freather
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17 #pragma once
18
19 #include "quantum.h"
20
21 #define LAYOUT( \
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, \
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, \
26 K40, K41, K42, K46, K49, K4A, K4B, K4D, K4E, K4F \
27 ) { \
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 }, \
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 }, \
32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
33 }
34
35 // generated by KBFirmware JSON to QMK Parser
36 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json
new file mode 100644
index 000000000..f6d467159
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/info.json
@@ -0,0 +1,82 @@
1{
2 "keyboard_name": "CMM.Studio Saka68",
3 "url": "",
4 "maintainer": "qmk",
5 "width": 17.25,
6 "height": 5,
7 "layouts": {
8 "LAYOUT": {
9 "layout": [
10 {"label":"K00 (D2,D4)", "x":0, "y":0},
11 {"label":"K01 (D2,D6)", "x":1, "y":0},
12 {"label":"K02 (D2,D7)", "x":2, "y":0},
13 {"label":"K03 (D2,B4)", "x":3, "y":0},
14 {"label":"K04 (D2,B5)", "x":4, "y":0},
15 {"label":"K05 (D2,B6)", "x":5, "y":0},
16 {"label":"K06 (D2,C6)", "x":6, "y":0},
17 {"label":"K07 (D2,F5)", "x":7, "y":0},
18 {"label":"K08 (D2,F4)", "x":8, "y":0},
19 {"label":"K09 (D2,F1)", "x":9, "y":0},
20 {"label":"K0A (D2,F0)", "x":10, "y":0},
21 {"label":"K0B (D2,B1)", "x":11, "y":0},
22 {"label":"K0C (D2,B2)", "x":12, "y":0},
23 {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
24 {"label":"K0E (D2,D3)", "x":15.25, "y":0},
25 {"label":"K0F (D2,D5)", "x":16.25, "y":0},
26 {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
27 {"label":"K11 (D1,D6)", "x":1.5, "y":1},
28 {"label":"K12 (D1,D7)", "x":2.5, "y":1},
29 {"label":"K13 (D1,B4)", "x":3.5, "y":1},
30 {"label":"K14 (D1,B5)", "x":4.5, "y":1},
31 {"label":"K15 (D1,B6)", "x":5.5, "y":1},
32 {"label":"K16 (D1,C6)", "x":6.5, "y":1},
33 {"label":"K17 (D1,F5)", "x":7.5, "y":1},
34 {"label":"K18 (D1,F4)", "x":8.5, "y":1},
35 {"label":"K19 (D1,F1)", "x":9.5, "y":1},
36 {"label":"K1A (D1,F0)", "x":10.5, "y":1},
37 {"label":"K1B (D1,B1)", "x":11.5, "y":1},
38 {"label":"K1C (D1,B2)", "x":12.5, "y":1},
39 {"label":"K1D (D1,B3)", "x":13.5, "y":1, "w":1.5},
40 {"label":"K1E (D1,D3)", "x":15.25, "y":1},
41 {"label":"K1F (D1,D5)", "x":16.25, "y":1},
42 {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
43 {"label":"K21 (B0,D6)", "x":1.75, "y":2},
44 {"label":"K22 (B0,D7)", "x":2.75, "y":2},
45 {"label":"K23 (B0,B4)", "x":3.75, "y":2},
46 {"label":"K24 (B0,B5)", "x":4.75, "y":2},
47 {"label":"K25 (B0,B6)", "x":5.75, "y":2},
48 {"label":"K26 (B0,C6)", "x":6.75, "y":2},
49 {"label":"K27 (B0,F5)", "x":7.75, "y":2},
50 {"label":"K28 (B0,F4)", "x":8.75, "y":2},
51 {"label":"K29 (B0,F1)", "x":9.75, "y":2},
52 {"label":"K2A (B0,F0)", "x":10.75, "y":2},
53 {"label":"K2B (B0,B1)", "x":11.75, "y":2},
54 {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
55 {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
56 {"label":"K32 (F6,D7)", "x":2.25, "y":3},
57 {"label":"K33 (F6,B4)", "x":3.25, "y":3},
58 {"label":"K34 (F6,B5)", "x":4.25, "y":3},
59 {"label":"K35 (F6,B6)", "x":5.25, "y":3},
60 {"label":"K36 (F6,C6)", "x":6.25, "y":3},
61 {"label":"K37 (F6,F5)", "x":7.25, "y":3},
62 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
63 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
64 {"label":"K3A (F6,F0)", "x":10.25, "y":3},
65 {"label":"K3B (F6,B1)", "x":11.25, "y":3},
66 {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
67 {"label":"K3E (F6,D3)", "x":15.25, "y":3},
68 {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
69 {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
70 {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
71 {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
72 {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
73 {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
74 {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
75 {"label":"K4D (F7,B3)", "x":14.25, "y":4},
76 {"label":"K4E (F7,D3)", "x":15.25, "y":4},
77 {"label":"K4F (F7,D5)", "x":16.25, "y":4}
78 ]
79 }
80 }
81 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
82}
diff --git a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c
new file mode 100644
index 000000000..8f4ad5b4f
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
1/* Copyright 2021 CMM.Studio Freather
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17 #include QMK_KEYBOARD_H
18
19 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT(
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,
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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ),
27
28 [1] = LAYOUT(
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 ),
35
36 };
diff --git a/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md
new file mode 100644
index 000000000..db71e7842
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/default/readme.md
@@ -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
new file mode 100644
index 000000000..bd94987d8
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
1/* Copyright 2021 CMM.Studio Freather
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17 #include QMK_KEYBOARD_H
18
19 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT(
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,
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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ),
27
28 [1] = LAYOUT(
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 ),
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 [3] = LAYOUT(
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,
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,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
49 ),
50
51 };
diff --git a/keyboards/cmm_studio/saka68/keymaps/via/rules.mk b/keyboards/cmm_studio/saka68/hotswap/keymaps/via/rules.mk
index eb5b445dd..eb5b445dd 100644
--- a/keyboards/cmm_studio/saka68/keymaps/via/rules.mk
+++ b/keyboards/cmm_studio/saka68/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/cmm_studio/saka68/hotswap/readme.md b/keyboards/cmm_studio/saka68/hotswap/readme.md
new file mode 100644
index 000000000..dda9d1f08
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/readme.md
@@ -0,0 +1,21 @@
1# CMM.Studio Saka68
2
3CMM.Studio Saka68 Keyboard
4
5![CMM.Studio Saka68](https://i.imgur.com/E1S43cs.png)
6
7
8
9
10* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
11* Hardware Supported: PCB, Atmega32u4
12this firmware supports iso and ansi hotswap directly, once you flash the via firmware, you only need to select the layout and change to iso layout, then you can use iso hotswap version
13
14Make example for this keyboard (after setting up your build environment):
15
16 make cmm_studio/saka68/hotswap:default
17
18
19For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
20
21See 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).
diff --git a/keyboards/cmm_studio/saka68/hotswap/rules.mk b/keyboards/cmm_studio/saka68/hotswap/rules.mk
new file mode 100644
index 000000000..14b22efbd
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/hotswap/rules.mk
@@ -0,0 +1,25 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = atmel-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = yes # Console for debug
14COMMAND_ENABLE = yes # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23
24# generated by KBFirmware JSON to QMK Parser
25# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/config.h b/keyboards/cmm_studio/saka68/solder/config.h
index f7153bee4..f7153bee4 100644
--- a/keyboards/cmm_studio/saka68/config.h
+++ b/keyboards/cmm_studio/saka68/solder/config.h
diff --git a/keyboards/cmm_studio/saka68/info.json b/keyboards/cmm_studio/saka68/solder/info.json
index ac6d0465a..3829d1553 100644
--- a/keyboards/cmm_studio/saka68/info.json
+++ b/keyboards/cmm_studio/saka68/solder/info.json
@@ -1,4 +1,6 @@
1{ 1{
2 "keyboard_name": "CMM.Studio Saka68",
3 "url": "",
2 "maintainer": "qmk", 4 "maintainer": "qmk",
3 "width": 17.25, 5 "width": 17.25,
4 "height": 5, 6 "height": 5,
diff --git a/keyboards/cmm_studio/saka68/keymaps/default/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
index 7d4bd43e7..88f6db4ed 100644
--- a/keyboards/cmm_studio/saka68/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_HOME, 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_HOME,
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_END, 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_END,
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_LSFT, 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_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
diff --git a/keyboards/cmm_studio/saka68/keymaps/via/keymap.c b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
index 602bccd4c..bd55f0d85 100644
--- a/keyboards/cmm_studio/saka68/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/via/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_HOME, 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_HOME,
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_END, 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_END,
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_LSFT, 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_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
28 [1] = LAYOUT( 28 [1] = LAYOUT(
diff --git a/keyboards/cmm_studio/saka68/solder/keymaps/via/rules.mk b/keyboards/cmm_studio/saka68/solder/keymaps/via/rules.mk
new file mode 100644
index 000000000..eb5b445dd
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2MOUSEKEY_ENABLE = yes
diff --git a/keyboards/cmm_studio/saka68/solder/readme.md b/keyboards/cmm_studio/saka68/solder/readme.md
new file mode 100644
index 000000000..b668c5f70
--- /dev/null
+++ b/keyboards/cmm_studio/saka68/solder/readme.md
@@ -0,0 +1,17 @@
1# CMM.Studio Saka68
2
3CMM.Studio Saka68 Keyboard
4
5![CMM.Studio Saka68](https://i.imgur.com/gZ9Thjel.png)
6
7* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
8* Hardware Supported: PCB, Atmega32u4
9
10Make example for this keyboard (after setting up your build environment):
11
12 make cmm_studio/saka68/solder:default
13
14
15For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
16
17See 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).
diff --git a/keyboards/cmm_studio/saka68/rules.mk b/keyboards/cmm_studio/saka68/solder/rules.mk
index a90eef1fc..a90eef1fc 100644
--- a/keyboards/cmm_studio/saka68/rules.mk
+++ b/keyboards/cmm_studio/saka68/solder/rules.mk
diff --git a/keyboards/cmm_studio/saka68/saka68.c b/keyboards/cmm_studio/saka68/solder/solder.c
index f15be8d2f..5ff4cf0b9 100644
--- a/keyboards/cmm_studio/saka68/saka68.c
+++ b/keyboards/cmm_studio/saka68/solder/solder.c
@@ -14,7 +14,7 @@
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 "saka68.h" 17#include "solder.h"
18 18
19// generated by KBFirmware JSON to QMK Parser 19// generated by KBFirmware JSON to QMK Parser
20// https://noroadsleft.github.io/kbf_qmk_converter/ 20// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/saka68/saka68.h b/keyboards/cmm_studio/saka68/solder/solder.h
index 4d1d02163..4d1d02163 100644
--- a/keyboards/cmm_studio/saka68/saka68.h
+++ b/keyboards/cmm_studio/saka68/solder/solder.h
diff --git a/keyboards/ploopyco/opt_encoder.c b/keyboards/ploopyco/opt_encoder.c
index 44bcd5eb8..8698351c2 100644
--- a/keyboards/ploopyco/opt_encoder.c
+++ b/keyboards/ploopyco/opt_encoder.c
@@ -16,6 +16,34 @@
16 */ 16 */
17#include "opt_encoder.h" 17#include "opt_encoder.h"
18 18
19enum State state;
20
21/* Variables used for scroll wheel functionality. */
22bool lohif;
23bool hilof;
24int lowA;
25int highA;
26bool cLowA;
27bool cHighA;
28int lowIndexA;
29int highIndexA;
30bool lowOverflowA;
31bool highOverflowA;
32int lowB;
33int highB;
34bool cLowB;
35bool cHighB;
36int lowIndexB;
37int highIndexB;
38bool lowOverflowB;
39bool highOverflowB;
40int scrollThresholdA;
41int scrollThresholdB;
42int arLowA[SCROLLER_AR_SIZE];
43int arHighA[SCROLLER_AR_SIZE];
44int arLowB[SCROLLER_AR_SIZE];
45int arHighB[SCROLLER_AR_SIZE];
46
19/* Setup function for the scroll wheel. Initializes 47/* Setup function for the scroll wheel. Initializes
20 the relevant variables. */ 48 the relevant variables. */
21void opt_encoder_init(void) { 49void opt_encoder_init(void) {
diff --git a/keyboards/ploopyco/opt_encoder.h b/keyboards/ploopyco/opt_encoder.h
index 23a170d59..17c25bc86 100644
--- a/keyboards/ploopyco/opt_encoder.h
+++ b/keyboards/ploopyco/opt_encoder.h
@@ -28,33 +28,33 @@
28 28
29enum State { HIHI, HILO, LOLO, LOHI }; 29enum State { HIHI, HILO, LOLO, LOHI };
30 30
31enum State state; 31extern enum State state;
32 32
33/* Variables used for scroll wheel functionality. */ 33/* Variables used for scroll wheel functionality. */
34bool lohif; 34extern bool lohif;
35bool hilof; 35extern bool hilof;
36int lowA; 36extern int lowA;
37int highA; 37extern int highA;
38bool cLowA; 38extern bool cLowA;
39bool cHighA; 39extern bool cHighA;
40int lowIndexA; 40extern int lowIndexA;
41int highIndexA; 41extern int highIndexA;
42bool lowOverflowA; 42extern bool lowOverflowA;
43bool highOverflowA; 43extern bool highOverflowA;
44int lowB; 44extern int lowB;
45int highB; 45extern int highB;
46bool cLowB; 46extern bool cLowB;
47bool cHighB; 47extern bool cHighB;
48int lowIndexB; 48extern int lowIndexB;
49int highIndexB; 49extern int highIndexB;
50bool lowOverflowB; 50extern bool lowOverflowB;
51bool highOverflowB; 51extern bool highOverflowB;
52int scrollThresholdA; 52extern int scrollThresholdA;
53int scrollThresholdB; 53extern int scrollThresholdB;
54int arLowA[SCROLLER_AR_SIZE]; 54extern int arLowA[SCROLLER_AR_SIZE];
55int arHighA[SCROLLER_AR_SIZE]; 55extern int arHighA[SCROLLER_AR_SIZE];
56int arLowB[SCROLLER_AR_SIZE]; 56extern int arLowB[SCROLLER_AR_SIZE];
57int arHighB[SCROLLER_AR_SIZE]; 57extern int arHighB[SCROLLER_AR_SIZE];
58 58
59void calculateThresholdA(int curA); 59void calculateThresholdA(int curA);
60void calculateThresholdB(int curB); 60void calculateThresholdB(int curB);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-12 10:51:58 +0000