Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
8f42e096cb
98 changed files with 2642 additions and 3794 deletions
|
|
@ -19,47 +19,47 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x5_2": {
|
||||
"layout": [
|
||||
{"x": 0, "y": 0.93},
|
||||
{"x": 1, "y": 0.31},
|
||||
{"x": 2, "y": 0},
|
||||
{"x": 3, "y": 0.28},
|
||||
{"x": 4, "y": 0.42},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.93},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.31},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0.28},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0.42},
|
||||
|
||||
{"x": 7, "y": 0.42},
|
||||
{"x": 8, "y": 0.28},
|
||||
{"x": 9, "y": 0},
|
||||
{"x": 10, "y": 0.31},
|
||||
{"x": 11, "y": 0.93},
|
||||
{"matrix": [4, 4], "x": 7, "y": 0.42},
|
||||
{"matrix": [4, 3], "x": 8, "y": 0.28},
|
||||
{"matrix": [4, 2], "x": 9, "y": 0},
|
||||
{"matrix": [4, 1], "x": 10, "y": 0.31},
|
||||
{"matrix": [4, 0], "x": 11, "y": 0.93},
|
||||
|
||||
{"x": 0, "y": 1.93},
|
||||
{"x": 1, "y": 1.31},
|
||||
{"x": 2, "y": 1},
|
||||
{"x": 3, "y": 1.28},
|
||||
{"x": 4, "y": 1.42},
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.93},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1.31},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1.28},
|
||||
{"matrix": [1, 4], "x": 4, "y": 1.42},
|
||||
|
||||
{"x": 7, "y": 1.42},
|
||||
{"x": 8, "y": 1.28},
|
||||
{"x": 9, "y": 1},
|
||||
{"x": 10, "y": 1.31},
|
||||
{"x": 11, "y": 1.93},
|
||||
{"matrix": [5, 4], "x": 7, "y": 1.42},
|
||||
{"matrix": [5, 3], "x": 8, "y": 1.28},
|
||||
{"matrix": [5, 2], "x": 9, "y": 1},
|
||||
{"matrix": [5, 1], "x": 10, "y": 1.31},
|
||||
{"matrix": [5, 0], "x": 11, "y": 1.93},
|
||||
|
||||
{"x": 0, "y": 2.93},
|
||||
{"x": 1, "y": 2.31},
|
||||
{"x": 2, "y": 2},
|
||||
{"x": 3, "y": 2.28},
|
||||
{"x": 4, "y": 2.42},
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.93},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2.31},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2.28},
|
||||
{"matrix": [2, 4], "x": 4, "y": 2.42},
|
||||
|
||||
{"x": 7, "y": 2.42},
|
||||
{"x": 8, "y": 2.28},
|
||||
{"x": 9, "y": 2},
|
||||
{"x": 10, "y": 2.31},
|
||||
{"x": 11, "y": 2.93},
|
||||
{"matrix": [6, 4], "x": 7, "y": 2.42},
|
||||
{"matrix": [6, 3], "x": 8, "y": 2.28},
|
||||
{"matrix": [6, 2], "x": 9, "y": 2},
|
||||
{"matrix": [6, 1], "x": 10, "y": 2.31},
|
||||
{"matrix": [6, 0], "x": 11, "y": 2.93},
|
||||
|
||||
{"x": 3.5, "y": 3.45},
|
||||
{"x": 4.5, "y": 3.7},
|
||||
{"matrix": [3, 3], "x": 3.5, "y": 3.45},
|
||||
{"matrix": [3, 4], "x": 4.5, "y": 3.7},
|
||||
|
||||
{"x": 6.5, "y": 3.7},
|
||||
{"x": 7.5, "y": 3.45}
|
||||
{"matrix": [7, 4], "x": 6.5, "y": 3.7},
|
||||
{"matrix": [7, 3], "x": 7.5, "y": 3.45}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
Copyright 2022 Tommy Alatalo <@altosys>
|
||||
|
||||
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"
|
||||
|
||||
#define ____ KC_NO
|
||||
|
||||
/* left hand right hand */
|
||||
#define LAYOUT_split_3x5_2(\
|
||||
K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\
|
||||
K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\
|
||||
K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\
|
||||
K3_2, K3_3, K3_4, K3_5 )\
|
||||
/* matrix positions */\
|
||||
{\
|
||||
{K0_0, K0_1, K0_2, K0_3, K0_4},\
|
||||
{K1_0, K1_1, K1_2, K1_3, K1_4},\
|
||||
{K2_0, K2_1, K2_2, K2_3, K2_4},\
|
||||
{____, ____, ____, K3_2, K3_3},\
|
||||
\
|
||||
{K0_9, K0_8, K0_7, K0_6, K0_5},\
|
||||
{K1_9, K1_8, K1_7, K1_6, K1_5},\
|
||||
{K2_9, K2_8, K2_7, K2_6, K2_5},\
|
||||
{____, ____, ____, K3_5, K3_4} \
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
/**
|
||||
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
|
||||
*
|
||||
* 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
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_3x5_2( \
|
||||
k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
|
||||
k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
|
||||
k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
|
||||
k30, k32, k72, k70 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04 }, \
|
||||
{ k10, k11, k12, k13, k14 }, \
|
||||
{ k20, k21, k22, k23, k24 }, \
|
||||
{ k30, KC_NO, k32, KC_NO, KC_NO }, \
|
||||
{ k40, k41, k42, k43, k44 }, \
|
||||
{ k50, k51, k52, k53, k54 }, \
|
||||
{ k60, k61, k62, k63, k64 }, \
|
||||
{ k70, KC_NO, k72, KC_NO, KC_NO }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -7,40 +7,47 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x5_2": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "L30", "x": 4, "y": 3 },
|
||||
{ "label": "L32", "x": 5, "y": 3 },
|
||||
{ "label": "R32", "x": 10, "y": 3 },
|
||||
{ "label": "R30", "x": 11, "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": [4, 4], "x": 11, "y": 0},
|
||||
{"matrix": [4, 3], "x": 12, "y": 0},
|
||||
{"matrix": [4, 2], "x": 13, "y": 0},
|
||||
{"matrix": [4, 1], "x": 14, "y": 0},
|
||||
{"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
|
||||
{"matrix": [5, 3], "x": 12, "y": 1},
|
||||
{"matrix": [5, 2], "x": 13, "y": 1},
|
||||
{"matrix": [5, 1], "x": 14, "y": 1},
|
||||
{"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
|
||||
{"matrix": [6, 3], "x": 12, "y": 2},
|
||||
{"matrix": [6, 2], "x": 13, "y": 2},
|
||||
{"matrix": [6, 1], "x": 14, "y": 2},
|
||||
{"matrix": [6, 0], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 4, "y": 3},
|
||||
{"matrix": [3, 2], "x": 5, "y": 3},
|
||||
|
||||
{"matrix": [7, 2], "x": 10, "y": 3},
|
||||
{"matrix": [7, 0], "x": 11, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "3x5_3.h"
|
||||
#include "quantum.h"
|
||||
|
||||
/**
|
||||
* LEDs index.
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
/**
|
||||
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
|
||||
*
|
||||
* 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 "dilemma.h"
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_3x5_3( \
|
||||
k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
|
||||
k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
|
||||
k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
|
||||
k32, k30, k31, k71, k70, k72 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04 }, \
|
||||
{ k10, k11, k12, k13, k14 }, \
|
||||
{ k20, k21, k22, k23, k24 }, \
|
||||
{ k30, k31, k32, KC_NO, KC_NO }, \
|
||||
{ k40, k41, k42, k43, k44 }, \
|
||||
{ k50, k51, k52, k53, k54 }, \
|
||||
{ k60, k61, k62, k63, k64 }, \
|
||||
{ k70, k71, k72, KC_NO, KC_NO }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -21,42 +21,49 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "L32", "x": 4, "y": 3 },
|
||||
{ "label": "L33", "x": 5, "y": 3 },
|
||||
{ "label": "L34", "x": 6, "y": 3 },
|
||||
{ "label": "R32", "x": 11, "y": 3 },
|
||||
{ "label": "R33", "x": 10, "y": 3 },
|
||||
{ "label": "R34", "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": [4, 4], "x": 11, "y": 0},
|
||||
{"matrix": [4, 3], "x": 12, "y": 0},
|
||||
{"matrix": [4, 2], "x": 13, "y": 0},
|
||||
{"matrix": [4, 1], "x": 14, "y": 0},
|
||||
{"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
|
||||
{"matrix": [5, 3], "x": 12, "y": 1},
|
||||
{"matrix": [5, 2], "x": 13, "y": 1},
|
||||
{"matrix": [5, 1], "x": 14, "y": 1},
|
||||
{"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
|
||||
{"matrix": [6, 3], "x": 12, "y": 2},
|
||||
{"matrix": [6, 2], "x": 13, "y": 2},
|
||||
{"matrix": [6, 1], "x": 14, "y": 2},
|
||||
{"matrix": [6, 0], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [3, 2], "x": 4, "y": 3},
|
||||
{"matrix": [3, 0], "x": 5, "y": 3},
|
||||
{"matrix": [3, 1], "x": 6, "y": 3},
|
||||
|
||||
{"matrix": [7, 1], "x": 11, "y": 3},
|
||||
{"matrix": [7, 0], "x": 10, "y": 3},
|
||||
{"matrix": [7, 2], "x": 9, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,16 +17,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
// clang-format off
|
||||
#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
|
||||
# include "3x5_2.h"
|
||||
#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
|
||||
# include "3x5_3.h"
|
||||
#else
|
||||
# error "Unsuported format"
|
||||
#endif
|
||||
// clang-format on
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
|
|
|
|||
|
|
@ -6,64 +6,75 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_4x6_5": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "L05", "x": 5, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "R05", "x": 16, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "L15", "x": 5, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "R15", "x": 16, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "L25", "x": 5, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "R25", "x": 16, "y": 2 },
|
||||
{ "label": "L30", "x": 0, "y": 3 },
|
||||
{ "label": "L31", "x": 1, "y": 3 },
|
||||
{ "label": "L32", "x": 2, "y": 3 },
|
||||
{ "label": "L33", "x": 3, "y": 3 },
|
||||
{ "label": "L34", "x": 4, "y": 3 },
|
||||
{ "label": "L35", "x": 5, "y": 3 },
|
||||
{ "label": "R30", "x": 11, "y": 3 },
|
||||
{ "label": "R31", "x": 12, "y": 3 },
|
||||
{ "label": "R32", "x": 13, "y": 3 },
|
||||
{ "label": "R33", "x": 14, "y": 3 },
|
||||
{ "label": "R34", "x": 15, "y": 3 },
|
||||
{ "label": "R35", "x": 16, "y": 3 },
|
||||
{ "label": "L43", "x": 5, "y": 4 },
|
||||
{ "label": "L44", "x": 6, "y": 4 },
|
||||
{ "label": "L45", "x": 7, "y": 4 },
|
||||
{ "label": "R40", "x": 9, "y": 4 },
|
||||
{ "label": "R41", "x": 10, "y": 4 },
|
||||
{ "label": "R40", "x": 11, "y": 4 },
|
||||
{ "label": "L52", "x": 6, "y": 5 },
|
||||
{ "label": "L53", "x": 7, "y": 5 },
|
||||
{ "label": "R52", "x": 9, "y": 5 },
|
||||
{ "label": "R53", "x": 10, "y": 5 }
|
||||
{"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": [5, 5], "x": 11, "y": 0},
|
||||
{"matrix": [5, 4], "x": 12, "y": 0},
|
||||
{"matrix": [5, 3], "x": 13, "y": 0},
|
||||
{"matrix": [5, 2], "x": 14, "y": 0},
|
||||
{"matrix": [5, 1], "x": 15, "y": 0},
|
||||
{"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
|
||||
{"matrix": [6, 4], "x": 12, "y": 1},
|
||||
{"matrix": [6, 3], "x": 13, "y": 1},
|
||||
{"matrix": [6, 2], "x": 14, "y": 1},
|
||||
{"matrix": [6, 1], "x": 15, "y": 1},
|
||||
{"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
|
||||
{"matrix": [7, 4], "x": 12, "y": 2},
|
||||
{"matrix": [7, 3], "x": 13, "y": 2},
|
||||
{"matrix": [7, 2], "x": 14, "y": 2},
|
||||
{"matrix": [7, 1], "x": 15, "y": 2},
|
||||
{"matrix": [7, 0], "x": 16, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4, "y": 3},
|
||||
{"matrix": [3, 5], "x": 5, "y": 3},
|
||||
|
||||
{"matrix": [8, 5], "x": 11, "y": 3},
|
||||
{"matrix": [8, 4], "x": 12, "y": 3},
|
||||
{"matrix": [8, 3], "x": 13, "y": 3},
|
||||
{"matrix": [8, 2], "x": 14, "y": 3},
|
||||
{"matrix": [8, 1], "x": 15, "y": 3},
|
||||
{"matrix": [8, 0], "x": 16, "y": 3},
|
||||
|
||||
{"matrix": [4, 3], "x": 5, "y": 4},
|
||||
{"matrix": [4, 4], "x": 6, "y": 4},
|
||||
{"matrix": [4, 1], "x": 7, "y": 4},
|
||||
|
||||
{"matrix": [9, 1], "x": 9, "y": 4},
|
||||
{"matrix": [9, 4], "x": 10, "y": 4},
|
||||
{"matrix": [9, 3], "x": 11, "y": 4},
|
||||
|
||||
{"matrix": [4, 5], "x": 6, "y": 5},
|
||||
{"matrix": [4, 2], "x": 7, "y": 5},
|
||||
|
||||
{"matrix": [9, 2], "x": 9, "y": 5},
|
||||
{"matrix": [9, 5], "x": 10, "y": 5}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "scylla.h"
|
||||
#include "quantum.h"
|
||||
|
||||
// clang-format off
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
|
||||
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
|
||||
*
|
||||
* 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"
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_4x6_5( \
|
||||
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
|
||||
k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
|
||||
k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
|
||||
k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
|
||||
k43, k44, k41, k91, k94, k93, \
|
||||
k45, k42, k92, k95 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04, k05 }, \
|
||||
{ k10, k11, k12, k13, k14, k15 }, \
|
||||
{ k20, k21, k22, k23, k24, k25 }, \
|
||||
{ k30, k31, k32, k33, k34, k35 }, \
|
||||
{ KC_NO, k41, k42, k43, k44, k45 }, \
|
||||
{ k50, k51, k52, k53, k54, k55 }, \
|
||||
{ k60, k61, k62, k63, k64, k65 }, \
|
||||
{ k70, k71, k72, k73, k74, k75 }, \
|
||||
{ k80, k81, k82, k83, k84, k85 }, \
|
||||
{ KC_NO, k91, k92, k93, k94, k95 }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -7,42 +7,49 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "L33", "x": 4, "y": 3 },
|
||||
{ "label": "L34", "x": 5, "y": 3 },
|
||||
{ "label": "L31", "x": 6, "y": 3 },
|
||||
{ "label": "R33", "x": 9, "y": 3 },
|
||||
{ "label": "R34", "x": 10, "y": 3 },
|
||||
{ "label": "R31", "x": 11, "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": [4, 4], "x": 11, "y": 0},
|
||||
{"matrix": [4, 3], "x": 12, "y": 0},
|
||||
{"matrix": [4, 2], "x": 13, "y": 0},
|
||||
{"matrix": [4, 1], "x": 14, "y": 0},
|
||||
{"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1},
|
||||
{"matrix": [5, 3], "x": 12, "y": 1},
|
||||
{"matrix": [5, 2], "x": 13, "y": 1},
|
||||
{"matrix": [5, 1], "x": 14, "y": 1},
|
||||
{"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2},
|
||||
{"matrix": [6, 3], "x": 12, "y": 2},
|
||||
{"matrix": [6, 2], "x": 13, "y": 2},
|
||||
{"matrix": [6, 1], "x": 14, "y": 2},
|
||||
{"matrix": [6, 0], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [3, 2], "x": 4, "y": 3},
|
||||
{"matrix": [3, 3], "x": 5, "y": 3},
|
||||
{"matrix": [3, 0], "x": 6, "y": 3},
|
||||
|
||||
{"matrix": [7, 0], "x": 9, "y": 3},
|
||||
{"matrix": [7, 3], "x": 10, "y": 3},
|
||||
{"matrix": [7, 2], "x": 11, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "skeletyl.h"
|
||||
#include "quantum.h"
|
||||
|
||||
/**
|
||||
* LEDs index.
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
|
||||
* Copyright 2022 Charly DELAY <charly@codesink.dev>
|
||||
*
|
||||
* 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"
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_3x5_3( \
|
||||
k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
|
||||
k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
|
||||
k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
|
||||
k32, k33, k30, k70, k73, k72 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04 }, \
|
||||
{ k10, k11, k12, k13, k14 }, \
|
||||
{ k20, k21, k22, k23, k24 }, \
|
||||
{ k30, KC_NO, k32, k33, KC_NO }, \
|
||||
{ k40, k41, k42, k43, k44 }, \
|
||||
{ k50, k51, k52, k53, k54 }, \
|
||||
{ k60, k61, k62, k63, k64 }, \
|
||||
{ k70, KC_NO, k72, k73, KC_NO }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -18,64 +18,64 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_4x6_5": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "L05", "x": 5, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "R05", "x": 16, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "L15", "x": 5, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "R15", "x": 16, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "L25", "x": 5, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "R25", "x": 16, "y": 2 },
|
||||
{ "label": "L30", "x": 0, "y": 3 },
|
||||
{ "label": "L31", "x": 1, "y": 3 },
|
||||
{ "label": "L32", "x": 2, "y": 3 },
|
||||
{ "label": "L33", "x": 3, "y": 3 },
|
||||
{ "label": "L34", "x": 4, "y": 3 },
|
||||
{ "label": "L35", "x": 5, "y": 3 },
|
||||
{ "label": "R30", "x": 11, "y": 3 },
|
||||
{ "label": "R31", "x": 12, "y": 3 },
|
||||
{ "label": "R32", "x": 13, "y": 3 },
|
||||
{ "label": "R33", "x": 14, "y": 3 },
|
||||
{ "label": "R34", "x": 15, "y": 3 },
|
||||
{ "label": "R35", "x": 16, "y": 3 },
|
||||
{ "label": "L43", "x": 5, "y": 4 },
|
||||
{ "label": "L44", "x": 6, "y": 4 },
|
||||
{ "label": "L45", "x": 7, "y": 4 },
|
||||
{ "label": "R40", "x": 9, "y": 4 },
|
||||
{ "label": "R41", "x": 10, "y": 4 },
|
||||
{ "label": "R40", "x": 11, "y": 4 },
|
||||
{ "label": "L52", "x": 6, "y": 5 },
|
||||
{ "label": "L53", "x": 7, "y": 5 },
|
||||
{ "label": "R52", "x": 9, "y": 5 },
|
||||
{ "label": "R53", "x": 10, "y": 5 }
|
||||
{"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": [5, 5], "x": 11, "y": 0},
|
||||
{"matrix": [5, 4], "x": 12, "y": 0},
|
||||
{"matrix": [5, 3], "x": 13, "y": 0},
|
||||
{"matrix": [5, 2], "x": 14, "y": 0},
|
||||
{"matrix": [5, 1], "x": 15, "y": 0},
|
||||
{"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
|
||||
{"matrix": [6, 4], "x": 12, "y": 1},
|
||||
{"matrix": [6, 3], "x": 13, "y": 1},
|
||||
{"matrix": [6, 2], "x": 14, "y": 1},
|
||||
{"matrix": [6, 1], "x": 15, "y": 1},
|
||||
{"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
|
||||
{"matrix": [7, 4], "x": 12, "y": 2},
|
||||
{"matrix": [7, 3], "x": 13, "y": 2},
|
||||
{"matrix": [7, 2], "x": 14, "y": 2},
|
||||
{"matrix": [7, 1], "x": 15, "y": 2},
|
||||
{"matrix": [7, 0], "x": 16, "y": 2},
|
||||
{"matrix": [3, 0], "x": 0, "y": 3},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4, "y": 3},
|
||||
{"matrix": [3, 5], "x": 5, "y": 3},
|
||||
{"matrix": [8, 5], "x": 11, "y": 3},
|
||||
{"matrix": [8, 4], "x": 12, "y": 3},
|
||||
{"matrix": [8, 3], "x": 13, "y": 3},
|
||||
{"matrix": [8, 2], "x": 14, "y": 3},
|
||||
{"matrix": [8, 1], "x": 15, "y": 3},
|
||||
{"matrix": [8, 0], "x": 16, "y": 3},
|
||||
{"matrix": [4, 3], "x": 5, "y": 4},
|
||||
{"matrix": [4, 4], "x": 6, "y": 4},
|
||||
{"matrix": [4, 1], "x": 7, "y": 4},
|
||||
{"matrix": [9, 1], "x": 9, "y": 4},
|
||||
{"matrix": [9, 4], "x": 10, "y": 4},
|
||||
{"matrix": [9, 3], "x": 11, "y": 4},
|
||||
{"matrix": [4, 5], "x": 6, "y": 5},
|
||||
{"matrix": [4, 2], "x": 7, "y": 5},
|
||||
{"matrix": [9, 2], "x": 9, "y": 5},
|
||||
{"matrix": [9, 5], "x": 10, "y": 5}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
/**
|
||||
* Copyright 2021 Quentin LEBASTARD <qlebastard@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
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_4x6_5( \
|
||||
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
|
||||
k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
|
||||
k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
|
||||
k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
|
||||
k43, k44, k41, k91, k94, k93, \
|
||||
k45, k42, k92, k95 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04, k05 }, \
|
||||
{ k10, k11, k12, k13, k14, k15 }, \
|
||||
{ k20, k21, k22, k23, k24, k25 }, \
|
||||
{ k30, k31, k32, k33, k34, k35 }, \
|
||||
{ KC_NO, k41, k42, k43, k44, k45 }, \
|
||||
{ k50, k51, k52, k53, k54, k55 }, \
|
||||
{ k60, k61, k62, k63, k64, k65 }, \
|
||||
{ k70, k71, k72, k73, k74, k75 }, \
|
||||
{ k80, k81, k82, k83, k84, k85 }, \
|
||||
{ KC_NO, k91, k92, k93, k94, k95 }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -7,48 +7,55 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x6_3": {
|
||||
"layout": [
|
||||
{ "label": "L00", "x": 0, "y": 0 },
|
||||
{ "label": "L01", "x": 1, "y": 0 },
|
||||
{ "label": "L02", "x": 2, "y": 0 },
|
||||
{ "label": "L03", "x": 3, "y": 0 },
|
||||
{ "label": "L04", "x": 4, "y": 0 },
|
||||
{ "label": "L05", "x": 5, "y": 0 },
|
||||
{ "label": "R00", "x": 11, "y": 0 },
|
||||
{ "label": "R01", "x": 12, "y": 0 },
|
||||
{ "label": "R02", "x": 13, "y": 0 },
|
||||
{ "label": "R03", "x": 14, "y": 0 },
|
||||
{ "label": "R04", "x": 15, "y": 0 },
|
||||
{ "label": "R05", "x": 16, "y": 0 },
|
||||
{ "label": "L10", "x": 0, "y": 1 },
|
||||
{ "label": "L11", "x": 1, "y": 1 },
|
||||
{ "label": "L12", "x": 2, "y": 1 },
|
||||
{ "label": "L13", "x": 3, "y": 1 },
|
||||
{ "label": "L14", "x": 4, "y": 1 },
|
||||
{ "label": "L15", "x": 5, "y": 1 },
|
||||
{ "label": "R10", "x": 11, "y": 1 },
|
||||
{ "label": "R11", "x": 12, "y": 1 },
|
||||
{ "label": "R12", "x": 13, "y": 1 },
|
||||
{ "label": "R13", "x": 14, "y": 1 },
|
||||
{ "label": "R14", "x": 15, "y": 1 },
|
||||
{ "label": "R15", "x": 16, "y": 1 },
|
||||
{ "label": "L20", "x": 0, "y": 2 },
|
||||
{ "label": "L21", "x": 1, "y": 2 },
|
||||
{ "label": "L22", "x": 2, "y": 2 },
|
||||
{ "label": "L23", "x": 3, "y": 2 },
|
||||
{ "label": "L24", "x": 4, "y": 2 },
|
||||
{ "label": "L25", "x": 5, "y": 2 },
|
||||
{ "label": "R20", "x": 11, "y": 2 },
|
||||
{ "label": "R21", "x": 12, "y": 2 },
|
||||
{ "label": "R22", "x": 13, "y": 2 },
|
||||
{ "label": "R23", "x": 14, "y": 2 },
|
||||
{ "label": "R24", "x": 15, "y": 2 },
|
||||
{ "label": "R25", "x": 16, "y": 2 },
|
||||
{ "label": "L33", "x": 5, "y": 3 },
|
||||
{ "label": "L34", "x": 6, "y": 3 },
|
||||
{ "label": "L31", "x": 7, "y": 3 },
|
||||
{ "label": "R33", "x": 9, "y": 3 },
|
||||
{ "label": "R34", "x": 10, "y": 3 },
|
||||
{ "label": "R31", "x": 11, "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": [4, 5], "x": 11, "y": 0},
|
||||
{"matrix": [4, 4], "x": 12, "y": 0},
|
||||
{"matrix": [4, 3], "x": 13, "y": 0},
|
||||
{"matrix": [4, 2], "x": 14, "y": 0},
|
||||
{"matrix": [4, 1], "x": 15, "y": 0},
|
||||
{"matrix": [4, 0], "x": 16, "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": [5, 5], "x": 11, "y": 1},
|
||||
{"matrix": [5, 4], "x": 12, "y": 1},
|
||||
{"matrix": [5, 3], "x": 13, "y": 1},
|
||||
{"matrix": [5, 2], "x": 14, "y": 1},
|
||||
{"matrix": [5, 1], "x": 15, "y": 1},
|
||||
{"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 2},
|
||||
{"matrix": [6, 4], "x": 12, "y": 2},
|
||||
{"matrix": [6, 3], "x": 13, "y": 2},
|
||||
{"matrix": [6, 2], "x": 14, "y": 2},
|
||||
{"matrix": [6, 1], "x": 15, "y": 2},
|
||||
{"matrix": [6, 0], "x": 16, "y": 2},
|
||||
|
||||
{"matrix": [3, 3], "x": 5, "y": 3},
|
||||
{"matrix": [3, 4], "x": 6, "y": 3},
|
||||
{"matrix": [3, 1], "x": 7, "y": 3},
|
||||
|
||||
{"matrix": [7, 1], "x": 9, "y": 3},
|
||||
{"matrix": [7, 4], "x": 10, "y": 3},
|
||||
{"matrix": [7, 3], "x": 11, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "tbkmini.h"
|
||||
#include "quantum.h"
|
||||
|
||||
// clang-format off
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
|
||||
* Copyright 2022 Charly DELAY <charly@codesink.dev>
|
||||
*
|
||||
* 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"
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_split_3x6_3( \
|
||||
k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
|
||||
k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
|
||||
k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
|
||||
k33, k34, k31, k71, k74, k73 \
|
||||
) \
|
||||
{ \
|
||||
{ k00, k01, k02, k03, k04, k05 }, \
|
||||
{ k10, k11, k12, k13, k14, k15 }, \
|
||||
{ k20, k21, k22, k23, k24, k25 }, \
|
||||
{ KC_NO, k31, KC_NO, k33, k34, KC_NO }, \
|
||||
{ k40, k41, k42, k43, k44, k45 }, \
|
||||
{ k50, k51, k52, k53, k54, k55 }, \
|
||||
{ k60, k61, k62, k63, k64, k65 }, \
|
||||
{ KC_NO, k71, KC_NO, k73, k74, KC_NO }, \
|
||||
}
|
||||
// clang-format on
|
||||
|
|
@ -34,42 +34,49 @@
|
|||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [
|
||||
{"label":"SW1", "x":0, "y":0.375},
|
||||
{"label":"SW2", "x":1, "y":0.125},
|
||||
{"label":"SW3", "x":2, "y":0},
|
||||
{"label":"SW4", "x":3, "y":0.125},
|
||||
{"label":"SW5", "x":4, "y":0.25},
|
||||
{"label":"SW19", "x":8, "y":0.25},
|
||||
{"label":"SW20", "x":9, "y":0.125},
|
||||
{"label":"SW21", "x":10, "y":0},
|
||||
{"label":"SW22", "x":11, "y":0.125},
|
||||
{"label":"SW23", "x":12, "y":0.375},
|
||||
{"label":"SW6", "x":0, "y":1.375},
|
||||
{"label":"SW7", "x":1, "y":1.125},
|
||||
{"label":"SW8", "x":2, "y":1},
|
||||
{"label":"SW9", "x":3, "y":1.125},
|
||||
{"label":"SW10", "x":4, "y":1.25},
|
||||
{"label":"SW24", "x":8, "y":1.25},
|
||||
{"label":"SW25", "x":9, "y":1.125},
|
||||
{"label":"SW26", "x":10, "y":1},
|
||||
{"label":"SW27", "x":11, "y":1.125},
|
||||
{"label":"SW28", "x":12, "y":1.375},
|
||||
{"label":"SW11", "x":0, "y":2.375},
|
||||
{"label":"SW12", "x":1, "y":2.125},
|
||||
{"label":"SW13", "x":2, "y":2},
|
||||
{"label":"SW14", "x":3, "y":2.125},
|
||||
{"label":"SW15", "x":4, "y":2.25},
|
||||
{"label":"SW29", "x":8, "y":2.25},
|
||||
{"label":"SW30", "x":9, "y":2.125},
|
||||
{"label":"SW31", "x":10, "y":2},
|
||||
{"label":"SW32", "x":11, "y":2.125},
|
||||
{"label":"SW33", "x":12, "y":2.375},
|
||||
{"label":"SW16", "x":2.875, "y":3.25},
|
||||
{"label":"SW17", "x":4, "y":3.375},
|
||||
{"label":"SW28", "x":5.125, "y":3.625},
|
||||
{"label":"SW34", "x":6.875, "y":3.625},
|
||||
{"label":"SW35", "x":8, "y":3.375},
|
||||
{"label":"SW36", "x":9.125, "y":3.25}
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.375},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.125},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0.125},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0.25},
|
||||
|
||||
{"matrix": [4, 4], "x": 8, "y": 0.25},
|
||||
{"matrix": [4, 3], "x": 9, "y": 0.125},
|
||||
{"matrix": [4, 2], "x": 10, "y": 0},
|
||||
{"matrix": [4, 1], "x": 11, "y": 0.125},
|
||||
{"matrix": [4, 0], "x": 12, "y": 0.375},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.375},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1.125},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1.125},
|
||||
{"matrix": [1, 4], "x": 4, "y": 1.25},
|
||||
|
||||
{"matrix": [5, 4], "x": 8, "y": 1.25},
|
||||
{"matrix": [5, 3], "x": 9, "y": 1.125},
|
||||
{"matrix": [5, 2], "x": 10, "y": 1},
|
||||
{"matrix": [5, 1], "x": 11, "y": 1.125},
|
||||
{"matrix": [5, 0], "x": 12, "y": 1.375},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.375},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2.125},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2.125},
|
||||
{"matrix": [2, 4], "x": 4, "y": 2.25},
|
||||
|
||||
{"matrix": [6, 4], "x": 8, "y": 2.25},
|
||||
{"matrix": [6, 3], "x": 9, "y": 2.125},
|
||||
{"matrix": [6, 2], "x": 10, "y": 2},
|
||||
{"matrix": [6, 1], "x": 11, "y": 2.125},
|
||||
{"matrix": [6, 0], "x": 12, "y": 2.375},
|
||||
|
||||
{"matrix": [3, 2], "x": 2.875, "y": 3.25},
|
||||
{"matrix": [3, 3], "x": 4, "y": 3.375},
|
||||
{"matrix": [3, 4], "x": 5.125, "y": 3.625},
|
||||
|
||||
{"matrix": [7, 4], "x": 6.875, "y": 3.625},
|
||||
{"matrix": [7, 3], "x": 8, "y": 3.375},
|
||||
{"matrix": [7, 2], "x": 9.125, "y": 3.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue