Merge remote-tracking branch 'qmk/master' into merge-2023-06-03

This commit is contained in:
Ilya Zhuravlev 2023-06-03 12:35:25 -06:00
commit d6e95213e3
14389 changed files with 536595 additions and 476101 deletions

View file

@ -17,30 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { F4, F5, F6, F7}
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6, B5 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
# define RGBLIGHT_VAL_STEP 16
# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@ -52,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View file

@ -8,6 +8,14 @@
"pid": "0x516D",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6", "B5"],
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@ -16,42 +24,42 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":0, "y":3},
{"x":2, "y":3, "w":6},
{"x":9, "y":3}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [1, 9], "x": 9, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [2, 9], "x": 9, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 2, "y": 3, "w": 6},
{"matrix": [3, 2], "x": 9, "y": 3}
]
}
}

View file

@ -1,17 +0,0 @@
/* Copyright 2020 gtips
*
* 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 "reviung33.h"

View file

@ -1,40 +0,0 @@
/* Copyright 2020 gtips
*
* 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
#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.
*/
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
K30, K31, K32 \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
{ K30, K31, K32, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
}

View file

@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { F4, F5, F6, F7}
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View file

@ -8,6 +8,11 @@
"pid": "0x4E03",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6"],
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": [
@ -19,77 +24,91 @@
"layouts": {
"LAYOUT_reviung34": {
"layout": [
{"label":"K00", "x":0, "y":0},
{"label":"K01", "x":1, "y":0},
{"label":"K02", "x":2, "y":0},
{"label":"K03", "x":3, "y":0},
{"label":"K04", "x":4, "y":0},
{"label":"K05", "x":6, "y":0},
{"label":"K06", "x":7, "y":0},
{"label":"K07", "x":8, "y":0},
{"label":"K08", "x":9, "y":0},
{"label":"K35", "x":10, "y":0},
{"label":"K10", "x":0, "y":1},
{"label":"K11", "x":1, "y":1},
{"label":"K12", "x":2, "y":1},
{"label":"K13", "x":3, "y":1},
{"label":"K14", "x":4, "y":1},
{"label":"K15", "x":6, "y":1},
{"label":"K16", "x":7, "y":1},
{"label":"K17", "x":8, "y":1},
{"label":"K18", "x":9, "y":1},
{"label":"K36", "x":10, "y":1},
{"label":"K20", "x":0, "y":2},
{"label":"K21", "x":1, "y":2},
{"label":"K22", "x":2, "y":2},
{"label":"K23", "x":3, "y":2},
{"label":"K24", "x":4, "y":2},
{"label":"K25", "x":6, "y":2},
{"label":"K26", "x":7, "y":2},
{"label":"K27", "x":8, "y":2},
{"label":"K28", "x":9, "y":2},
{"label":"K37", "x":10, "y":2},
{"label":"K32", "x":2, "y":3},
{"label":"K33", "x":3, "y":3},
{"label":"K34", "x":4, "y":3},
{"label":"K38", "x":6, "y":3, "w":2}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 6, "y": 0},
{"matrix": [0, 6], "x": 7, "y": 0},
{"matrix": [0, 7], "x": 8, "y": 0},
{"matrix": [0, 8], "x": 9, "y": 0},
{"matrix": [3, 5], "x": 10, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [3, 6], "x": 10, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [3, 7], "x": 10, "y": 2},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
},
"LAYOUT_reviung34_2u": {
"layout": [
{"label":"K00", "x":0, "y":0},
{"label":"K01", "x":1, "y":0},
{"label":"K02", "x":2, "y":0},
{"label":"K03", "x":3, "y":0},
{"label":"K04", "x":4, "y":0},
{"label":"K05", "x":6, "y":0},
{"label":"K06", "x":7, "y":0},
{"label":"K07", "x":8, "y":0},
{"label":"K08", "x":9, "y":0},
{"label":"K35", "x":10, "y":0},
{"label":"K10", "x":0, "y":1},
{"label":"K11", "x":1, "y":1},
{"label":"K12", "x":2, "y":1},
{"label":"K13", "x":3, "y":1},
{"label":"K14", "x":4, "y":1},
{"label":"K15", "x":6, "y":1},
{"label":"K16", "x":7, "y":1},
{"label":"K17", "x":8, "y":1},
{"label":"K18", "x":9, "y":1},
{"label":"K36", "x":10, "y":1},
{"label":"K20", "x":0, "y":2},
{"label":"K21", "x":1, "y":2},
{"label":"K22", "x":2, "y":2},
{"label":"K23", "x":3, "y":2},
{"label":"K24", "x":4, "y":2},
{"label":"K25", "x":6, "y":2},
{"label":"K26", "x":7, "y":2},
{"label":"K27", "x":8, "y":2},
{"label":"K28", "x":9, "y":2},
{"label":"K37", "x":10, "y":2},
{"label":"K32", "x":2, "y":3},
{"label":"K34", "x":3, "y":3, "w":2},
{"label":"K38", "x":6, "y":3, "w":2}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 6, "y": 0},
{"matrix": [0, 6], "x": 7, "y": 0},
{"matrix": [0, 7], "x": 8, "y": 0},
{"matrix": [0, 8], "x": 9, "y": 0},
{"matrix": [3, 5], "x": 10, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [3, 6], "x": 10, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [3, 7], "x": 10, "y": 2},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
{"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
}
}

View file

@ -18,8 +18,7 @@
// place overrides here
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN D3
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -37,4 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif

View file

@ -18,8 +18,7 @@
// place overrides here
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN D3
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -37,4 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif

View file

@ -1,16 +0,0 @@
/* Copyright 2019 gtips
*
* 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 "reviung34.h"

View file

@ -1,52 +0,0 @@
/* Copyright 2019 gtips
*
* 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
#include "quantum.h"
/* This 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.
*/
#define LAYOUT_reviung34( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
K32, K33, K34, K38 \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, K38 } \
}
#define LAYOUT_reviung34_2u( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
K32, K34, K38 \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ KC_NO, KC_NO, K32, KC_NO, K34, K35, K36, K37, K38 } \
}

View file

@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View file

@ -8,6 +8,11 @@
"pid": "0x5F10",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
@ -16,51 +21,51 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0.54},
{"label":"K01", "x":1, "y":0.36},
{"label":"K02", "x":2, "y":0.18},
{"label":"K03", "x":3, "y":0},
{"label":"K04", "x":4, "y":0.18},
{"label":"K05", "x":5, "y":0.36},
{"matrix": [0, 0], "x": 0, "y": 0.54},
{"matrix": [0, 1], "x": 1, "y": 0.36},
{"matrix": [0, 2], "x": 2, "y": 0.18},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.18},
{"matrix": [0, 5], "x": 5, "y": 0.36},
{"label":"K30", "x":7, "y":0.36},
{"label":"K31", "x":8, "y":0.18},
{"label":"K32", "x":9, "y":0},
{"label":"K33", "x":10, "y":0.18},
{"label":"K34", "x":11, "y":0.36},
{"label":"K35", "x":12, "y":0.54},
{"matrix": [3, 0], "x": 7, "y": 0.36},
{"matrix": [3, 1], "x": 8, "y": 0.18},
{"matrix": [3, 2], "x": 9, "y": 0},
{"matrix": [3, 3], "x": 10, "y": 0.18},
{"matrix": [3, 4], "x": 11, "y": 0.36},
{"matrix": [3, 5], "x": 12, "y": 0.54},
{"label":"K10", "x":0, "y":1.54},
{"label":"K11", "x":1, "y":1.36},
{"label":"K12", "x":2, "y":1.18},
{"label":"K13", "x":3, "y":1},
{"label":"K14", "x":4, "y":1.18},
{"label":"K15", "x":5, "y":1.36},
{"matrix": [1, 0], "x": 0, "y": 1.54},
{"matrix": [1, 1], "x": 1, "y": 1.36},
{"matrix": [1, 2], "x": 2, "y": 1.18},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.18},
{"matrix": [1, 5], "x": 5, "y": 1.36},
{"label":"K40", "x":7, "y":1.36},
{"label":"K41", "x":8, "y":1.18},
{"label":"K42", "x":9, "y":1},
{"label":"K43", "x":10, "y":1.18},
{"label":"K44", "x":11, "y":1.36},
{"label":"K45", "x":12, "y":1.54},
{"matrix": [4, 0], "x": 7, "y": 1.36},
{"matrix": [4, 1], "x": 8, "y": 1.18},
{"matrix": [4, 2], "x": 9, "y": 1},
{"matrix": [4, 3], "x": 10, "y": 1.18},
{"matrix": [4, 4], "x": 11, "y": 1.36},
{"matrix": [4, 5], "x": 12, "y": 1.54},
{"label":"K20", "x":0, "y":2.54},
{"label":"K21", "x":1, "y":2.36},
{"label":"K22", "x":2, "y":2.18},
{"label":"K23", "x":3, "y":2},
{"label":"K24", "x":4, "y":2.18},
{"label":"K25", "x":5, "y":2.36},
{"matrix": [2, 0], "x": 0, "y": 2.54},
{"matrix": [2, 1], "x": 1, "y": 2.36},
{"matrix": [2, 2], "x": 2, "y": 2.18},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.18},
{"matrix": [2, 5], "x": 5, "y": 2.36},
{"label":"K50", "x":7, "y":2.36},
{"label":"K51", "x":8, "y":2.18},
{"label":"K52", "x":9, "y":2},
{"label":"K53", "x":10, "y":2.18},
{"label":"K54", "x":11, "y":2.36},
{"label":"K55", "x":12, "y":2.54},
{"matrix": [5, 0], "x": 7, "y": 2.36},
{"matrix": [5, 1], "x": 8, "y": 2.18},
{"matrix": [5, 2], "x": 9, "y": 2},
{"matrix": [5, 3], "x": 10, "y": 2.18},
{"matrix": [5, 4], "x": 11, "y": 2.36},
{"matrix": [5, 5], "x": 12, "y": 2.54},
{"label":"K60", "x":4.125, "y":3.54, "w":1.25},
{"label":"K61", "x":5.375, "y":3.54, "w":2.25},
{"label":"K62", "x":7.625, "y":3.54, "w":1.25}
{"matrix": [6, 0], "x": 4.125, "y": 3.54, "w": 1.25},
{"matrix": [6, 1], "x": 5.375, "y": 3.54, "w": 2.25},
{"matrix": [6, 2], "x": 7.625, "y": 3.54, "w": 1.25}
]
}
}

