From bdef77b26b0722b2d8a37728791389356825bad1 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:53:46 +0800 Subject: [PATCH 01/13] adding fuji75 pcb support adding fuji75 pcb support includes solder hotswap --- keyboards/sakura_workshop/fuji75/config.h | 8 ++ keyboards/sakura_workshop/fuji75/fuji75.c | 42 +++++++ .../sakura_workshop/fuji75/hotswap/info.json | 107 ++++++++++++++++++ .../sakura_workshop/fuji75/hotswap/readme.md | 21 ++++ .../sakura_workshop/fuji75/hotswap/rules.mk | 1 + keyboards/sakura_workshop/fuji75/info.json | 31 +++++ .../fuji75/keymaps/default/keymap.c | 16 +++ .../fuji75/keymaps/via/keymap.c | 15 +++ .../fuji75/keymaps/via/rules.mk | 1 + .../sakura_workshop/fuji75/solder/info.json | 107 ++++++++++++++++++ .../sakura_workshop/fuji75/solder/readme.md | 21 ++++ .../sakura_workshop/fuji75/solder/rules.mk | 1 + 12 files changed, 371 insertions(+) create mode 100644 keyboards/sakura_workshop/fuji75/config.h create mode 100644 keyboards/sakura_workshop/fuji75/fuji75.c create mode 100644 keyboards/sakura_workshop/fuji75/hotswap/info.json create mode 100644 keyboards/sakura_workshop/fuji75/hotswap/readme.md create mode 100644 keyboards/sakura_workshop/fuji75/hotswap/rules.mk create mode 100644 keyboards/sakura_workshop/fuji75/info.json create mode 100644 keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c create mode 100644 keyboards/sakura_workshop/fuji75/keymaps/via/keymap.c create mode 100644 keyboards/sakura_workshop/fuji75/keymaps/via/rules.mk create mode 100644 keyboards/sakura_workshop/fuji75/solder/info.json create mode 100644 keyboards/sakura_workshop/fuji75/solder/readme.md create mode 100644 keyboards/sakura_workshop/fuji75/solder/rules.mk diff --git a/keyboards/sakura_workshop/fuji75/config.h b/keyboards/sakura_workshop/fuji75/config.h new file mode 100644 index 000000000000..327ec41541a8 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/config.h @@ -0,0 +1,8 @@ +// Copyright 2023 CMM.S Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + #define RGBLIGHT_LAYERS 2 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sakura_workshop/fuji75/fuji75.c b/keyboards/sakura_workshop/fuji75/fuji75.c new file mode 100644 index 000000000000..ce6eaeacf9ec --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/fuji75.c @@ -0,0 +1,42 @@ +/* Copyright 2023 CMM.S Freather + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( + {0,1,HSV_WHITE} +); + +const rgblight_segment_t PROGMEM my_capsoff_layer[] = RGBLIGHT_LAYER_SEGMENTS ( + {0,1,HSV_BLACK} +); + + +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_capsoff_layer +); + +void keyboard_post_init_user(void){ + rgblight_layers = my_rgb_layers; +} + + +bool led_update_user(led_t led_state) { + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_set_layer_state(1, !led_state.caps_lock); + return true; +} diff --git a/keyboards/sakura_workshop/fuji75/hotswap/info.json b/keyboards/sakura_workshop/fuji75/hotswap/info.json new file mode 100644 index 000000000000..9d5f63bfe097 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/hotswap/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "fuji75_hotswap", + "usb": { + "vid": "0x5357", + "pid": "0x4638", + "device_version": "1.0.0" + }, + "ws2812": { + "pin": "B1", + }, + "matrix_pins": { + "rows": ["D4", "B0", "B2", "D1", "D2", "D3"], + "cols": ["B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "D5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[0,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[0,9],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[0,10],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[0,11],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[0,12],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[0,13],"x": 13.75, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.25 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.25 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.25 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.25 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.25 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.25 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.25 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.25 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.25 }, + { "label": "9", "matrix":[1,9],"x": 9, "y": 1.25 }, + { "label": "0", "matrix":[1,10],"x": 10, "y": 1.25 }, + { "label": "-", "matrix":[1,11],"x": 11, "y": 1.25 }, + { "label": "=", "matrix":[1,12],"x": 12, "y": 1.25 }, + { "label": "backspace", "matrix":[1,13],"x": 13, "y": 1.25, "w": 2 }, + { "label": "home", "matrix":[1,14],"x": 15, "y": 1.25 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.25 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.25 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.25 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.25 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.25 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.25 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.25 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.25 }, + { "label": "o", "matrix":[2,9],"x": 9.5, "y": 2.25 }, + { "label": "p", "matrix":[2,10],"x": 10.5, "y": 2.25 }, + { "label": "{", "matrix":[2,11],"x": 11.5, "y": 2.25 }, + { "label": "}", "matrix":[2,12],"x": 12.5, "y": 2.25 }, + { "label": "|", "matrix":[3,13],"x": 13.5, "y": 2.25, "w": 1.5 }, + { "label": "end", "matrix":[2,14],"x": 15, "y": 2.25 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.25 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.25 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.25 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.25 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.25 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.25 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.25 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.25 }, + { "label": "l", "matrix":[3,9],"x": 9.75, "y": 3.25 }, + { "label": ";", "matrix":[3,10],"x": 10.75, "y": 3.25 }, + { "label": "'", "matrix":[3,11],"x": 11.75, "y": 3.25 }, + { "label": "enter", "matrix":[3,12],"x": 12.75, "y": 3.25, "w": 2.25 }, + { "label": "insert", "matrix":[3,14],"x": 15, "y": 3.25 }, + + { "label": "leftshift", "matrix":[4,1],"x": 0, "y": 4.25, "w": 2.25 }, + { "label": "z", "matrix":[4,2],"x": 2.25, "y": 4.25 }, + { "label": "x", "matrix":[4,3],"x": 3.25, "y": 4.25 }, + { "label": "c", "matrix":[4,4],"x": 4.25, "y": 4.25 }, + { "label": "v", "matrix":[4,5],"x": 5.25, "y": 4.25 }, + { "label": "b", "matrix":[4,6],"x": 6.25, "y": 4.25 }, + { "label": "n", "matrix":[4,7],"x": 7.25, "y": 4.25 }, + { "label": "m", "matrix":[4,8],"x": 8.25, "y": 4.25 }, + { "label": ",", "matrix":[4,9],"x": 9.25, "y": 4.25 }, + { "label": ".", "matrix":[4,10],"x": 10.25, "y": 4.25 }, + { "label": "/", "matrix":[4,11],"x": 11.25, "y": 4.25 }, + { "label": "rightshift", "matrix":[4,12],"x": 12.25, "y": 4.25, "w": 1.75 }, + { "label": "up", "matrix":[4,13],"x": 14, "y": 4.25 }, + { "label": "delete", "matrix":[4,14],"x": 15, "y": 4.25 }, + + { "label": "lctrl", "matrix":[5,0],"x": 0, "y": 5.25, "w": 1.25 }, + { "label": "lwin", "matrix":[5,1],"x": 1.25, "y": 5.25, "w": 1.25 }, + { "label": "lalt", "matrix":[5,2],"x": 2.5, "y": 5.25, "w": 1.25 }, + { "label": "space", "matrix":[5,6],"x": 3.75, "y": 5.25, "w": 6.25 }, + { "label": "ralt", "matrix":[5,10],"x": 10, "y": 5.25, "w": 1.5 }, + { "label": "rctrl", "matrix":[5,11],"x": 11.5, "y": 5.25, "w": 1.5 }, + { "label": "left", "matrix":[5,12],"x": 13, "y": 5.25, "w":1.5}, + { "label": "down", "matrix":[5,13],"x": 14, "y": 5.25 }, + { "label": "right", "matrix":[5,14],"x": 15, "y": 5.25 } + ] + } + }, +} diff --git a/keyboards/sakura_workshop/fuji75/hotswap/readme.md b/keyboards/sakura_workshop/fuji75/hotswap/readme.md new file mode 100644 index 000000000000..8bfa6048f008 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/hotswap/readme.md @@ -0,0 +1,21 @@ +#Fuji Hotswap + +![Fuji hotswap](https://i.imgur.com/SfucJxa.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make sakura_workshop/fuji75/hotswap:default + +Flashing example for this keyboard: + + make sakura_workshop/fuji75/hotswap:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +See 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/sakura_workshop/fuji75/hotswap/rules.mk b/keyboards/sakura_workshop/fuji75/hotswap/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/sakura_workshop/fuji75/info.json b/keyboards/sakura_workshop/fuji75/info.json new file mode 100644 index 000000000000..ceacdaf029a7 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/info.json @@ -0,0 +1,31 @@ +{ + "manufacturer": "SakuraWorkshop", + "url": "", + "maintainer": "Freather", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, + "rgblight": { + "led_count": 1, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + } +} diff --git a/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c new file mode 100644 index 000000000000..91bc197bce39 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c @@ -0,0 +1,16 @@ +// Copyright 2023 CMM.S Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, 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_F13, + KC_GRV, 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_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_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_INS, + 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_DEL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + +}; diff --git a/keyboards/sakura_workshop/fuji75/keymaps/via/keymap.c b/keyboards/sakura_workshop/fuji75/keymaps/via/keymap.c new file mode 100644 index 000000000000..5d7a381d6a79 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/keymaps/via/keymap.c @@ -0,0 +1,15 @@ +// Copyright 2023 CMM.S Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, 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_F13, + KC_GRV, 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_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_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_INS, + 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_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/sakura_workshop/fuji75/keymaps/via/rules.mk b/keyboards/sakura_workshop/fuji75/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/sakura_workshop/fuji75/solder/info.json b/keyboards/sakura_workshop/fuji75/solder/info.json new file mode 100644 index 000000000000..762f261ec4df --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/solder/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "fuji75_solder", + "usb": { + "vid": "0x5357", + "pid": "0x4637", + "device_version": "1.0.0" + }, + "ws2812": { + "pin": "E6", + }, + "matrix_pins": { + "rows": ["C6", "B0", "B3", "D1", "D3", "D2"], + "cols": ["D4", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B1", "D5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[0,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[0,9],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[0,10],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[0,11],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[0,12],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[0,13],"x": 13.75, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.25 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.25 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.25 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.25 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.25 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.25 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.25 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.25 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.25 }, + { "label": "9", "matrix":[1,9],"x": 9, "y": 1.25 }, + { "label": "0", "matrix":[1,10],"x": 10, "y": 1.25 }, + { "label": "-", "matrix":[1,11],"x": 11, "y": 1.25 }, + { "label": "=", "matrix":[1,12],"x": 12, "y": 1.25 }, + { "label": "backspace", "matrix":[1,13],"x": 13, "y": 1.25, "w": 2 }, + { "label": "home", "matrix":[1,14],"x": 15, "y": 1.25 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.25 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.25 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.25 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.25 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.25 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.25 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.25 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.25 }, + { "label": "o", "matrix":[2,9],"x": 9.5, "y": 2.25 }, + { "label": "p", "matrix":[2,10],"x": 10.5, "y": 2.25 }, + { "label": "{", "matrix":[2,11],"x": 11.5, "y": 2.25 }, + { "label": "}", "matrix":[2,12],"x": 12.5, "y": 2.25 }, + { "label": "|", "matrix":[3,13],"x": 13.5, "y": 2.25, "w": 1.5 }, + { "label": "end", "matrix":[2,14],"x": 15, "y": 2.25 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.25 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.25 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.25 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.25 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.25 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.25 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.25 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.25 }, + { "label": "l", "matrix":[3,9],"x": 9.75, "y": 3.25 }, + { "label": ";", "matrix":[3,10],"x": 10.75, "y": 3.25 }, + { "label": "'", "matrix":[3,11],"x": 11.75, "y": 3.25 }, + { "label": "enter", "matrix":[3,12],"x": 12.75, "y": 3.25, "w": 2.25 }, + { "label": "insert", "matrix":[3,14],"x": 15, "y": 3.25 }, + + { "label": "leftshift", "matrix":[4,1],"x": 0, "y": 4.25, "w": 2.25 }, + { "label": "z", "matrix":[4,2],"x": 2.25, "y": 4.25 }, + { "label": "x", "matrix":[4,3],"x": 3.25, "y": 4.25 }, + { "label": "c", "matrix":[4,4],"x": 4.25, "y": 4.25 }, + { "label": "v", "matrix":[4,5],"x": 5.25, "y": 4.25 }, + { "label": "b", "matrix":[4,6],"x": 6.25, "y": 4.25 }, + { "label": "n", "matrix":[4,7],"x": 7.25, "y": 4.25 }, + { "label": "m", "matrix":[4,8],"x": 8.25, "y": 4.25 }, + { "label": ",", "matrix":[4,9],"x": 9.25, "y": 4.25 }, + { "label": ".", "matrix":[4,10],"x": 10.25, "y": 4.25 }, + { "label": "/", "matrix":[4,11],"x": 11.25, "y": 4.25 }, + { "label": "rightshift", "matrix":[4,12],"x": 12.25, "y": 4.25, "w": 1.75 }, + { "label": "up", "matrix":[4,13],"x": 14, "y": 4.25 }, + { "label": "delete", "matrix":[4,14],"x": 15, "y": 4.25 }, + + { "label": "lctrl", "matrix":[5,0],"x": 0, "y": 5.25, "w": 1.25 }, + { "label": "lwin", "matrix":[5,1],"x": 1.25, "y": 5.25, "w": 1.25 }, + { "label": "lalt", "matrix":[5,2],"x": 2.5, "y": 5.25, "w": 1.25 }, + { "label": "space", "matrix":[5,6],"x": 3.75, "y": 5.25, "w": 6.25 }, + { "label": "ralt", "matrix":[5,10],"x": 10, "y": 5.25, "w": 1.5 }, + { "label": "rctrl", "matrix":[5,11],"x": 11.5, "y": 5.25, "w": 1.5 }, + { "label": "left", "matrix":[5,12],"x": 13, "y": 5.25, "w":1.5}, + { "label": "down", "matrix":[5,13],"x": 14, "y": 5.25 }, + { "label": "right", "matrix":[5,14],"x": 15, "y": 5.25 } + ] + } + }, +} diff --git a/keyboards/sakura_workshop/fuji75/solder/readme.md b/keyboards/sakura_workshop/fuji75/solder/readme.md new file mode 100644 index 000000000000..d636056efe83 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/solder/readme.md @@ -0,0 +1,21 @@ +# Fuji75 Solder + +![Fuji75 Solder](https://i.imgur.com/tv6YdWt.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make sakura_workshop/fuji75/solder:default + +Flashing example for this keyboard: + + make sakura_workshop/fuji75/solder:default:flash + +## Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +See 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/sakura_workshop/fuji75/solder/rules.mk b/keyboards/sakura_workshop/fuji75/solder/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/sakura_workshop/fuji75/solder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 0a8a972fdd843c3e3310e165208923085ca9aaf7 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:55:45 +0800 Subject: [PATCH 02/13] Update keymap.c --- keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c index 91bc197bce39..df5fe0eef2c8 100644 --- a/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c +++ b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c @@ -11,6 +11,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_INS, 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_DEL KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), + ) }; From 1145da8a5e3f2619e5d8aee7e2ca7153aa46cee9 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 28 Sep 2023 22:04:01 +0800 Subject: [PATCH 03/13] Update keymap.c --- keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c index df5fe0eef2c8..5d7a381d6a79 100644 --- a/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c +++ b/keyboards/sakura_workshop/fuji75/keymaps/default/keymap.c @@ -4,13 +4,12 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT( KC_ESC, 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_F13, KC_GRV, 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_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_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_INS, - 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_DEL + 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_DEL, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) - + ) }; From 41a21bf7ee4b75301b7d5ce7d53b1bc53e8b0a52 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 03:31:41 +0800 Subject: [PATCH 04/13] Update keyboards/sakura_workshop/fuji75/fuji75.c Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/fuji75.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/fuji75.c b/keyboards/sakura_workshop/fuji75/fuji75.c index ce6eaeacf9ec..7103e70300e5 100644 --- a/keyboards/sakura_workshop/fuji75/fuji75.c +++ b/keyboards/sakura_workshop/fuji75/fuji75.c @@ -30,13 +30,17 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( my_capsoff_layer ); -void keyboard_post_init_user(void){ +void keyboard_post_init_kb(void) { rgblight_layers = my_rgb_layers; + + keyboard_post_init_user(); } - -bool led_update_user(led_t led_state) { - rgblight_set_layer_state(0, led_state.caps_lock); - rgblight_set_layer_state(1, !led_state.caps_lock); - return true; +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_set_layer_state(1, !led_state.caps_lock); + } + return res; } From c72a6fa7c2f096ce9f535e096b94ebf018a06305 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 03:31:50 +0800 Subject: [PATCH 05/13] Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/solder/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/solder/readme.md b/keyboards/sakura_workshop/fuji75/solder/readme.md index d636056efe83..45b0c164ec90 100644 --- a/keyboards/sakura_workshop/fuji75/solder/readme.md +++ b/keyboards/sakura_workshop/fuji75/solder/readme.md @@ -14,8 +14,12 @@ Flashing example for this keyboard: make sakura_workshop/fuji75/solder:default:flash -## Bootloader Atmel-DFU +See 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). -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode +## Bootloader -See 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). +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 82d12bfd74808bc00980d67b4b005c17e03b9cdc Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 03:31:57 +0800 Subject: [PATCH 06/13] Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/hotswap/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/hotswap/readme.md b/keyboards/sakura_workshop/fuji75/hotswap/readme.md index 8bfa6048f008..19e6266b6f80 100644 --- a/keyboards/sakura_workshop/fuji75/hotswap/readme.md +++ b/keyboards/sakura_workshop/fuji75/hotswap/readme.md @@ -14,8 +14,12 @@ Flashing example for this keyboard: make sakura_workshop/fuji75/hotswap:default:flash -##Bootloader Atmel-DFU +See 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). -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode +## Bootloader -See 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). +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 26799567c05b71f7326e674d207d25c0510641cc Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 03:32:10 +0800 Subject: [PATCH 07/13] Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/solder/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/sakura_workshop/fuji75/solder/readme.md b/keyboards/sakura_workshop/fuji75/solder/readme.md index 45b0c164ec90..90da39ee5040 100644 --- a/keyboards/sakura_workshop/fuji75/solder/readme.md +++ b/keyboards/sakura_workshop/fuji75/solder/readme.md @@ -2,7 +2,6 @@ ![Fuji75 Solder](https://i.imgur.com/tv6YdWt.png) - * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) * Hardware Supported: PCB, Atmega32u4 From fab8cf8750effcb41b59d33a9ddb27d6f57dd126 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 03:32:17 +0800 Subject: [PATCH 08/13] Update keyboards/sakura_workshop/fuji75/info.json Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/sakura_workshop/fuji75/info.json b/keyboards/sakura_workshop/fuji75/info.json index ceacdaf029a7..7b56fd4d7220 100644 --- a/keyboards/sakura_workshop/fuji75/info.json +++ b/keyboards/sakura_workshop/fuji75/info.json @@ -14,6 +14,9 @@ }, "rgblight": { "led_count": 1, + "layers": { + "enabled": true + }, "sleep": true, "animations": { "alternating": true, From 941c5bbb5be220f2eb946650047386f430c36c8a Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 13:15:18 +0800 Subject: [PATCH 09/13] Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Joel Challis --- keyboards/sakura_workshop/fuji75/hotswap/readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/hotswap/readme.md b/keyboards/sakura_workshop/fuji75/hotswap/readme.md index 19e6266b6f80..d6ca949022f9 100644 --- a/keyboards/sakura_workshop/fuji75/hotswap/readme.md +++ b/keyboards/sakura_workshop/fuji75/hotswap/readme.md @@ -1,7 +1,6 @@ -#Fuji Hotswap - -![Fuji hotswap](https://i.imgur.com/SfucJxa.png) +# Fuji75 Hotswap +![Fuji75 hotswap](https://i.imgur.com/SfucJxa.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) * Hardware Supported: PCB, Atmega32u4 From ebfeb706549909730db104b1dbb87734e7dc41a0 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 30 Sep 2023 13:16:34 +0800 Subject: [PATCH 10/13] Delete keyboards/sakura_workshop/fuji75/config.h --- keyboards/sakura_workshop/fuji75/config.h | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 keyboards/sakura_workshop/fuji75/config.h diff --git a/keyboards/sakura_workshop/fuji75/config.h b/keyboards/sakura_workshop/fuji75/config.h deleted file mode 100644 index 327ec41541a8..000000000000 --- a/keyboards/sakura_workshop/fuji75/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2023 CMM.S Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - #define RGBLIGHT_LAYERS 2 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ From c7c4a0000837a6e4a9e535a83f7a2802b5ed4498 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sun, 1 Oct 2023 21:11:48 -0500 Subject: [PATCH 11/13] Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Drashna Jaelre --- keyboards/sakura_workshop/fuji75/solder/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sakura_workshop/fuji75/solder/readme.md b/keyboards/sakura_workshop/fuji75/solder/readme.md index 90da39ee5040..b0d6f30b354b 100644 --- a/keyboards/sakura_workshop/fuji75/solder/readme.md +++ b/keyboards/sakura_workshop/fuji75/solder/readme.md @@ -1,6 +1,6 @@ # Fuji75 Solder -![Fuji75 Solder](https://i.imgur.com/tv6YdWt.png) +![Fuji75 Solder](https://i.imgur.com/tv6YdWth.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) * Hardware Supported: PCB, Atmega32u4 From c18ccb887da82a2d544e2726f01de7f163dd89ab Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sun, 1 Oct 2023 21:11:55 -0500 Subject: [PATCH 12/13] Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Drashna Jaelre --- keyboards/sakura_workshop/fuji75/hotswap/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sakura_workshop/fuji75/hotswap/readme.md b/keyboards/sakura_workshop/fuji75/hotswap/readme.md index d6ca949022f9..8f5576ef043c 100644 --- a/keyboards/sakura_workshop/fuji75/hotswap/readme.md +++ b/keyboards/sakura_workshop/fuji75/hotswap/readme.md @@ -1,6 +1,6 @@ # Fuji75 Hotswap -![Fuji75 hotswap](https://i.imgur.com/SfucJxa.png) +![Fuji75 hotswap](https://i.imgur.com/SfucJxah.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) * Hardware Supported: PCB, Atmega32u4 From 9460ac2401ecc2af0ebfc16c06da89dd2410b6ec Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 14 Dec 2023 02:35:12 +0800 Subject: [PATCH 13/13] update info.json update info.json per requested by @fauxpark reran qmk format-json --- .../sakura_workshop/fuji75/hotswap/info.json | 203 +++++++++--------- .../sakura_workshop/fuji75/solder/info.json | 187 ++++++++-------- 2 files changed, 190 insertions(+), 200 deletions(-) diff --git a/keyboards/sakura_workshop/fuji75/hotswap/info.json b/keyboards/sakura_workshop/fuji75/hotswap/info.json index 9d5f63bfe097..a19c88a010ba 100644 --- a/keyboards/sakura_workshop/fuji75/hotswap/info.json +++ b/keyboards/sakura_workshop/fuji75/hotswap/info.json @@ -1,107 +1,102 @@ { - "keyboard_name": "fuji75_hotswap", - "usb": { - "vid": "0x5357", - "pid": "0x4638", - "device_version": "1.0.0" - }, - "ws2812": { - "pin": "B1", - }, - "matrix_pins": { - "rows": ["D4", "B0", "B2", "D1", "D2", "D3"], - "cols": ["B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "D5"] - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, - { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, - { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, - { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, - { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, - { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, - { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, - { "label": "F8", "matrix":[0,8],"x": 8.5, "y": 0 }, - { "label": "F9", "matrix":[0,9],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[0,10],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[0,11],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[0,12],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[0,13],"x": 13.75, "y": 0 }, - - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.25 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.25 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.25 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.25 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.25 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.25 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.25 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.25 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.25 }, - { "label": "9", "matrix":[1,9],"x": 9, "y": 1.25 }, - { "label": "0", "matrix":[1,10],"x": 10, "y": 1.25 }, - { "label": "-", "matrix":[1,11],"x": 11, "y": 1.25 }, - { "label": "=", "matrix":[1,12],"x": 12, "y": 1.25 }, - { "label": "backspace", "matrix":[1,13],"x": 13, "y": 1.25, "w": 2 }, - { "label": "home", "matrix":[1,14],"x": 15, "y": 1.25 }, - - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.25 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.25 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.25 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.25 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.25 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.25 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.25 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.25 }, - { "label": "o", "matrix":[2,9],"x": 9.5, "y": 2.25 }, - { "label": "p", "matrix":[2,10],"x": 10.5, "y": 2.25 }, - { "label": "{", "matrix":[2,11],"x": 11.5, "y": 2.25 }, - { "label": "}", "matrix":[2,12],"x": 12.5, "y": 2.25 }, - { "label": "|", "matrix":[3,13],"x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "end", "matrix":[2,14],"x": 15, "y": 2.25 }, - - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.25 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.25 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.25 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.25 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.25 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.25 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.25 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.25 }, - { "label": "l", "matrix":[3,9],"x": 9.75, "y": 3.25 }, - { "label": ";", "matrix":[3,10],"x": 10.75, "y": 3.25 }, - { "label": "'", "matrix":[3,11],"x": 11.75, "y": 3.25 }, - { "label": "enter", "matrix":[3,12],"x": 12.75, "y": 3.25, "w": 2.25 }, - { "label": "insert", "matrix":[3,14],"x": 15, "y": 3.25 }, - - { "label": "leftshift", "matrix":[4,1],"x": 0, "y": 4.25, "w": 2.25 }, - { "label": "z", "matrix":[4,2],"x": 2.25, "y": 4.25 }, - { "label": "x", "matrix":[4,3],"x": 3.25, "y": 4.25 }, - { "label": "c", "matrix":[4,4],"x": 4.25, "y": 4.25 }, - { "label": "v", "matrix":[4,5],"x": 5.25, "y": 4.25 }, - { "label": "b", "matrix":[4,6],"x": 6.25, "y": 4.25 }, - { "label": "n", "matrix":[4,7],"x": 7.25, "y": 4.25 }, - { "label": "m", "matrix":[4,8],"x": 8.25, "y": 4.25 }, - { "label": ",", "matrix":[4,9],"x": 9.25, "y": 4.25 }, - { "label": ".", "matrix":[4,10],"x": 10.25, "y": 4.25 }, - { "label": "/", "matrix":[4,11],"x": 11.25, "y": 4.25 }, - { "label": "rightshift", "matrix":[4,12],"x": 12.25, "y": 4.25, "w": 1.75 }, - { "label": "up", "matrix":[4,13],"x": 14, "y": 4.25 }, - { "label": "delete", "matrix":[4,14],"x": 15, "y": 4.25 }, - - { "label": "lctrl", "matrix":[5,0],"x": 0, "y": 5.25, "w": 1.25 }, - { "label": "lwin", "matrix":[5,1],"x": 1.25, "y": 5.25, "w": 1.25 }, - { "label": "lalt", "matrix":[5,2],"x": 2.5, "y": 5.25, "w": 1.25 }, - { "label": "space", "matrix":[5,6],"x": 3.75, "y": 5.25, "w": 6.25 }, - { "label": "ralt", "matrix":[5,10],"x": 10, "y": 5.25, "w": 1.5 }, - { "label": "rctrl", "matrix":[5,11],"x": 11.5, "y": 5.25, "w": 1.5 }, - { "label": "left", "matrix":[5,12],"x": 13, "y": 5.25, "w":1.5}, - { "label": "down", "matrix":[5,13],"x": 14, "y": 5.25 }, - { "label": "right", "matrix":[5,14],"x": 15, "y": 5.25 } +"keyboard_name": "Fuji75_hotswap", + "matrix_pins": { + "cols": ["B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "D5"], + "rows": ["D4", "B0", "B2", "D1", "D2", "D3"] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x4638", + "vid": "0x5357" + }, + "ws2812": { + "pin": "B1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 13], "x": 13.75, "y": 0}, + {"label": "\uff5e", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "home", "matrix": [1, 14], "x": 15, "y": 1.25}, + {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "o", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "p", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "end", "matrix": [2, 14], "x": 15, "y": 2.25}, + {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "l", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + {"label": "leftshift", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "x", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "c", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "v", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "b", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "n", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "m", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "rightshift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "up", "matrix": [4, 13], "x": 14, "y": 4.25}, + {"label": "delete", "matrix": [4, 14], "x": 15, "y": 4.25}, + {"label": "lctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "lwin", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "lalt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "ralt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "rctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "left", "matrix": [5, 12], "x": 13, "y": 5.25, "w": 1.5}, + {"label": "down", "matrix": [5, 13], "x": 14, "y": 5.25}, + {"label": "right", "matrix": [5, 14], "x": 15, "y": 5.25} ] - } - }, + } + } } diff --git a/keyboards/sakura_workshop/fuji75/solder/info.json b/keyboards/sakura_workshop/fuji75/solder/info.json index 762f261ec4df..68bb75e4f413 100644 --- a/keyboards/sakura_workshop/fuji75/solder/info.json +++ b/keyboards/sakura_workshop/fuji75/solder/info.json @@ -1,107 +1,102 @@ { - "keyboard_name": "fuji75_solder", + "keyboard_name": "Fuji75_solder", + "matrix_pins": { + "cols": ["D4", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B1", "D5"], + "rows": ["C6", "B0", "B3", "D1", "D3", "D2"] + }, "usb": { - "vid": "0x5357", + "device_version": "1.0.0", "pid": "0x4637", - "device_version": "1.0.0" + "vid": "0x5357" }, "ws2812": { - "pin": "E6", - }, - "matrix_pins": { - "rows": ["C6", "B0", "B3", "D1", "D3", "D2"], - "cols": ["D4", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B1", "D5"] + "pin": "E6" }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, - { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, - { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, - { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, - { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, - { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, - { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, - { "label": "F8", "matrix":[0,8],"x": 8.5, "y": 0 }, - { "label": "F9", "matrix":[0,9],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[0,10],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[0,11],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[0,12],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[0,13],"x": 13.75, "y": 0 }, - - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.25 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.25 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.25 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.25 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.25 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.25 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.25 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.25 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.25 }, - { "label": "9", "matrix":[1,9],"x": 9, "y": 1.25 }, - { "label": "0", "matrix":[1,10],"x": 10, "y": 1.25 }, - { "label": "-", "matrix":[1,11],"x": 11, "y": 1.25 }, - { "label": "=", "matrix":[1,12],"x": 12, "y": 1.25 }, - { "label": "backspace", "matrix":[1,13],"x": 13, "y": 1.25, "w": 2 }, - { "label": "home", "matrix":[1,14],"x": 15, "y": 1.25 }, - - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.25, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.25 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.25 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.25 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.25 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.25 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.25 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.25 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.25 }, - { "label": "o", "matrix":[2,9],"x": 9.5, "y": 2.25 }, - { "label": "p", "matrix":[2,10],"x": 10.5, "y": 2.25 }, - { "label": "{", "matrix":[2,11],"x": 11.5, "y": 2.25 }, - { "label": "}", "matrix":[2,12],"x": 12.5, "y": 2.25 }, - { "label": "|", "matrix":[3,13],"x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "end", "matrix":[2,14],"x": 15, "y": 2.25 }, - - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.25, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.25 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.25 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.25 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.25 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.25 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.25 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.25 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.25 }, - { "label": "l", "matrix":[3,9],"x": 9.75, "y": 3.25 }, - { "label": ";", "matrix":[3,10],"x": 10.75, "y": 3.25 }, - { "label": "'", "matrix":[3,11],"x": 11.75, "y": 3.25 }, - { "label": "enter", "matrix":[3,12],"x": 12.75, "y": 3.25, "w": 2.25 }, - { "label": "insert", "matrix":[3,14],"x": 15, "y": 3.25 }, - - { "label": "leftshift", "matrix":[4,1],"x": 0, "y": 4.25, "w": 2.25 }, - { "label": "z", "matrix":[4,2],"x": 2.25, "y": 4.25 }, - { "label": "x", "matrix":[4,3],"x": 3.25, "y": 4.25 }, - { "label": "c", "matrix":[4,4],"x": 4.25, "y": 4.25 }, - { "label": "v", "matrix":[4,5],"x": 5.25, "y": 4.25 }, - { "label": "b", "matrix":[4,6],"x": 6.25, "y": 4.25 }, - { "label": "n", "matrix":[4,7],"x": 7.25, "y": 4.25 }, - { "label": "m", "matrix":[4,8],"x": 8.25, "y": 4.25 }, - { "label": ",", "matrix":[4,9],"x": 9.25, "y": 4.25 }, - { "label": ".", "matrix":[4,10],"x": 10.25, "y": 4.25 }, - { "label": "/", "matrix":[4,11],"x": 11.25, "y": 4.25 }, - { "label": "rightshift", "matrix":[4,12],"x": 12.25, "y": 4.25, "w": 1.75 }, - { "label": "up", "matrix":[4,13],"x": 14, "y": 4.25 }, - { "label": "delete", "matrix":[4,14],"x": 15, "y": 4.25 }, - - { "label": "lctrl", "matrix":[5,0],"x": 0, "y": 5.25, "w": 1.25 }, - { "label": "lwin", "matrix":[5,1],"x": 1.25, "y": 5.25, "w": 1.25 }, - { "label": "lalt", "matrix":[5,2],"x": 2.5, "y": 5.25, "w": 1.25 }, - { "label": "space", "matrix":[5,6],"x": 3.75, "y": 5.25, "w": 6.25 }, - { "label": "ralt", "matrix":[5,10],"x": 10, "y": 5.25, "w": 1.5 }, - { "label": "rctrl", "matrix":[5,11],"x": 11.5, "y": 5.25, "w": 1.5 }, - { "label": "left", "matrix":[5,12],"x": 13, "y": 5.25, "w":1.5}, - { "label": "down", "matrix":[5,13],"x": 14, "y": 5.25 }, - { "label": "right", "matrix":[5,14],"x": 15, "y": 5.25 } - ] + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [0, 13], "x": 13.75, "y": 0}, + {"label": "\uff5e", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "home", "matrix": [1, 14], "x": 15, "y": 1.25}, + {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "o", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "p", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "end", "matrix": [2, 14], "x": 15, "y": 2.25}, + {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "l", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + {"label": "leftshift", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "x", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "c", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "v", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "b", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "n", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "m", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "rightshift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "up", "matrix": [4, 13], "x": 14, "y": 4.25}, + {"label": "delete", "matrix": [4, 14], "x": 15, "y": 4.25}, + {"label": "lctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "lwin", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "lalt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "ralt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "rctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "left", "matrix": [5, 12], "x": 13, "y": 5.25, "w": 1.5}, + {"label": "down", "matrix": [5, 13], "x": 14, "y": 5.25}, + {"label": "right", "matrix": [5, 14], "x": 15, "y": 5.25} + ] } - }, + } }