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

This commit is contained in:
QMK Bot 2023-09-25 05:13:35 +00:00
commit d3b82322af
9 changed files with 387 additions and 0 deletions

View file

@ -0,0 +1,24 @@
/*
Copyright 2023 meletrix
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/>.
*/
#pragma once
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View file

@ -0,0 +1,215 @@
{
"keyboard_name": "zoom98",
"manufacturer": "meletrix",
"url": "https://meletrix.com/",
"maintainer": "spbgzh",
"usb": {
"vid": "0x36B5",
"pid": "0x27D6",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B1", "resolution": 2}
]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"rgb_matrix": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"encoder": true
},
"ws2812": {
"pin": "B7"
},
"rgb_matrix":{
"driver":"ws2812",
"max_brightness": 200,
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"rainbow_moving_chevron":true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"typing_heatmap": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multinexus": true,
"splash": true,
"solid_splash": true
},
"layout": [
{ "matrix": [0, 1], "x": 0, "y": 0, "flags": 4 },
{ "matrix": [0, 2], "x": 0, "y": 0, "flags": 4 },
{ "matrix": [2, 1], "x": 0, "y": 1, "flags": 4 },
{ "matrix": [2, 2], "x": 0, "y": 1, "flags": 4 },
{ "matrix": [4, 1], "x": 0, "y": 2, "flags": 4 },
{ "matrix": [4, 2], "x": 0, "y": 2, "flags": 4 },
{ "matrix": [6, 1], "x": 0, "y": 3, "flags": 4 },
{ "matrix": [6, 2], "x": 0, "y": 3, "flags": 4 },
{ "matrix": [8, 1], "x": 0, "y": 4, "flags": 4 },
{ "matrix": [8, 2], "x": 0, "y": 4, "flags": 4 },
{ "matrix": [1, 8], "x": 20.5, "y": 0, "flags": 4 },
{ "matrix": [1, 7], "x": 20.5, "y": 0, "flags": 4 },
{ "matrix": [3, 8], "x": 20.5, "y": 1, "flags": 4 },
{ "matrix": [3, 7], "x": 20.5, "y": 1, "flags": 4 },
{ "matrix": [5, 8], "x": 20.5, "y": 2, "flags": 4 },
{ "matrix": [5, 7], "x": 20.5, "y": 2, "flags": 4 },
{ "matrix": [7, 8], "x": 20.5, "y": 3, "flags": 4 },
{ "matrix": [7, 7], "x": 20.5, "y": 3, "flags": 4 },
{ "matrix": [9, 8], "x": 20.5, "y": 4, "flags": 4 },
{ "matrix": [9, 7], "x": 20.5, "y": 4, "flags": 4 },
{ "matrix": [6, 0], "x": 0, "y": 3.25, "flags": 1 }
]
},
"matrix_pins": {
"rows": ["E6", "B0", "F1", "D0", "F0", "B3", "C7", "D6", "B6", "C6", "B5", "D4"],
"cols": ["F7", "F4", "F6", "D2", "F5", "D5", "D1", "D7", "D3", "B4"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
{"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
{"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
{"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
{"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
{"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
{"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
{"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
{"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
{"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
{"matrix": [1, 0], "label": "F10", "x": 10.75, "y": 0},
{"matrix": [1, 1], "label": "F11", "x": 11.75, "y": 0},
{"matrix": [1, 2], "label": "F12", "x": 12.75, "y": 0},
{"matrix": [1, 3], "label": "F13", "x": 14, "y": 0},
{"matrix": [1, 4], "label": "F14", "x": 15.25, "y": 0},
{"matrix": [1, 5], "label": "Mute", "x": 16.25, "y": 0},
{"matrix": [1, 6], "label": "Home", "x": 17.5, "y": 0},
{"matrix": [1, 7], "label": "Prtsc", "x": 18.5, "y": 0},
{"matrix": [1, 8], "label": "Scroll", "x": 19.5, "y": 0},
{"matrix": [1, 9], "label": "Pause", "x": 20.5, "y": 0},
{"matrix": [2, 0], "label": "~", "x": 0, "y": 1.25},
{"matrix": [2, 1], "label": "1", "x": 1, "y": 1.25},
{"matrix": [2, 2], "label": "2", "x": 2, "y": 1.25},
{"matrix": [2, 3], "label": "3", "x": 3, "y": 1.25},
{"matrix": [2, 4], "label": "4", "x": 4, "y": 1.25},
{"matrix": [2, 5], "label": "5", "x": 5, "y": 1.25},
{"matrix": [2, 6], "label": "6", "x": 6, "y": 1.25},
{"matrix": [2, 7], "label": "7", "x": 7, "y": 1.25},
{"matrix": [2, 8], "label": "8", "x": 8, "y": 1.25},
{"matrix": [2, 9], "label": "9", "x": 9, "y": 1.25},
{"matrix": [3, 0], "label": "0", "x": 10, "y": 1.25},
{"matrix": [3, 1], "label": "-", "x": 11, "y": 1.25},
{"matrix": [3, 2], "label": "=", "x": 12, "y": 1.25},
{"matrix": [3, 3], "label": "Backspace", "x": 13, "y": 1.25},
{"matrix": [7, 4], "label": "Backspace1", "x": 14, "y": 1.25},
{"matrix": [3, 4], "label": "Ins", "x": 15.25, "y": 1.25},
{"matrix": [3, 5], "label": "PageUp", "x": 16.25, "y": 1.25},
{"matrix": [3, 6], "label": "Num", "x": 17.5, "y": 1.25},
{"matrix": [3, 7], "label": "//", "x": 18.5, "y": 1.25},
{"matrix": [3, 8], "label": "*", "x": 19.5, "y": 1.25},
{"matrix": [3, 9], "label": "-", "x": 20.5, "y": 1.25},
{"matrix": [4, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
{"matrix": [4, 1], "label": "Q", "x": 1.5, "y": 2.25},
{"matrix": [4, 2], "label": "W", "x": 2.5, "y": 2.25},
{"matrix": [4, 3], "label": "E", "x": 3.5, "y": 2.25},
{"matrix": [4, 4], "label": "R", "x": 4.5, "y": 2.25},
{"matrix": [4, 5], "label": "T", "x": 5.5, "y": 2.25},
{"matrix": [4, 6], "label": "Y", "x": 6.5, "y": 2.25},
{"matrix": [4, 7], "label": "U", "x": 7.5, "y": 2.25},
{"matrix": [4, 8], "label": "I", "x": 8.5, "y": 2.25},
{"matrix": [4, 9], "label": "O", "x": 9.5, "y": 2.25},
{"matrix": [5, 0], "label": "P", "x": 10.5, "y": 2.25},
{"matrix": [5, 1], "label": "[", "x": 11.5, "y": 2.25},
{"matrix": [5, 2], "label": "]", "x": 12.5, "y": 2.25},
{"matrix": [5, 3], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5},
{"matrix": [5, 4], "label": "Delete", "x": 15.25, "y": 2.25},
{"matrix": [5, 5], "label": "PageDown", "x": 16.25, "y": 2.25},
{"matrix": [5, 6], "label": "7", "x": 17.5, "y": 2.25},
{"matrix": [5, 7], "label": "8", "x": 18.5, "y": 2.25},
{"matrix": [5, 8], "label": "9", "x": 19.5, "y": 2.25},
{"matrix": [6, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
{"matrix": [6, 1], "label": "A", "x": 1.75, "y": 3.25},
{"matrix": [6, 2], "label": "S", "x": 2.75, "y": 3.25},
{"matrix": [6, 3], "label": "D", "x": 3.75, "y": 3.25},
{"matrix": [6, 4], "label": "F", "x": 4.75, "y": 3.25},
{"matrix": [6, 5], "label": "G", "x": 5.75, "y": 3.25},
{"matrix": [6, 6], "label": "H", "x": 6.75, "y": 3.25},
{"matrix": [6, 7], "label": "J", "x": 7.75, "y": 3.25},
{"matrix": [6, 8], "label": "K", "x": 8.75, "y": 3.25},
{"matrix": [6, 9], "label": "L", "x": 9.75, "y": 3.25},
{"matrix": [7, 0], "label": ";", "x": 10.75, "y": 3.25},
{"matrix": [7, 1], "label": "'", "x": 11.75, "y": 3.25},
{"matrix": [7, 2], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
{"matrix": [7, 6], "label": "4", "x": 17.5, "y": 3.25},
{"matrix": [7, 7], "label": "5", "x": 18.5, "y": 3.25},
{"matrix": [7, 8], "label": "6", "x": 19.5, "y": 3.25},
{"matrix": [7, 9], "label": "+", "x": 20.5, "y": 2.25,"h":2},
{"matrix": [8, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25},
{"matrix": [8, 1], "label": "Shift2", "x": 1.25, "y": 4.25},
{"matrix": [8, 2], "label": "Z", "x": 2.25, "y": 4.25},
{"matrix": [8, 3], "label": "X", "x": 3.25, "y": 4.25},
{"matrix": [8, 4], "label": "C", "x": 4.25, "y": 4.25},
{"matrix": [8, 5], "label": "V", "x": 5.25, "y": 4.25},
{"matrix": [8, 6], "label": "B", "x": 6.25, "y": 4.25},
{"matrix": [8, 7], "label": "N", "x": 7.25, "y": 4.25},
{"matrix": [8, 8], "label": "M", "x": 8.25, "y": 4.25},
{"matrix": [8, 9], "label": ",", "x": 9.25, "y": 4.25},
{"matrix": [9, 0], "label": ".", "x": 10.25, "y": 4.25},
{"matrix": [9, 1], "label": "/", "x": 11.25, "y": 4.25},
{"matrix": [9, 2], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75},
{"matrix": [9, 3], "label": "Shift2", "x": 14, "y": 4.25},
{"matrix": [9, 4], "label": "\u2191", "x": 15.25, "y": 4.25},
{"matrix": [9, 6], "label": "1", "x": 17.5, "y": 4.25},
{"matrix": [9, 7], "label": "2", "x": 18.5, "y": 4.25},
{"matrix": [9, 8], "label": "3", "x": 19.5, "y": 4.25},
{"matrix": [10, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
{"matrix": [10, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
{"matrix": [10, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
{"matrix": [10, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25},
{"matrix": [10, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25},
{"matrix": [10, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75},
{"matrix": [11, 0], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
{"matrix": [11, 1], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25},
{"matrix": [11, 2], "label": "Ctrl", "x": 12.5, "y": 5.25, "w": 1.25},
{"matrix": [11, 3], "label": "\u2190", "x": 14.25, "y": 5.25},
{"matrix": [11, 4], "label": "\u2193", "x": 15.25, "y": 5.25},
{"matrix": [11, 5], "label": "\u2192", "x": 16.25, "y": 5.25},
{"matrix": [11, 7], "label": "0", "x": 17.5, "y": 5.25, "w": 2},
{"matrix": [11, 8], "label": ".", "x": 19.5, "y": 5.25},
{"matrix": [11, 9], "label": "Enter", "x": 20.5, "y": 4.25, "h": 2}
]
}
}
}

View file

@ -0,0 +1,43 @@
/* Copyright 2023 meletrix
*
* 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 QMK_KEYBOARD_H
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), },
};
#endif
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_F14, KC_MUTE, KC_HOME, KC_PSCR, KC_SCRL, KC_PAUS,
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_BSPC, KC_INS, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_P7, KC_P8, KC_P9,
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_P4, KC_P5, KC_P6, KC_PPLS,
KC_LSFT, 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_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_PENT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};

View file

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

View file

@ -0,0 +1,44 @@
/* Copyright 2023 meletrix
*
* 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 QMK_KEYBOARD_H
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
};
#endif
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_F14, KC_MUTE, KC_HOME, KC_PSCR, KC_SCRL, KC_PAUS,
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_BSPC, KC_INS, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, KC_P7, KC_P8, KC_P9,
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_P4, KC_P5, KC_P6, KC_PPLS,
KC_LSFT, 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_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_PENT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};

View file

@ -0,0 +1,3 @@
ENCODER_MAP_ENABLE = yes
VIA_ENABLE = yes
LTO_ENABLE = yes

View file

@ -0,0 +1,25 @@
# Zoom98
More Info at [Zoom98 Wired Version](https://meletrix.com/)
* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
* Hardware Supported: Zoom98 Wired Version
* Hardware Availability: [zoom98](https://meletrix.com/)
Make example for this keyboard (after setting up your build environment):
make meletrix/zoom98:default
Flashing example for this keyboard:
make meletrix/zoom98: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 using one of the following methods:
* Tap the Reset switch mounted on the PCB
* In the case of the default keymap, use the key combination Fn + Delete
* Hold the Esc key while connecting the USB cable (also erases persistent settings)

View file

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

View file

@ -0,0 +1,31 @@
/* Copyright 2023 meletrix
*
* 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"
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
for (uint8_t i = led_min; i < led_max; i++) {
if (g_led_config.flags[i] & LED_FLAG_MODIFIER) {
rgb_matrix_set_color(i, RGB_WHITE);
}
}
}
return false;
}