View file

@ -18,8 +18,7 @@
// place overrides here
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN D3
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -36,4 +35,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif

View file

@ -18,8 +18,7 @@
// place overrides here
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN D3
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -36,4 +35,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif

View file

@ -18,8 +18,7 @@
// place overrides here
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN D3
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -42,4 +41,3 @@
// /*==== use exp() and sin() ====*/
// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
#endif

View file

@ -1,16 +0,0 @@
/* Copyright 2019 gtips
*
* 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 "reviung39.h"

View file

@ -1,42 +0,0 @@
/* Copyright 2019 gtips
*
* 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
#include "quantum.h"
/* This 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.
*/
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \
K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \
K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \
K60, K61, K62 \
) \
{ \
{ K00, K01, K02, K03, K04, K05 }, \
{ K10, K11, K12, K13, K14, K15 }, \
{ K20, K21, K22, K23, K24, K25 }, \
{ K30, K31, K32, K33, K34, K35 }, \
{ K40, K41, K42, K43, K44, K45 }, \
{ K50, K51, K52, K53, K54, K55 }, \
{ K60, K61, K62, KC_NO, KC_NO, KC_NO } \
}

View file

@ -17,32 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS \
{ D4, C6, D7, E6, B4, B5 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@ -54,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View file

@ -8,6 +8,14 @@
"pid": "0xDCCB",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
@ -16,53 +24,53 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0.54},
{"label":"K01", "x":1, "y":0.36},
{"label":"K02", "x":2, "y":0.18},
{"label":"K03", "x":3, "y":0},
{"label":"K04", "x":4, "y":0.18},
{"label":"K05", "x":5, "y":0.36},
{"matrix": [0, 0], "x": 0, "y": 0.54},
{"matrix": [0, 1], "x": 1, "y": 0.36},
{"matrix": [0, 2], "x": 2, "y": 0.18},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.18},
{"matrix": [0, 5], "x": 5, "y": 0.36},
{"label":"K30", "x":7, "y":0.36},
{"label":"K31", "x":8, "y":0.18},
{"label":"K32", "x":9, "y":0},
{"label":"K33", "x":10, "y":0.18},
{"label":"K34", "x":11, "y":0.36},
{"label":"K35", "x":12, "y":0.54},
{"matrix": [3, 0], "x": 7, "y": 0.36},
{"matrix": [3, 1], "x": 8, "y": 0.18},
{"matrix": [3, 2], "x": 9, "y": 0},
{"matrix": [3, 3], "x": 10, "y": 0.18},
{"matrix": [3, 4], "x": 11, "y": 0.36},
{"matrix": [3, 5], "x": 12, "y": 0.54},
{"label":"K10", "x":0, "y":1.54},
{"label":"K11", "x":1, "y":1.36},
{"label":"K12", "x":2, "y":1.18},
{"label":"K13", "x":3, "y":1},
{"label":"K14", "x":4, "y":1.18},
{"label":"K15", "x":5, "y":1.36},
{"matrix": [1, 0], "x": 0, "y": 1.54},
{"matrix": [1, 1], "x": 1, "y": 1.36},
{"matrix": [1, 2], "x": 2, "y": 1.18},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.18},
{"matrix": [1, 5], "x": 5, "y": 1.36},
{"label":"K40", "x":7, "y":1.36},
{"label":"K41", "x":8, "y":1.18},
{"label":"K42", "x":9, "y":1},
{"label":"K43", "x":10, "y":1.18},
{"label":"K44", "x":11, "y":1.36},
{"label":"K45", "x":12, "y":1.54},
{"matrix": [4, 0], "x": 7, "y": 1.36},
{"matrix": [4, 1], "x": 8, "y": 1.18},
{"matrix": [4, 2], "x": 9, "y": 1},
{"matrix": [4, 3], "x": 10, "y": 1.18},
{"matrix": [4, 4], "x": 11, "y": 1.36},
{"matrix": [4, 5], "x": 12, "y": 1.54},
{"label":"K20", "x":0, "y":2.54},
{"label":"K21", "x":1, "y":2.36},
{"label":"K22", "x":2, "y":2.18},
{"label":"K23", "x":3, "y":2},
{"label":"K24", "x":4, "y":2.18},
{"label":"K25", "x":5, "y":2.36},
{"matrix": [2, 0], "x": 0, "y": 2.54},
{"matrix": [2, 1], "x": 1, "y": 2.36},
{"matrix": [2, 2], "x": 2, "y": 2.18},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.18},
{"matrix": [2, 5], "x": 5, "y": 2.36},
{"label":"K50", "x":7, "y":2.36},
{"label":"K51", "x":8, "y":2.18},
{"label":"K52", "x":9, "y":2},
{"label":"K53", "x":10, "y":2.18},
{"label":"K54", "x":11, "y":2.36},
{"label":"K55", "x":12, "y":2.54},
{"matrix": [5, 0], "x": 7, "y": 2.36},
{"matrix": [5, 1], "x": 8, "y": 2.18},
{"matrix": [5, 2], "x": 9, "y": 2},
{"matrix": [5, 3], "x": 10, "y": 2.18},
{"matrix": [5, 4], "x": 11, "y": 2.36},
{"matrix": [5, 5], "x": 12, "y": 2.54},
{"label":"K60", "x":2.875, "y":3.54, "w":1.25},
{"label":"K61", "x":4.125, "y":3.54, "w":1.25},
{"label":"K62", "x":5.375, "y":3.54, "w":2.25},
{"label":"K63", "x":7.625, "y":3.54, "w":1.25},
{"label":"K64", "x":8.875, "y":3.54, "w":1.25}
{"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
{"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
{"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
{"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
{"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
]
}
}

View file

@ -16,12 +16,10 @@
#pragma once
#define RGBLIGHT_LAYERS
#ifdef RGB_DI_PIN
// /*== or choose animations ==*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#endif
#define TAPPING_TERM 200
#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE

View file

@ -1,16 +0,0 @@
/* Copyright 2020 gtips
*
* 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 "reviung41.h"

View file

@ -1,42 +0,0 @@
/* Copyright 2020 gtips
*
* 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
#include "quantum.h"
/* This 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.
*/
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \
K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \
K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \
K60, K61, K62, K63, K64 \
) \
{ \
{ K00, K01, K02, K03, K04, K05 }, \
{ K10, K11, K12, K13, K14, K15 }, \
{ K20, K21, K22, K23, K24, K25 }, \
{ K30, K31, K32, K33, K34, K35 }, \
{ K40, K41, K42, K43, K44, K45 }, \
{ K50, K51, K52, K53, K54, K55 }, \
{ K60, K61, K62, K63, K64, KC_NO } \
}

View file

@ -17,32 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS \
{ F4 }
#define MATRIX_COL_PINS \
{ D4, C6, D7, E6, B4 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
# define RGBLIGHT_VAL_STEP 16
# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@ -54,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View file

@ -8,6 +8,14 @@
"pid": "0x4F0D",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4"],
"rows": ["F4"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D0", "pin_b": "D1"}
@ -21,11 +29,11 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k00", "x": 0, "y": 0},
{"label": "k01", "x": 1, "y": 0.25},
{"label": "k02", "x": 2, "y": 0.25},
{"label": "k03", "x": 3, "y": 0.25},
{"label": "k04", "x": 4, "y": 0}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0.25},
{"matrix": [0, 2], "x": 2, "y": 0.25},
{"matrix": [0, 3], "x": 3, "y": 0.25},
{"matrix": [0, 4], "x": 4, "y": 0}
]
}
}

