Merge pull request #537 from lesshonor/q3-merge/fix-2

Q3 merge updates
This commit is contained in:
xyzz 2023-09-09 15:17:59 -06:00 committed by GitHub
commit 03fa9dbfeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 143 additions and 882 deletions

View File

@ -1,23 +0,0 @@
// Copyright 2022 Jason Devadoss (@jasonj2232)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

View File

@ -1,27 +0,0 @@
// Copyright 2022 Jason Devadoss (@jasonj2232)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0
//Uncomment the below if the encoder direction is flipped/opposite to what is expected
//#define ENCODER_DIRECTION_FLIP
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

View File

@ -1,4 +0,0 @@
// Copyright 2022 Diego Palacios (@diepala)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "cantor.h"

View File

@ -1,35 +0,0 @@
// Copyright 2022 Diego Palacios (@diepala)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
// readability
#define ___ KC_NO
#define LAYOUT_split_3x6_3( \
L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \
L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \
L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \
L19, L20, L21, R19, R20, R21 \
) \
{ \
{ L01, L02, L03, L04, L05, L06 }, \
{ L07, L08, L09, L10, L11, L12 }, \
{ L13, L14, L15, L16, L17, L18 }, \
{ L19, L20, L21, ___, ___, ___ }, \
{ R01, R02, R03, R04, R05, R06 }, \
{ R07, R08, R09, R10, R11, R12 }, \
{ R13, R14, R15, R16, R17, R18 }, \
{ R19, R20, R21, ___, ___, ___ } \
}

View File

@ -22,7 +22,7 @@ LTO_ENABLE = yes
# RGB Matrix enabled
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_DRIVER = ws2812
# Encoder enabled
ENCODER_ENABLE = yes
@ -32,4 +32,4 @@ EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View File

@ -4,7 +4,7 @@ MOUSEKEY_ENABLE = yes
CONSOLE_ENABLE = no
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_DRIVER = ws2812
LTO_ENABLE = yes
# Vial settings

View File

@ -1,9 +1,5 @@
<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
/* Copyright 2022 @ Keychron (https://www.keychron.com)
========
/* Copyright 2023 Finalkey
* Copyright 2023 LiWenLiu <https://github.com/LiuLiuQMK>
>>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h
*
* 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
@ -21,15 +17,6 @@
#pragma once
<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
#define VIAL_KEYBOARD_UID {0xF4, 0xB4, 0xCC, 0xD0, 0xA0, 0x27, 0xA9, 0xB3}
#define VIAL_UNLOCK_COMBO_ROWS {0, 2}
#define VIAL_UNLOCK_COMBO_COLS {0, 13}
/* Set dynamic keymap layer counts to 5 */
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
========
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@ -43,4 +30,3 @@
#define RGB_DISABLE_AFTER_TIMEOUT 0
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
>>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h

View File

@ -5,7 +5,7 @@ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c
BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB
# Include mcu configuration
EXTRAINCDIRS += $(BOARD_PATH)/boards/DURGOD_STM32_F070
EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070
# Shared variables
ALLCSRC += $(BOARDSRC)

View File

@ -1,6 +1,7 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes
VIALRGB_ENABLE = yes
ENCODER_MAP_ENABLE = yes
# Firmware Optimization
QMK_SETTINGS = no

View File

@ -20,4 +20,3 @@ RGB_MATRIX_ENABLE = yes
# Encoder enabled
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes

View File

@ -10,7 +10,7 @@ Hardware Availability: https://geekboards.ru
Compile instruction for this keyboard (after setting up your build environment):
make geekboards/macropad_v2:vial
make geekboards/macropad_v2:via
## Update firmware
### Enter bootloader
@ -27,6 +27,6 @@ Alternatively:
### Flash
make geekboards/macropad_v2:vial:flash
make geekboards/macropad_v2:via: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).

View File

