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

This commit is contained in:
zvecr 2022-04-05 19:37:58 +01:00
commit 18aa0d2d19
3 changed files with 146 additions and 146 deletions

View file

@ -1,63 +1,63 @@
/* Copyright 2022 EASON XIAOXUXK@YEAH.NET
*
* 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 "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xF21E
#define PRODUCT_ID 0x6E6E
#define DEVICE_VER 0x0001
#define MANUFACTURER eason
#define PRODUCT capsule65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
/*
* 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, D1, B7, D0, F5 }
#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
#define DIODE_DIRECTION COL2ROW
#define LED_CAPS_LOCK_PIN F6
#define RGB_DI_PIN F7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
/* Copyright 2022 EASON XIAOXUXK@YEAH.NET
*
* 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 "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xF21E
#define PRODUCT_ID 0x6E6E
#define DEVICE_VER 0x0001
#define MANUFACTURER eason
#define PRODUCT capsule65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
/*
* 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, D1, B7, D0, F5 }
#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
#define DIODE_DIRECTION COL2ROW
#define LED_CAPS_LOCK_PIN F6
#define RGB_DI_PIN F7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

View file

@ -1,81 +1,81 @@
{
"keyboard_name": "CAPSULE65",
"url": "",
"maintainer": "eason",
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "K00 (F4,D5)", "x": 0, "y": 0 },
{ "label": "K01 (F4,D2)", "x": 1, "y": 0 },
{ "label": "K02 (F4,D3)", "x": 2, "y": 0 },
{ "label": "K03 (F4,D4)", "x": 3, "y": 0 },
{ "label": "K04 (F4,D6)", "x": 4, "y": 0 },
{ "label": "K05 (F4,D7)", "x": 5, "y": 0 },
{ "label": "K06 (F4,B4)", "x": 6, "y": 0 },
{ "label": "K07 (F4,B5)", "x": 7, "y": 0 },
{ "label": "K08 (F4,B6)", "x": 8, "y": 0 },
{ "label": "K09 (F4,C6)", "x": 9, "y": 0 },
{ "label": "K0A (F4,C7)", "x": 10, "y": 0 },
{ "label": "K0B (F4,E2)", "x": 11, "y": 0 },
{ "label": "K0C (F4,B3)", "x": 12, "y": 0 },
{ "label": "K0D (F4,B1)", "x": 13, "y": 0 },
{ "label": "K0E (F4,B0)", "x": 14, "y": 0 },
{ "label": "K0F (F4,B2)", "x": 15, "y": 0 },
{ "label": "K10 (D1,D5)", "x": 0, "y": 1 ,"w":1.5},
{ "label": "K11 (D1,D2)", "x": 1.5, "y": 1},
{ "label": "K12 (D1,D3)", "x": 2.5, "y": 1 },
{ "label": "K13 (D1,D4)", "x": 3.5, "y": 1 },
{ "label": "K14 (D1,D6)", "x": 4.5, "y": 1 },
{ "label": "K15 (D1,D7)", "x": 5.5, "y": 1 },
{ "label": "K16 (D1,B4)", "x": 6.5, "y": 1 },
{ "label": "K17 (D1,B5)", "x": 7.5, "y": 1 },
{ "label": "K18 (D1,B6)", "x": 8.5, "y": 1 },
{ "label": "K19 (D1,C6)", "x": 9.5, "y": 1 },
{ "label": "K1A (D1,C7)", "x": 10.5, "y": 1 },
{ "label": "K1B (D1,E2)", "x": 11.5, "y": 1 },
{ "label": "K1C (D1,B3)", "x": 12.5, "y": 1 },
{ "label": "K1D (D1,B1)", "x": 13.5, "y": 1 ,"w":1.5},
{ "label": "K1F (D1,B2)", "x": 15, "y": 1 },
{ "label": "K20 (B7,D5)", "x": 0, "y": 2,"w":1.75 },
{ "label": "K21 (B7,D2)", "x": 1.75, "y": 2 },
{ "label": "K22 (B7,D3)", "x": 2.75, "y": 2 },
{ "label": "K23 (B7,D4)", "x": 3.75, "y": 2 },
{ "label": "K24 (B7,D6)", "x": 4.75, "y": 2 },
{ "label": "K25 (B7,D7)", "x": 5.75, "y": 2 },
{ "label": "K26 (B7,B4)", "x": 6.75, "y": 2 },
{ "label": "K27 (B7,B5)", "x": 7.75, "y": 2 },
{ "label": "K28 (B7,B6)", "x": 8.75, "y": 2 },
{ "label": "K29 (B7,C6)", "x": 9.75, "y": 2 },
{ "label": "K2A (B7,C7)", "x": 10.75, "y": 2 },
{ "label": "K2B (B7,E2)", "x": 11.75, "y": 2 },
{ "label": "K2C (B7,B3)", "x": 12.75, "y": 2 ,"w":2.25},
{ "label": "K2F (B7,B2)", "x": 15, "y": 2 },
{ "label": "K30 (D0,D5)", "x": 0, "y": 3 ,"w":1.25},
{ "label": "K31 (D0,D2)", "x": 1.25, "y": 3 },
{ "label": "K32 (D0,D3)", "x": 2.25, "y": 3 },
{ "label": "K33 (D0,D4)", "x": 3.25, "y": 3 },
{ "label": "K34 (D0,D6)", "x": 4.25, "y": 3 },
{ "label": "K35 (D0,D7)", "x": 5.25, "y": 3 },
{ "label": "K36 (D0,B4)", "x": 6.25, "y": 3 },
{ "label": "K37 (D0,B5)", "x": 7.25, "y": 3 },
{ "label": "K38 (D0,B6)", "x": 8.25, "y": 3 },
{ "label": "K39 (D0,C6)", "x": 9.25, "y": 3 },
{ "label": "K3A (D0,C7)", "x": 10.25, "y": 3 },
{ "label": "K3B (D0,E2)", "x": 11.25, "y": 3 },
{ "label": "K3C (D0,B3)", "x": 12.25, "y": 3 ,"w":1.75 },
{ "label": "K3D (D0,B1)", "x": 14, "y": 3 },
{ "label": "K3F (D0,B2)", "x": 15, "y": 3 },
{ "label": "K40 (F5,D5)", "x": 0, "y": 4 ,"w":1.25},
{ "label": "K41 (F5,D2)", "x": 1.25, "y": 4 ,"w":1.25},
{ "label": "K42 (F5,D3)", "x": 2.5, "y": 4 ,"w":1.25},
{ "label": "K45 (F5,D7)", "x": 3.75, "y": 4,"w":6.25 },
{ "label": "K49 (F5,C6)", "x": 10, "y": 4 },
{ "label": "K4A (F5,C7)", "x": 11, "y": 4 },
{ "label": "K4B (F5,E2)", "x": 12, "y": 4 },
{ "label": "K4C (F5,B3)", "x": 13, "y": 4 },
{ "label": "K4D (F5,B1)", "x": 14, "y": 4 },
{ "label": "K4F (F5,B2)", "x": 15, "y": 4 }
]
}
}
}
{
"keyboard_name": "CAPSULE65",
"url": "",
"maintainer": "eason",
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "K00 (F4,D5)", "x": 0, "y": 0 },
{ "label": "K01 (F4,D2)", "x": 1, "y": 0 },
{ "label": "K02 (F4,D3)", "x": 2, "y": 0 },
{ "label": "K03 (F4,D4)", "x": 3, "y": 0 },
{ "label": "K04 (F4,D6)", "x": 4, "y": 0 },
{ "label": "K05 (F4,D7)", "x": 5, "y": 0 },
{ "label": "K06 (F4,B4)", "x": 6, "y": 0 },
{ "label": "K07 (F4,B5)", "x": 7, "y": 0 },
{ "label": "K08 (F4,B6)", "x": 8, "y": 0 },
{ "label": "K09 (F4,C6)", "x": 9, "y": 0 },
{ "label": "K0A (F4,C7)", "x": 10, "y": 0 },
{ "label": "K0B (F4,E2)", "x": 11, "y": 0 },
{ "label": "K0C (F4,B3)", "x": 12, "y": 0 },
{ "label": "K0D (F4,B1)", "x": 13, "y": 0 },
{ "label": "K0E (F4,B0)", "x": 14, "y": 0 },
{ "label": "K0F (F4,B2)", "x": 15, "y": 0 },
{ "label": "K10 (D1,D5)", "x": 0, "y": 1 ,"w":1.5},
{ "label": "K11 (D1,D2)", "x": 1.5, "y": 1},
{ "label": "K12 (D1,D3)", "x": 2.5, "y": 1 },
{ "label": "K13 (D1,D4)", "x": 3.5, "y": 1 },
{ "label": "K14 (D1,D6)", "x": 4.5, "y": 1 },
{ "label": "K15 (D1,D7)", "x": 5.5, "y": 1 },
{ "label": "K16 (D1,B4)", "x": 6.5, "y": 1 },
{ "label": "K17 (D1,B5)", "x": 7.5, "y": 1 },
{ "label": "K18 (D1,B6)", "x": 8.5, "y": 1 },
{ "label": "K19 (D1,C6)", "x": 9.5, "y": 1 },
{ "label": "K1A (D1,C7)", "x": 10.5, "y": 1 },
{ "label": "K1B (D1,E2)", "x": 11.5, "y": 1 },
{ "label": "K1C (D1,B3)", "x": 12.5, "y": 1 },
{ "label": "K1D (D1,B1)", "x": 13.5, "y": 1 ,"w":1.5},
{ "label": "K1F (D1,B2)", "x": 15, "y": 1 },
{ "label": "K20 (B7,D5)", "x": 0, "y": 2,"w":1.75 },
{ "label": "K21 (B7,D2)", "x": 1.75, "y": 2 },
{ "label": "K22 (B7,D3)", "x": 2.75, "y": 2 },
{ "label": "K23 (B7,D4)", "x": 3.75, "y": 2 },
{ "label": "K24 (B7,D6)", "x": 4.75, "y": 2 },
{ "label": "K25 (B7,D7)", "x": 5.75, "y": 2 },
{ "label": "K26 (B7,B4)", "x": 6.75, "y": 2 },
{ "label": "K27 (B7,B5)", "x": 7.75, "y": 2 },
{ "label": "K28 (B7,B6)", "x": 8.75, "y": 2 },
{ "label": "K29 (B7,C6)", "x": 9.75, "y": 2 },
{ "label": "K2A (B7,C7)", "x": 10.75, "y": 2 },
{ "label": "K2B (B7,E2)", "x": 11.75, "y": 2 },
{ "label": "K2C (B7,B3)", "x": 12.75, "y": 2 ,"w":2.25},
{ "label": "K2F (B7,B2)", "x": 15, "y": 2 },
{ "label": "K30 (D0,D5)", "x": 0, "y": 3 ,"w":1.25},
{ "label": "K31 (D0,D2)", "x": 1.25, "y": 3 },
{ "label": "K32 (D0,D3)", "x": 2.25, "y": 3 },
{ "label": "K33 (D0,D4)", "x": 3.25, "y": 3 },
{ "label": "K34 (D0,D6)", "x": 4.25, "y": 3 },
{ "label": "K35 (D0,D7)", "x": 5.25, "y": 3 },
{ "label": "K36 (D0,B4)", "x": 6.25, "y": 3 },
{ "label": "K37 (D0,B5)", "x": 7.25, "y": 3 },
{ "label": "K38 (D0,B6)", "x": 8.25, "y": 3 },
{ "label": "K39 (D0,C6)", "x": 9.25, "y": 3 },
{ "label": "K3A (D0,C7)", "x": 10.25, "y": 3 },
{ "label": "K3B (D0,E2)", "x": 11.25, "y": 3 },
{ "label": "K3C (D0,B3)", "x": 12.25, "y": 3 ,"w":1.75 },
{ "label": "K3D (D0,B1)", "x": 14, "y": 3 },
{ "label": "K3F (D0,B2)", "x": 15, "y": 3 },
{ "label": "K40 (F5,D5)", "x": 0, "y": 4 ,"w":1.25},
{ "label": "K41 (F5,D2)", "x": 1.25, "y": 4 ,"w":1.25},
{ "label": "K42 (F5,D3)", "x": 2.5, "y": 4 ,"w":1.25},
{ "label": "K45 (F5,D7)", "x": 3.75, "y": 4,"w":6.25 },
{ "label": "K49 (F5,C6)", "x": 10, "y": 4 },
{ "label": "K4A (F5,C7)", "x": 11, "y": 4 },
{ "label": "K4B (F5,E2)", "x": 12, "y": 4 },
{ "label": "K4C (F5,B3)", "x": 13, "y": 4 },
{ "label": "K4D (F5,B1)", "x": 14, "y": 4 },
{ "label": "K4F (F5,B2)", "x": 15, "y": 4 }
]
}
}
}

View file

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