Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-12-14 07:41:54 +00:00
commit 7fe03a73b8
11 changed files with 365 additions and 0 deletions

View file

@ -0,0 +1,46 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
#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_kb(void) {
rgblight_layers = my_rgb_layers;
keyboard_post_init_user();
}
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;
}

View file

@ -0,0 +1,102 @@
{
"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}
]
}
}
}

View file

@ -0,0 +1,24 @@
# Fuji75 Hotswap
![Fuji75 hotswap](https://i.imgur.com/SfucJxah.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
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).
## Bootloader
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

View file

@ -0,0 +1 @@
# This file intentionally left blank

View file

@ -0,0 +1,34 @@
{
"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,
"layers": {
"enabled": true
},
"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
}
}
}

View file

@ -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
)
};

View file

@ -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
)
};

View file

@ -0,0 +1 @@
VIA_ENABLE = yes

View file

@ -0,0 +1,102 @@
{
"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": {
"device_version": "1.0.0",
"pid": "0x4637",
"vid": "0x5357"
},
"ws2812": {
"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": "\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}
]
}
}
}

View file

@ -0,0 +1,24 @@
# Fuji75 Solder
![Fuji75 Solder](https://i.imgur.com/tv6YdWth.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
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).
## Bootloader
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

View file

@ -0,0 +1 @@
# This file intentionally left blank