Merge remote-tracking branch 'qmk/master' into merge-2024-06-23
This commit is contained in:
Ilya Zhuravlev
commit
e9d70b410a
15675 changed files with 653160 additions and 679575 deletions
|
|
@ -1,23 +0,0 @@
|
|||
/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -8,6 +8,22 @@
|
|||
"pid": "0x6361",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"encoder": true,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true,
|
||||
"rgblight": true
|
||||
},
|
||||
"qmk": {
|
||||
"locking": {
|
||||
"enabled": true,
|
||||
"resync": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"],
|
||||
"rows": ["D4", "D5", "C7", "C6"]
|
||||
|
|
@ -49,38 +49,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//Initialize indicator LEDs
|
||||
void matrix_init_user(void) {
|
||||
setPinOutput(B5);
|
||||
writePinLow(B5);
|
||||
setPinOutput(B6);
|
||||
writePinLow(B6);
|
||||
setPinOutput(B7);
|
||||
writePinLow(B7);
|
||||
gpio_set_pin_output(B5);
|
||||
gpio_write_pin_low(B5);
|
||||
gpio_set_pin_output(B6);
|
||||
gpio_write_pin_low(B6);
|
||||
gpio_set_pin_output(B7);
|
||||
gpio_write_pin_low(B7);
|
||||
}
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case 1:
|
||||
writePinHigh(B7);
|
||||
writePinLow(B6);
|
||||
gpio_write_pin_high(B7);
|
||||
gpio_write_pin_low(B6);
|
||||
break;
|
||||
case 2:
|
||||
writePinLow(B7);
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_low(B7);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
case 3:
|
||||
writePinHigh(B7);
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_high(B7);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
default:
|
||||
writePinLow(B7);
|
||||
writePinLow(B6);
|
||||
gpio_write_pin_low(B7);
|
||||
gpio_write_pin_low(B6);
|
||||
break;
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
bool led_update_user(led_t led_state) {
|
||||
writePin(B5, led_state.caps_lock);
|
||||
gpio_write_pin(B5, led_state.caps_lock);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,34 +49,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//Initialize indicator LEDs
|
||||
void matrix_init_user(void) {
|
||||
setPinOutput(B5);
|
||||
writePinLow(B5);
|
||||
setPinOutput(B6);
|
||||
writePinLow(B6);
|
||||
setPinOutput(B7);
|
||||
writePinLow(B7);
|
||||
gpio_set_pin_output(B5);
|
||||
gpio_write_pin_low(B5);
|
||||
gpio_set_pin_output(B6);
|
||||
gpio_write_pin_low(B6);
|
||||
gpio_set_pin_output(B7);
|
||||
gpio_write_pin_low(B7);
|
||||
}
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
writePinLow(B7);
|
||||
writePinLow(B6);
|
||||
gpio_write_pin_low(B7);
|
||||
gpio_write_pin_low(B6);
|
||||
switch (get_highest_layer(state)) {
|
||||
case 1:
|
||||
writePinHigh(B7);
|
||||
gpio_write_pin_high(B7);
|
||||
break;
|
||||
case 2:
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
case 3:
|
||||
writePinHigh(B7);
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_high(B7);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
bool led_update_user(led_t led_state) {
|
||||
writePin(B5, led_state.caps_lock);
|
||||
gpio_write_pin(B5, led_state.caps_lock);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,38 +49,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//Initialize indicator LEDs
|
||||
void matrix_init_user(void) {
|
||||
setPinOutput(B5);
|
||||
writePinLow(B5);
|
||||
setPinOutput(B6);
|
||||
writePinLow(B6);
|
||||
setPinOutput(B7);
|
||||
writePinLow(B7);
|
||||
gpio_set_pin_output(B5);
|
||||
gpio_write_pin_low(B5);
|
||||
gpio_set_pin_output(B6);
|
||||
gpio_write_pin_low(B6);
|
||||
gpio_set_pin_output(B7);
|
||||
gpio_write_pin_low(B7);
|
||||
}
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case 1:
|
||||
writePinHigh(B7);
|
||||
writePinLow(B6);
|
||||
gpio_write_pin_high(B7);
|
||||
gpio_write_pin_low(B6);
|
||||
break;
|
||||
case 2:
|
||||
writePinLow(B7);
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_low(B7);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
case 3:
|
||||
writePinHigh(B7);
|
||||
writePinHigh(B6);
|
||||
gpio_write_pin_high(B7);
|
||||
gpio_write_pin_high(B6);
|
||||
break;
|
||||
default:
|
||||
writePinLow(B7);
|
||||
writePinLow(B6);
|
||||
gpio_write_pin_low(B7);
|
||||
gpio_write_pin_low(B6);
|
||||
break;
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
bool led_update_user(led_t led_state) {
|
||||
writePin(B5, led_state.caps_lock);
|
||||
gpio_write_pin(B5, led_state.caps_lock);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||
CONSOLE_ENABLE = no # Console for debug
|
||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||
NKRO_ENABLE = yes # Enable N-Key Rollover
|
||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
AUDIO_ENABLE = no
|
||||
RGBLIGHT_ENABLE = yes
|
||||
ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#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
|
||||
|
|
@ -28,6 +28,21 @@
|
|||
"ws2812": {
|
||||
"pin": "B1"
|
||||
},
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true,
|
||||
"rgblight": true
|
||||
},
|
||||
"qmk": {
|
||||
"locking": {
|
||||
"enabled": true,
|
||||
"resync": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"],
|
||||
"rows": ["D0", "D1", "D3", "F5"]
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||
CONSOLE_ENABLE = no # Console for debug
|
||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||
NKRO_ENABLE = yes # Enable N-Key Rollover
|
||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
AUDIO_ENABLE = no
|
||||
RGBLIGHT_ENABLE = yes
|
||||
Loading…
Add table
Add a link
Reference in a new issue