aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/cmm_studio/fuji65/config.h134
-rw-r--r--keyboards/cmm_studio/fuji65/fuji65.c40
-rw-r--r--keyboards/cmm_studio/fuji65/fuji65.h76
-rw-r--r--keyboards/cmm_studio/fuji65/info.json158
-rw-r--r--keyboards/cmm_studio/fuji65/keymaps/default/keymap.c72
-rw-r--r--keyboards/cmm_studio/fuji65/keymaps/via/keymap.c102
-rw-r--r--keyboards/cmm_studio/fuji65/readme.md36
7 files changed, 309 insertions, 309 deletions
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index fea03d26a..e93ae62c6 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -1,67 +1,67 @@
1/* Copyright 2021 CMM.Studio Freather 1/* Copyright 2021 CMM.Studio Freather
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 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 "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0x434D 22#define VENDOR_ID 0x434D
23#define PRODUCT_ID 0x364D 23#define PRODUCT_ID 0x364D
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER CMM.Studio 25#define MANUFACTURER CMM.Studio
26#define PRODUCT Fuji65 26#define PRODUCT Fuji65
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 5 29#define MATRIX_ROWS 5
30#define MATRIX_COLS 15 30#define MATRIX_COLS 15
31 31
32/* 32/*
33 * Keyboard Matrix Assignments 33 * Keyboard Matrix Assignments
34 * 34 *
35 * Change this to how you wired your keyboard 35 * Change this to how you wired your keyboard
36 * COLS: AVR pins used for columns, left to right 36 * COLS: AVR pins used for columns, left to right
37 * ROWS: AVR pins used for rows, top to bottom 37 * ROWS: AVR pins used for rows, top to bottom
38 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) 38 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
39 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) 39 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
40 * 40 *
41 */ 41 */
42#define MATRIX_ROW_PINS { B5, B4, D7, D6, B6 } 42#define MATRIX_ROW_PINS { B5, B4, D7, D6, B6 }
43#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 } 43#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
44 44
45#define DIODE_DIRECTION COL2ROW 45#define DIODE_DIRECTION COL2ROW
46 46
47#define RGB_DI_PIN E6 47#define RGB_DI_PIN E6
48#ifdef RGB_DI_PIN 48#ifdef RGB_DI_PIN
49 #define RGBLED_NUM 8 49 #define RGBLED_NUM 8
50 #define RGBLIGHT_HUE_STEP 8 50 #define RGBLIGHT_HUE_STEP 8
51 #define RGBLIGHT_SAT_STEP 8 51 #define RGBLIGHT_SAT_STEP 8
52 #define RGBLIGHT_VAL_STEP 8 52 #define RGBLIGHT_VAL_STEP 8
53 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ 53 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
54 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ 54 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
55 #define RGBLIGHT_EFFECT_BREATHING 55 #define RGBLIGHT_EFFECT_BREATHING
56 #define RGBLIGHT_EFFECT_RAINBOW_MOOD 56 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
57 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL 57 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
58 #define RGBLIGHT_EFFECT_SNAKE 58 #define RGBLIGHT_EFFECT_SNAKE
59 #define RGBLIGHT_EFFECT_KNIGHT 59 #define RGBLIGHT_EFFECT_KNIGHT
60 #define RGBLIGHT_EFFECT_CHRISTMAS 60 #define RGBLIGHT_EFFECT_CHRISTMAS
61 #define RGBLIGHT_EFFECT_STATIC_GRADIENT 61 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
62 #define RGBLIGHT_EFFECT_RGB_TEST 62 #define RGBLIGHT_EFFECT_RGB_TEST
63 #define RGBLIGHT_EFFECT_ALTERNATING 63 #define RGBLIGHT_EFFECT_ALTERNATING
64#endif 64#endif
65 65
66// generated by KBFirmware JSON to QMK Parser 66// generated by KBFirmware JSON to QMK Parser
67// https://noroadsleft.github.io/kbf_qmk_converter/ 67// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c
index 07a03710c..46695a0d2 100644
--- a/keyboards/cmm_studio/fuji65/fuji65.c
+++ b/keyboards/cmm_studio/fuji65/fuji65.c
@@ -1,20 +1,20 @@
1/* Copyright 2020 CMM.Studio Freather 1/* Copyright 2020 CMM.Studio Freather
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "fuji65.h" 17#include "fuji65.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/fuji65/fuji65.h b/keyboards/cmm_studio/fuji65/fuji65.h
index 479c0a4fd..d5c1e02ec 100644
--- a/keyboards/cmm_studio/fuji65/fuji65.h
+++ b/keyboards/cmm_studio/fuji65/fuji65.h
@@ -1,38 +1,38 @@
1/* Copyright 2021 CMM.Studio Freather 1/* Copyright 2021 CMM.Studio Freather
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 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 XXX KC_NO 21#define XXX KC_NO
22 22
23#define LAYOUT( \ 23#define LAYOUT( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ 24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ 25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ 26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
27 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ 27 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
28 K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ 28 K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
29) { \ 29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ 30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ 31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \ 32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
33 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ 33 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
34 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \ 34 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \
35} 35}
36 36
37// generated by KBFirmware JSON to QMK Parser 37// generated by KBFirmware JSON to QMK Parser
38// https://noroadsleft.github.io/kbf_qmk_converter/ 38// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 3a679103e..9311f2545 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -1,79 +1,79 @@
1{ 1{
2 "keyboard_name": "cmm.studio fuji65", 2 "keyboard_name": "cmm.studio fuji65",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "qmk",
5 "layouts": { 5 "layouts": {
6 "LAYOUT": { 6 "LAYOUT": {
7 "layout": [ 7 "layout": [
8 { "label": "K00 (B5,F7)", "x": 0, "y": 0 }, 8 { "label": "K00 (B5,F7)", "x": 0, "y": 0 },
9 { "label": "K01 (B5,F6)", "x": 1, "y": 0 }, 9 { "label": "K01 (B5,F6)", "x": 1, "y": 0 },
10 { "label": "K02 (B5,F5)", "x": 2, "y": 0 }, 10 { "label": "K02 (B5,F5)", "x": 2, "y": 0 },
11 { "label": "K03 (B5,F4)", "x": 3, "y": 0 }, 11 { "label": "K03 (B5,F4)", "x": 3, "y": 0 },
12 { "label": "K04 (B5,F1)", "x": 4, "y": 0 }, 12 { "label": "K04 (B5,F1)", "x": 4, "y": 0 },
13 { "label": "K05 (B5,F0)", "x": 5, "y": 0 }, 13 { "label": "K05 (B5,F0)", "x": 5, "y": 0 },
14 { "label": "K06 (B5,B0)", "x": 6, "y": 0 }, 14 { "label": "K06 (B5,B0)", "x": 6, "y": 0 },
15 { "label": "K07 (B5,B1)", "x": 7, "y": 0 }, 15 { "label": "K07 (B5,B1)", "x": 7, "y": 0 },
16 { "label": "K08 (B5,B2)", "x": 8, "y": 0 }, 16 { "label": "K08 (B5,B2)", "x": 8, "y": 0 },
17 { "label": "K09 (B5,B3)", "x": 9, "y": 0 }, 17 { "label": "K09 (B5,B3)", "x": 9, "y": 0 },
18 { "label": "K0A (B5,D5)", "x": 10, "y": 0 }, 18 { "label": "K0A (B5,D5)", "x": 10, "y": 0 },
19 { "label": "K0B (B5,D3)", "x": 11, "y": 0 }, 19 { "label": "K0B (B5,D3)", "x": 11, "y": 0 },
20 { "label": "K0C (B5,D2)", "x": 12, "y": 0 }, 20 { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
21 { "label": "K0D (B5,D1)", "x": 13, "y": 0 }, 21 { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
22 { "label": "K0E (B5,D0)", "x": 14, "y": 0 }, 22 { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
23 { "label": "K10 (B4,F7)", "x": 0, "y": 1 }, 23 { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
24 { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 }, 24 { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
25 { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 }, 25 { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
26 { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 }, 26 { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
27 { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 }, 27 { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 },
28 { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 }, 28 { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 },
29 { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 }, 29 { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 },
30 { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 }, 30 { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 },
31 { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 }, 31 { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 },
32 { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 }, 32 { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 },
33 { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 }, 33 { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 },
34 { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 }, 34 { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 },
35 { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 }, 35 { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 },
36 { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 }, 36 { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 },
37 { "label": "K1E (B4,D0)", "x": 15, "y": 1 }, 37 { "label": "K1E (B4,D0)", "x": 15, "y": 1 },
38 { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 }, 38 { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 },
39 { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 }, 39 { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 },
40 { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 }, 40 { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 },
41 { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 }, 41 { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 },
42 { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 }, 42 { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 },
43 { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 }, 43 { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 },
44 { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 }, 44 { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 },
45 { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 }, 45 { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 },
46 { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 }, 46 { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 },
47 { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 }, 47 { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 },
48 { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 }, 48 { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 },
49 { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 }, 49 { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 },
50 { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 }, 50 { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
51 { "label": "K2E (D7,D0)", "x": 15, "y": 2 }, 51 { "label": "K2E (D7,D0)", "x": 15, "y": 2 },
52 { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 }, 52 { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 },
53 { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 }, 53 { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
54 { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 }, 54 { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
55 { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 }, 55 { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
56 { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 }, 56 { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
57 { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 }, 57 { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 },
58 { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 }, 58 { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 },
59 { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 }, 59 { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 },
60 { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 }, 60 { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 },
61 { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 }, 61 { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 },
62 { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 }, 62 { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 },
63 { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 }, 63 { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 },
64 { "label": "K3D (D6,D1)", "x": 14, "y": 3 }, 64 { "label": "K3D (D6,D1)", "x": 14, "y": 3 },
65 { "label": "K3E (D6,D0)", "x": 15, "y": 3 }, 65 { "label": "K3E (D6,D0)", "x": 15, "y": 3 },
66 { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 }, 66 { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 },
67 { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 }, 67 { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 },
68 { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 }, 68 { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 },
69 { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 }, 69 { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 },
70 { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 }, 70 { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 },
71 { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 }, 71 { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 },
72 { "label": "K4B (B6,D3)", "x": 13, "y": 4 }, 72 { "label": "K4B (B6,D3)", "x": 13, "y": 4 },
73 { "label": "K4C (B6,D2)", "x": 14, "y": 4 }, 73 { "label": "K4C (B6,D2)", "x": 14, "y": 4 },
74 { "label": "K4D (B6,D1)", "x": 15, "y": 4 } 74 { "label": "K4D (B6,D1)", "x": 15, "y": 4 }
75 ] 75 ]
76 } 76 }
77 } 77 }
78 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" 78 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
79} 79}
diff --git a/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
index e5b609e23..da0538c82 100644
--- a/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
@@ -1,36 +1,36 @@
1/* Copyright 2020 CMM.Studio Freather 1/* Copyright 2020 CMM.Studio Freather
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 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
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 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_GRV, KC_BSLS, 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_GRV, KC_BSLS,
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_TRNS, 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_TRNS,
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, KC_TRNS, 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, KC_TRNS,
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, KC_TRNS, 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, KC_TRNS,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 27
28 [1] = LAYOUT( 28 [1] = LAYOUT(
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 29 KC_TRNS, KC_TRNS, KC_TRNS, 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, 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,
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, 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, 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, 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, KC_TRNS,
33 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
34 ), 34 ),
35 35
36}; 36};
diff --git a/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
index 1d1467d8f..6b37798c9 100644
--- a/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
@@ -1,51 +1,51 @@
1/* Copyright 2021 CMM.Studio Freather 1/* Copyright 2021 CMM.Studio Freather
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 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
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20
21 [0] = LAYOUT( 21 [0] = LAYOUT(
22 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_GRV, KC_BSLS, 22 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_GRV, KC_BSLS,
23 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_TRNS, 23 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_TRNS,
24 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_TRNS, 24 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_TRNS,
25 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, KC_TRNS, 25 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, KC_TRNS,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 28
29 [1] = LAYOUT( 29 [1] = LAYOUT(
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, 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,
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, 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, 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, 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, KC_TRNS,
33 KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
35 ), 35 ),
36 [2] = LAYOUT( 36 [2] = LAYOUT(
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, 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,
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, 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,
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, 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, 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, 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, KC_TRNS,
41 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
42 ), 42 ),
43 [3] = LAYOUT( 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, 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,
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, 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,
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, 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,
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, 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, KC_TRNS,
48 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
49 ), 49 ),
50 50
51}; 51};
diff --git a/keyboards/cmm_studio/fuji65/readme.md b/keyboards/cmm_studio/fuji65/readme.md
index debfeeb40..d5438c591 100644
--- a/keyboards/cmm_studio/fuji65/readme.md
+++ b/keyboards/cmm_studio/fuji65/readme.md
@@ -1,18 +1,18 @@
1# CMM.Studio Fuji65 1# CMM.Studio Fuji65
2 2
3CMM.Studio Fuji65 Keyboard 3CMM.Studio Fuji65 Keyboard
4 4
5![CMM.Studio Fuji65](https://i.imgur.com/dUPQpkZh.png) 5![CMM.Studio Fuji65](https://i.imgur.com/dUPQpkZh.png)
6 6
7 7
8* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather) 8* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
9* Hardware Supported: PCB, Atmega32u4 9* Hardware Supported: PCB, Atmega32u4
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
13 make cmm_studio/fuji65:default 13 make cmm_studio/fuji65:default
14 14
15 15
16For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode 16For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
17 17
18See 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). 18See 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).