View file

@ -1,17 +0,0 @@
/* Copyright 2021 gtips
*
* 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 "reviung5.h"

View file

@ -1,33 +0,0 @@
/* Copyright 2021 gtips
*
* 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
#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.
*/
#define LAYOUT( \
K00, K01, K02, K03, K04 \
) { \
{ K00, K01, K02, K03, K04 } \
}

View file

@ -3,30 +3,10 @@
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D0, D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@ -38,7 +18,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View file

@ -8,6 +8,14 @@
"pid": "0x4E09",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
@ -16,63 +24,66 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k02", "x":2.25, "y":0},
{"label": "k03", "x":3.5, "y":0},
{"label": "k04", "x":4.5, "y":0},
{"label": "k05", "x":5.5, "y":0},
{"label": "k06", "x":6.5, "y":0},
{"label": "k07", "x":7.75, "y":0},
{"label": "k40", "x":8.75, "y":0},
{"label": "k41", "x":9.75, "y":0},
{"label": "k42", "x":10.75, "y":0},
{"label": "k43", "x":12, "y":0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"label": "k10", "x":0, "y":1.25, "w":1.5},
{"label": "k11", "x":1.5, "y":1.25},
{"label": "k12", "x":2.5, "y":1.25},
{"label": "k13", "x":3.5, "y":1.25},
{"label": "k14", "x":4.5, "y":1.25},
{"label": "k15", "x":5.5, "y":1.25},
{"label": "k16", "x":6.5, "y":1.25},
{"label": "k17", "x":7.5, "y":1.25},
{"label": "k44", "x":8.5, "y":1.25},
{"label": "k45", "x":9.5, "y":1.25},
{"label": "k46", "x":10.5, "y":1.25},
{"label": "k47", "x":11.5, "y":1.25, "w":1.5},
{"matrix": [0, 3], "x": 3.5, "y": 0},
{"matrix": [0, 4], "x": 4.5, "y": 0},
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"label": "k20", "x":0, "y":2.25, "w":1.75},
{"label": "k21", "x":1.75, "y":2.25},
{"label": "k22", "x":2.75, "y":2.25},
{"label": "k23", "x":3.75, "y":2.25},
{"label": "k24", "x":4.75, "y":2.25},
{"label": "k25", "x":5.75, "y":2.25},
{"label": "k26", "x":6.75, "y":2.25},
{"label": "k27", "x":7.75, "y":2.25},
{"label": "k50", "x":8.75, "y":2.25},
{"label": "k51", "x":9.75, "y":2.25},
{"label": "k52", "x":10.75, "y":2.25},
{"label": "k53", "x":11.75, "y":2.25, "w":1.25},
{"matrix": [0, 7], "x": 7.75, "y": 0},
{"matrix": [4, 0], "x": 8.75, "y": 0},
{"matrix": [4, 1], "x": 9.75, "y": 0},
{"matrix": [4, 2], "x": 10.75, "y": 0},
{"label": "k30", "x":0, "y":3.25, "w":2.25},
{"label": "k31", "x":2.25, "y":3.25},
{"label": "k32", "x":3.25, "y":3.25},
{"label": "k33", "x":4.25, "y":3.25},
{"label": "k34", "x":5.25, "y":3.25},
{"label": "k35", "x":6.25, "y":3.25},
{"label": "k36", "x":7.25, "y":3.25},
{"label": "k37", "x":8.25, "y":3.25},
{"label": "k54", "x":9.25, "y":3.25},
{"label": "k55", "x":10.25, "y":3.25},
{"label": "k56", "x":11.25, "y":3.25, "w":1.75},
{"matrix": [4, 3], "x": 12, "y": 0},
{"label": "k60", "x":0, "y":4.25, "w":1.5},
{"label": "k61", "x":1.5, "y":4.25, "w":1.25},
{"label": "k62", "x":2.75, "y":4.25, "w":1.25},
{"label": "k63", "x":4, "y":4.25, "w":2.75},
{"label": "k64", "x":6.75, "y":4.25, "w":2.25},
{"label": "k65", "x":9, "y":4.25, "w":1.25},
{"label": "k66", "x":10.25, "y":4.25, "w":1.25},
{"label": "k67", "x":11.5, "y":4.25, "w":1.5}
{"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1.25},
{"matrix": [1, 2], "x": 2.5, "y": 1.25},
{"matrix": [1, 3], "x": 3.5, "y": 1.25},
{"matrix": [1, 4], "x": 4.5, "y": 1.25},
{"matrix": [1, 5], "x": 5.5, "y": 1.25},
{"matrix": [1, 6], "x": 6.5, "y": 1.25},
{"matrix": [1, 7], "x": 7.5, "y": 1.25},
{"matrix": [4, 4], "x": 8.5, "y": 1.25},
{"matrix": [4, 5], "x": 9.5, "y": 1.25},
{"matrix": [4, 6], "x": 10.5, "y": 1.25},
{"matrix": [4, 7], "x": 11.5, "y": 1.25, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2.25},
{"matrix": [2, 2], "x": 2.75, "y": 2.25},
{"matrix": [2, 3], "x": 3.75, "y": 2.25},
{"matrix": [2, 4], "x": 4.75, "y": 2.25},
{"matrix": [2, 5], "x": 5.75, "y": 2.25},
{"matrix": [2, 6], "x": 6.75, "y": 2.25},
{"matrix": [2, 7], "x": 7.75, "y": 2.25},
{"matrix": [5, 0], "x": 8.75, "y": 2.25},
{"matrix": [5, 1], "x": 9.75, "y": 2.25},
{"matrix": [5, 2], "x": 10.75, "y": 2.25},
{"matrix": [5, 3], "x": 11.75, "y": 2.25, "w": 1.25},
{"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 3.25},
{"matrix": [3, 2], "x": 3.25, "y": 3.25},
{"matrix": [3, 3], "x": 4.25, "y": 3.25},
{"matrix": [3, 4], "x": 5.25, "y": 3.25},
{"matrix": [3, 5], "x": 6.25, "y": 3.25},
{"matrix": [3, 6], "x": 7.25, "y": 3.25},
{"matrix": [3, 7], "x": 8.25, "y": 3.25},
{"matrix": [5, 4], "x": 9.25, "y": 3.25},
{"matrix": [5, 5], "x": 10.25, "y": 3.25},
{"matrix": [5, 6], "x": 11.25, "y": 3.25, "w": 1.75},
{"matrix": [6, 0], "x": 0, "y": 4.25, "w": 1.5},
{"matrix": [6, 1], "x": 1.5, "y": 4.25, "w": 1.25},
{"matrix": [6, 2], "x": 2.75, "y": 4.25, "w": 1.25},
{"matrix": [6, 3], "x": 4, "y": 4.25, "w": 2.75},
{"matrix": [6, 4], "x": 6.75, "y": 4.25, "w": 2.25},
{"matrix": [6, 5], "x": 9, "y": 4.25, "w": 1.25},
{"matrix": [6, 6], "x": 10.25, "y": 4.25, "w": 1.25},
{"matrix": [6, 7], "x": 11.5, "y": 4.25, "w": 1.5}
]
}
}

