sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zvecr
2022-11-22 02:48:11 +00:00
parent 08805cada0 06a3801a27
commit ab17d34dbd
100 changed files with 1756 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/bastardkb/scylla/blackpill/info.json
View File

@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Blackpill",
"usb": {
"device_version": "1.0.0",
},
"device_version": "1.0.0"
}
}

118
keyboards/bastardkb/scylla/info.json
View File

@@ -1,69 +1,69 @@
{
"url": "https://bastardkb.com/scylla",
"usb": {
"pid": "0x1829",
"pid": "0x1829"
},
"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}
{ "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 }
]
}
}

4
keyboards/bastardkb/scylla/scylla.c
View File

@@ -1,4 +1,4 @@
/*
/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
#include "scylla.h"
// clang-format off
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
// left
@@ -59,3 +60,4 @@ led_config_t g_led_config = { {
2, 2, 2, 2, 2
} };
#endif
// clang-format on

4
keyboards/bastardkb/scylla/v1/elitec/info.json
View File

@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Elite-C",
"usb": {
"device_version": "1.0.0",
},
"device_version": "1.0.0"
}
}

4
keyboards/bastardkb/scylla/v2/elitec/info.json
View File

@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Elite-C",
"usb": {
"device_version": "2.0.0",
},
"device_version": "2.0.0"
}
}

8
keyboards/bastardkb/scylla/v2/splinky/config.h
View File

@@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \
{ GP29, GP26, GP5, GP4, GP9 }
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define SPLIT_HAND_PIN GP13
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
/* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1

4
keyboards/bastardkb/scylla/v2/splinky/info.json
View File

@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Splinky",
"usb": {
"device_version": "2.0.0",
},
"device_version": "2.0.0"
}
}

8
keyboards/bastardkb/scylla/v2/splinky/v2/config.h
View File

@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ GP27, GP28, GP15, GP6, GP7, GP8 }
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define SPLIT_HAND_PIN GP13
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.

8
keyboards/bastardkb/scylla/v2/splinky/v3/config.h
View File

@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ GP27, GP28, GP21, GP6, GP7, GP8 }
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define SPLIT_HAND_PIN GP15
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.

2
keyboards/bastardkb/scylla/v2/stemcell/info.json
View File

@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla STeMCell",
"usb": {
"device_version": "2.0.0"
"device_version": "2.0.0"
}
}