@ -17,37 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xE5CA
#define PRODUCT_ID 0x0401
#define DEVICE_VER 0x0001
#define MANUFACTURER "esca"
#define PRODUCT "GetawayVan"
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
#define DIODE_DIRECTION COL2ROW
#define WS2812_DI_PIN B15
#define RGB_MATRIX_LED_COUNT 51
#define RGBLED_NUM 51
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 20
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_LIMIT_VAL 128
#define DEBOUNCE 5
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE

View File

@ -1,12 +1,95 @@
{
"keyboard_name": "GetawayVan",
"url": "",
"maintainer": "esca",
"width": 12.75,
"height": 4,
"manufacturer": "esca",
"keyboard_name": "GetawayVan",
"maintainer": "esca",
"bootloader": "stm32-dfu",
"bootmagic": {
"enabled": true
},
"diode_direction": "COL2ROW",
"features": {
"extrakey": true,
"nkro": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"],
"rows": ["A9", "A8", "A3", "A5"]
},
"mouse_key": {
"enabled": true
},
"processor": "STM32F072",
"rgb_matrix": {
"driver": "ws2812",
"led_count": 51
},
"rgblight": {
"brightness_steps": 17,
"hue_steps": 20,
"led_count": 51,
"max_brightness": 128,
"saturation_steps": 17
},
"url": "",
"usb": {
"device_version": "0.0.1",
"pid": "0x0401",
"vid": "0xE5CA"
},
"ws2812": {
"driver": "spi",
"pin": "B15"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}]
"layout": [
{"label": "esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "NoNo Key", "matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1},
{"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1},
{"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1},
{"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1},
{"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1},
{"label": "H", "matrix": [1, 6], "x": 6.25, "y": 1},
{"label": "J", "matrix": [1, 7], "x": 7.25, "y": 1},
{"label": "K", "matrix": [1, 8], "x": 8.25, "y": 1},
{"label": "L", "matrix": [1, 9], "x": 9.25, "y": 1},
{"label": "\"", "matrix": [1, 10], "x": 10.25, "y": 1},
{"label": "Enter", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "<", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": ">", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": "K2a", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Win", "matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
{"label": "Alt", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "", "matrix": [3, 4], "x": 3.25, "y": 3, "w": 2.75},
{"label": "", "matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
{"label": "Alt", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
{"label": "K39", "matrix": [3, 9], "x": 9.75, "y": 3},
{"label": "K3a", "matrix": [3, 10], "x": 10.75, "y": 3},
{"label": "K3b", "matrix": [3, 11], "x": 11.75, "y": 3}
]
}
}
}

View File

@ -1,14 +1,10 @@
# MCU name
MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes
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
@ -22,8 +18,6 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View File

@ -1,12 +1,3 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
VIA_ENABLE = yes
VIAL_ENABLE = yes
@ -16,17 +7,3 @@ QMK_SETTINGS = no
TAP_DANCE_ENABLE = yes
COMBO_ENABLE = yes
KEY_OVERRIDE_ENABLE = no
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3731

View File

@ -1,2 +1 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes

View File

@ -21,4 +21,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
## Bootloader
* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB
* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB

View File

@ -1,34 +0,0 @@
{
"name": "Keebwerks Nano Slider",
"vendorId": "0x03A8",
"productId": "0x0000",
"lighting": "none",
"matrix": {
"rows": 2,
"cols": 4
},
"layouts": {
"keymap": [
[
"1,1"
],
[
{
"y": 0.25
},
"1,2",
"1,0",
"0,0",
{
"h": 2
},
"1,3"
],
[
"0,1",
"0,2",
"0,3"
]
]
}
}

View File

@ -7,4 +7,4 @@ LTO_ENABLE = yes
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_DRIVER = ws2812

View File

@ -1,33 +0,0 @@
/* Copyright 2020 Spaceman
*
* 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
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5342 // SB
#define PRODUCT_ID 0x5032 // P2
#define DEVICE_VER 0x0002
#define MANUFACTURER "Spaceman"
#define PRODUCT "Pancake 2"
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
#define DIODE_DIRECTION COL2ROW
#define MATRIX_ROW_PINS { C7, C6, B6, B5 }
#define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
#define UNUSED_PINS

View File

@ -1,27 +0,0 @@
{
"name": "The PASSWORD",
"vendorId": "0xFEED",
"productId": "0x6060",
"lighting": "none",
"matrix": {
"rows": 1,
"cols": 8
},
"layouts": {
"keymap": [
[
{
"c": "#00589f"
},
"0,0",
"0,1",
"0,2",
"0,3",
"0,4",
"0,5",
"0,6",
"0,7"
]
]
}
}

View File

@ -54,33 +54,4 @@
#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
#define WS2812_DMA_CHANNEL 2
// RGB matrix effects
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_VAL
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
#define ENABLE_RGB_MATRIX_DUAL_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
#define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#define ENABLE_RGB_MATRIX_HUE_BREATHING
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
#define ENABLE_RGB_MATRIX_HUE_WAVE
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_DISABLE_WHEN_USB_SUSPENDED

View File

@ -2,6 +2,34 @@
#pragma once
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_VAL
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
#define ENABLE_RGB_MATRIX_DUAL_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
#define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#define ENABLE_RGB_MATRIX_HUE_BREATHING
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
#define ENABLE_RGB_MATRIX_HUE_WAVE
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
#define VIAL_KEYBOARD_UID {0x69, 0xAE, 0x4D, 0xB7, 0x4A, 0x77, 0x5C, 0x95}
#define VIAL_UNLOCK_COMBO_ROWS {0, 4}
#define VIAL_UNLOCK_COMBO_COLS {0, 5}

View File

@ -1,108 +0,0 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* < /
* Ent
* > *
*
*
* 7 8 9
* +
* 5 6 7
*
* 1 2 3 -
*
* ALT 0 . Bs
*
*/
[0] = LAYOUT_all(
KC_PENT, KC_LEFT, KC_PSLS,
KC_RGHT, KC_PAST,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3, KC_PMNS,
KC_LALT, KC_P0, KC_PDOT, KC_BSPC
),
/*
*
* < /
* Ent
* > *
*
*
* 7 8 9
* +
* 5 6 7
*
* 1 2 3 -
*
* ALT 0 . Bs
*
*/
[1] = LAYOUT_all(
KC_PENT, KC_LEFT, KC_PSLS,
KC_RGHT, KC_PAST,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3, KC_PMNS,
KC_LALT, KC_P0, KC_PDOT, KC_BSPC
),
/*
*
* < /
* Ent
* > *
*
*
* 7 8 9
* +
* 5 6 7
*
* 1 2 3 -
*
* ALT 0 . Bs
*
*/
[2] = LAYOUT_all(
KC_PENT, KC_LEFT, KC_PSLS,
KC_RGHT, KC_PAST,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3, KC_PMNS,
KC_LALT, KC_P0, KC_PDOT, KC_BSPC
),
/*
*
* < /
* Ent
* > *
*
*
* 7 8 9
* +
* 5 6 7
*
* 1 2 3 -
*
* ALT 0 . Bs
*
*/
[3] = LAYOUT_all(
KC_PENT, KC_LEFT, KC_PSLS,
KC_RGHT, KC_PAST,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3, KC_PMNS,
KC_LALT, KC_P0, KC_PDOT, KC_BSPC
)
};

View File

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

View File

@ -1,69 +0,0 @@
{
"layouts": {
"keymap": [
[
{
"w": 2,
"h": 2
},
"2,3",
{
"x": 0.25
},
"0,2",
"0,3"
],
[
{
"x": 2.25
},
"1,2",
"1,3"
],
[
{
"y": 0.25
},
"2,0",
"2,1",
"2,2",
{
"x": 0.25,
"h": 2
},
"3,3"
],
[
"3,0",
"3,1",
"3,2"
],
[
"4,0",
"4,1",
"4,2",
{
"x": 0.25
},
"4,3"
],
[
"5,0",
"5,1",
"5,2",
{
"x": 0.25
},
"5,3"
]
]
},
"name": "sinpad20",
"vendorId": "0xCEE9",
"productId": "0x0001",
"lighting": "none",
"matrix": {
"rows": 6,
"cols": 4
}
}

View File

@ -18,4 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE

View File

@ -1 +1,12 @@
# This file intentionally left blank
# 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

View File

@ -1,21 +0,0 @@
// Copyright 2022 Markus Knutsson (@TweetyDaBird)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_DEFAULT_VAL ( RGBLIGHT_LIMIT_VAL / 3 )
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
#define RGBLIGHT_SLEEP
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 0
// reduce memory
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE
#define NO_ACTION_ONESHOT
#define LAYER_STATE_8BIT

View File

@ -1,21 +0,0 @@
// Copyright 2022 Markus Knutsson (@TweetyDaBird)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_DEFAULT_VAL ( RGBLIGHT_LIMIT_VAL / 3 )
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
#define RGBLIGHT_SLEEP
#define BOOTMAGIC_LITE_ROW 2
#define BOOTMAGIC_LITE_COLUMN 0
// reduce memory
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE
#define NO_ACTION_ONESHOT
#define LAYER_STATE_8BIT

View File

@ -9,7 +9,7 @@
},
"processor": "atmega32u4",
"rgb_matrix": {
"driver": "WS2812"
"driver": "ws2812"
},
"url": "",
"usb": {
@ -20,4 +20,4 @@
"ws2812": {
"pin": "C7"
}
}
}

View File

@ -1,208 +0,0 @@
{
"name": "Minne",
"vendorId": "0x5644",
"productId": "0x4D49",
"keycodes": [ "qmk_lighting" ],
"menus": [ "qmk_rgblight" ],
"matrix": {
"rows": 8,
"cols": 7
},
"layouts": {
"labels": [
["Bottom Row", "Dual 1.75U", "2.75U 2.25U", "Dual 3U", "6U", "7U", "10U"]
],
"keymap": [
[
{
"c":"#777777"
},
"1,0",
{
"c":"#aaaaaa"
},
"1,1",
{
"c":"#cccccc"
},
"0,1",
"0,2",
"1,2",
"1,3",
"0,3",
"0,4",
"1,4",
"1,5",
"0,5",
{
"c":"#aaaaaa",
"w":1.75
},
"0,6"
],
[
{
"w":1.25
},
"3,0",
{
"c":"#cccccc"
},
"3,1",
"2,1",
"2,2",
"3,2",
"3,3",
"2,3",
"2,4",
"3,4",
"3,5",
"2,5",
{
"c":"#777777",
"w":1.5
},
"2,6"
],
[
{
"c":"#aaaaaa",
"w":1.75
},
"5,0",
{
"c":"#cccccc"
},
"5,1",
"4,1",
"4,2",
"5,2",
"5,3",
"4,3",
"4,4",
"5,4",
"5,5",
"4,5",
{
"c":"#aaaaaa"
},
"4,6"
],
[
{
"x":1.38
},
"7,1\n\n\n0,0",
"6,1\n\n\n0,0",
{
"w":1.25
},
"6,2\n\n\n0,0",
{
"c":"#cccccc",
"w":1.75
},
"7,2\n\n\n0,0",
{
"w":1.75
},
"6,3\n\n\n0,0",
{
"c":"#aaaaaa",
"w":1.25
},
"6,4\n\n\n0,0",
"7,4\n\n\n0,0",
"7,5\n\n\n0,0"
],
[
{
"x":1.38
},
"7,1\n\n\n0,1",
{
"w":1.5
},
"6,1\n\n\n0,1",
{
"c":"#cccccc",
"w":2.75
},
"7,2\n\n\n0,1",
{
"w":2.25
},
"6,3\n\n\n0,1",
{
"c":"#aaaaaa",
"w":1.5
},
"7,4\n\n\n0,1",
"7,5\n\n\n0,1"
],
[
{
"x":1.38
},
"7,1\n\n\n0,2",
"6,1\n\n\n0,2",
{
"c":"#cccccc",
"w":3
},
"7,2\n\n\n0,2",
{
"w":3
},
"6,3\n\n\n0,2",
{
"c":"#aaaaaa"
},
"7,4\n\n\n0,2",
"7,5\n\n\n0,2"
],
[
{
"x":1.38
},
"7,1\n\n\n0,3",
"6,1\n\n\n0,3",
{
"c":"#cccccc",
"w":6
},
"7,3\n\n\n0,3",
{
"c":"#aaaaaa"
},
"7,4\n\n\n0,3",
"7,5\n\n\n0,3"
],
[
{
"x":1.38,
"w":1.5
},
"7,1\n\n\n0,4",
{
"c":"#cccccc",
"w":7
},
"7,3\n\n\n0,4",
{
"c":"#aaaaaa",
"w":1.5
},
"7,5\n\n\n0,4"
],
[
{
"x":1.38,
"c":"#cccccc",
"w":10
},
"7,3\n\n\n0,5"
]
]
}
}

View File

@ -1,151 +0,0 @@
{
"name": "Minne - Topre",
"vendorId": "0x5644",
"productId": "0x4D54",
"matrix": {
"rows": 4,
"cols": 12
},
"layouts": {
"labels": [
["Bottom Row", "Dual 3U", "6U", "7U", "10U"]
],
"keymap": [
[
{
"c":"#777777"
},
"0,0",
{
"c":"#cccccc"
},
"0,1",
"0,2",
"0,3",
"0,4",
"0,5",
"0,6",
"0,7",
"0,8",
"0,9",
"0,10",
{
"c":"#aaaaaa",
"w":1.75
},
"0,11"
],
[
{
"w":1.25
},
"1,0",
{
"c":"#cccccc"
},
"1,1",
"1,2",
"1,3",
"1,4",
"1,5",
"1,6",
"1,7",
"1,8",
"1,9",
"1,10",
{
"c":"#777777",
"w":1.5
},
"1,11"
],
[
{
"c":"#aaaaaa",
"w":1.75
},
"2,0",
{
"c":"#cccccc"
},
"2,1",
"2,2",
"2,3",
"2,4",
"2,5",
"2,6",
"2,7",
"2,8",
"2,9",
"2,10",
{
"c":"#aaaaaa"
},
"2,11"
],
[
{
"x":1.38
},
"3,1\n\n\n0,0",
"3,2\n\n\n0,0",
{
"c":"#cccccc",
"w":3
},
"3,4\n\n\n0,0",
{
"w":3
},
"3,7\n\n\n0,0",
{
"c":"#aaaaaa"
},
"3,9\n\n\n0,0",
"3,10\n\n\n0,0"
],
[
{
"x":1.38
},
"3,1\n\n\n0,1",
"3,2\n\n\n0,1",
{
"c":"#cccccc",
"w":6
},
"3,5\n\n\n0,1",
{
"c":"#aaaaaa"
},
"3,9\n\n\n0,1",
"3,10\n\n\n0,1"
],
[
{
"x":1.38,
"w":1.5
},
"3,1\n\n\n0,2",
{
"c":"#cccccc",
"w":7
},
"3,5\n\n\n0,2",
{
"c":"#aaaaaa",
"w":1.5
},
"3,10\n\n\n0,2"
],
[
{
"x":1.38,
"c":"#cccccc",
"w":10
},
"3,5\n\n\n0,3"
]
]
}
}

View File

@ -23,6 +23,7 @@
#include "keycodes.h"
#include "action_tapping.h"
#include "wait.h"
#include <string.h>
#ifdef VIA_ENABLE
# include "via.h"