View file

@ -1,4 +0,0 @@
// Copyright 2021 gtips (@gtips)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "reviung53.h"

View file

@ -1,30 +0,0 @@
// Copyright 2021 gtips (@gtips)
// 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.
*/
#define LAYOUT( \
K02, K03, K04, K05, K06, K07, K40, K41, K42, K43, \
K10, K11, K12, K13, K14, K15, K16, K17, K44, K45, K46, K47, \
K20, K21, K22, K23, K24, K25, K26, K27, K50, K51, K52, K53, \
K30, K31, K32, K33, K34, K35, K36, K37, K54, K55, K56,\
K60, K61, K62, K63, K64, K65, K66, K67 \
) { \
{ KC_NO, KC_NO, K02, K03, K04, K05, K06, K07 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
{ K50, K51, K52, K53, K54, K55, K56, KC_NO }, \
{ K60, K61, K62, K63, K64, K65, K66, K67 } \
}

View file

@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View file

@ -8,73 +8,82 @@
"pid": "0x7C1A",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0, "w":2},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1},
{"x":2.5, "y":1},
{"x":3.5, "y":1},
{"x":4.5, "y":1},
{"x":5.5, "y":1},
{"x":6.5, "y":1},
{"x":7.5, "y":1},
{"x":8.5, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
{"x":5.25, "y":3},
{"x":6.25, "y":3},
{"x":7.25, "y":3},
{"x":8.25, "y":3},
{"x":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3, "w":2.75},
{"x":0, "y":4, "w":1.25},
{"x":1.25, "y":4, "w":1.25},
{"x":2.5, "y":4, "w":1.25},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25},
{"x":12.5, "y":4, "w":1.25},
{"x":13.75, "y":4, "w":1.25}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 3},
{"matrix": [3, 2], "x": 3.25, "y": 3},
{"matrix": [3, 3], "x": 4.25, "y": 3},
{"matrix": [3, 4], "x": 5.25, "y": 3},
{"matrix": [3, 5], "x": 6.25, "y": 3},
{"matrix": [3, 6], "x": 7.25, "y": 3},
{"matrix": [3, 7], "x": 8.25, "y": 3},
{"matrix": [3, 8], "x": 9.25, "y": 3},
{"matrix": [3, 9], "x": 10.25, "y": 3},
{"matrix": [3, 10], "x": 11.25, "y": 3},
{"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
]
}
}

View file

@ -19,8 +19,7 @@
// place overrides here
// --- RGB underglow ---
#define RGB_DI_PIN B7
#ifdef RGB_DI_PIN
#define WS2812_DI_PIN B7
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@ -37,5 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif

View file

@ -1,17 +0,0 @@
/* Copyright 2020 gtips
*
* 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 "reviung61.h"

View file

@ -1,58 +0,0 @@
/* Copyright 2020 gtips
*
* 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
#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.
*/
/* ANSI
* ,-----------------------------------------------------------.
* | 00| 01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d |
* |-----------------------------------------------------------|
* | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d |
* |-----------------------------------------------------------|
* | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c |
* |-----------------------------------------------------------|
* | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b |
* |-----------------------------------------------------------|
* | 40 | 41 | 42 | 45 | 48 | 49 | 4a | 4b |
* `-----------------------------------------------------------'
*/
#define LAYOUT_60_ansi( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k45, k48, k49, k4a, k4b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, KC_NO }, \
{ k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, KC_NO, KC_NO } \
}