Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
le4ker committed Oct 24, 2024
2 parents 157da2f + 3b874ee commit 30abe68
Show file tree
Hide file tree
Showing 7 changed files with 577 additions and 0 deletions.
19 changes: 19 additions & 0 deletions keyboards/xdboards/recon/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright 2024 XD Boards <[email protected]>
*
* 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

#define OLED_DISPLAY_128X64
201 changes: 201 additions & 0 deletions keyboards/xdboards/recon/keyboard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
{
"manufacturer": "XD Boards",
"keyboard_name": "xdboards/recon",
"maintainer": "Xanimos",
"development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"oled": true
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1"]
},
"url": "https://xdboards.xyz",
"tags": ["columnar", "split", "thumb cluster", "rgb", "encoder"],
"usb": {
"device_version": "1.0.0",
"pid": "0x02F7",
"vid": "0xFEED"
},
"encoder": {
"rotary": [
{ "pin_a": "B6","pin_b": "B2" }
]
},
"split": {
"enabled": true,
"serial": {
"pin": "D3"
},
"handedness": {
"pin": "D2"
},
"transport": {
"sync": {
"layer_state": true,
"oled": true,
"matrix_state": true,
"modifiers": true
}
}
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.75},
{"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.75},
{"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.25},
{"label": "L04", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.25},
{"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.5},

{"label": "R06", "matrix": [5, 5], "x": 10.5, "y": 0.5},
{"label": "R05", "matrix": [5, 4], "x": 11.5, "y": 0.25},
{"label": "R04", "matrix": [5, 3], "x": 12.5, "y": 0},
{"label": "R03", "matrix": [5, 2], "x": 13.5, "y": 0.25},
{"label": "R02", "matrix": [5, 1], "x": 14.5, "y": 0.75},
{"label": "R01", "matrix": [5, 0], "x": 15.5, "y": 0.75},

{"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.75},
{"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.75},
{"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.25},
{"label": "L10", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.25},
{"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.5},

{"label": "R12", "matrix": [6, 5], "x": 10.5, "y": 1.5},
{"label": "R11", "matrix": [6, 4], "x": 11.5, "y": 1.25},
{"label": "R10", "matrix": [6, 3], "x": 12.5, "y": 1},
{"label": "R09", "matrix": [6, 2], "x": 13.5, "y": 1.25},
{"label": "R08", "matrix": [6, 1], "x": 14.5, "y": 1.75},
{"label": "R07", "matrix": [6, 0], "x": 15.5, "y": 1.75},

{"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.75},
{"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.75},
{"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.25},
{"label": "L16", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.25},
{"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.5},

{"label": "R18", "matrix": [7, 5], "x": 10.5, "y": 2.5},
{"label": "R17", "matrix": [7, 4], "x": 11.5, "y": 2.25},
{"label": "R16", "matrix": [7, 3], "x": 12.5, "y": 2},
{"label": "R15", "matrix": [7, 2], "x": 13.5, "y": 2.25},
{"label": "R14", "matrix": [7, 1], "x": 14.5, "y": 2.75},
{"label": "R13", "matrix": [7, 0], "x": 15.5, "y": 2.75},

{"label": "L27", "encoder": 0, "matrix": [3, 0], "x": 6, "y": 2.7},

{"label": "R27", "encoder": 1, "matrix": [8, 0], "x": 9.5, "y": 2.7},

{"label": "L19", "matrix": [3, 2], "x": 4.25, "y": 3.5},
{"label": "L20", "matrix": [3, 3], "x": 5.25, "y": 3.75},
{"label": "L21", "matrix": [3, 4], "x": 6.25, "y": 4},
{"label": "L22", "matrix": [3, 5], "x": 7.25, "y": 4.25},

{"label": "R22", "matrix": [8, 5], "x": 8, "y": 4.25},
{"label": "R21", "matrix": [8, 4], "x": 9, "y": 4},
{"label": "R20", "matrix": [8, 3], "x": 10, "y": 3.75},
{"label": "R19", "matrix": [8, 2], "x": 11, "y": 3.5},

{"label": "L23", "matrix": [4, 2], "x": 4.25, "y": 4.5},
{"label": "L24", "matrix": [4, 3], "x": 5.25, "y": 4.75},
{"label": "L25", "matrix": [4, 4], "x": 6.25, "y": 5},
{"label": "L26", "matrix": [4, 5], "x": 7.25, "y": 5.25},

{"label": "R26", "matrix": [9, 5], "x": 8, "y": 5.25},
{"label": "R25", "matrix": [9, 4], "x": 9, "y": 5},
{"label": "R24", "matrix": [9, 3], "x": 10, "y": 4.75},
{"label": "R23", "matrix": [9, 2], "x": 11, "y": 4.5}

]
}
},
"rgb_matrix": {
"driver": "ws2812",
"layout": [

{"flags": 4, "matrix": [0, 0], "x": 13, "y": 16},
{"flags": 4, "matrix": [0, 1], "x": 21, "y": 16},
{"flags": 4, "matrix": [0, 2], "x": 30, "y": 11},
{"flags": 4, "matrix": [0, 3], "x": 38, "y": 6},
{"flags": 4, "matrix": [0, 4], "x": 46, "y": 11},
{"flags": 4, "matrix": [0, 5], "x": 55, "y": 12},
{"flags": 4, "matrix": [1, 0], "x": 13, "y": 24},
{"flags": 4, "matrix": [1, 1], "x": 21, "y": 24},
{"flags": 4, "matrix": [1, 2], "x": 30, "y": 19},
{"flags": 4, "matrix": [1, 3], "x": 38, "y": 14},
{"flags": 4, "matrix": [1, 4], "x": 46, "y": 19},
{"flags": 4, "matrix": [1, 5], "x": 55, "y": 20},
{"flags": 4, "matrix": [2, 0], "x": 13, "y": 32},
{"flags": 4, "matrix": [2, 1], "x": 21, "y": 32},
{"flags": 4, "matrix": [2, 2], "x": 30, "y": 26},
{"flags": 4, "matrix": [2, 3], "x": 38, "y": 22},
{"flags": 4, "matrix": [2, 4], "x": 46, "y": 27},
{"flags": 4, "matrix": [2, 5], "x": 55, "y": 28},

{"flags": 4, "matrix": [3, 2], "x": 42, "y": 35},
{"flags": 4, "matrix": [3, 3], "x": 54, "y": 37},
{"flags": 4, "matrix": [3, 4], "x": 65, "y": 40},
{"flags": 4, "matrix": [3, 5], "x": 76, "y": 45},
{"flags": 4, "matrix": [4, 2], "x": 42, "y": 44},
{"flags": 4, "matrix": [4, 3], "x": 52, "y": 45},
{"flags": 4, "matrix": [4, 4], "x": 62, "y": 47},
{"flags": 4, "matrix": [4, 5], "x": 71, "y": 52},

{"flags": 2, "x": 68, "y": 36},
{"flags": 2, "x": 57, "y": 8},
{"flags": 2, "x": 31, "y": 6},
{"flags": 2, "x": 14, "y": 12},
{"flags": 2, "x": 28, "y": 37},

{"flags": 4, "matrix": [5, 0], "x": 175, "y": 16},
{"flags": 4, "matrix": [5, 1], "x": 166, "y": 16},
{"flags": 4, "matrix": [5, 2], "x": 158, "y": 11},
{"flags": 4, "matrix": [5, 3], "x": 149, "y": 6},
{"flags": 4, "matrix": [5, 4], "x": 141, "y": 11},
{"flags": 4, "matrix": [5, 5], "x": 133, "y": 12},
{"flags": 4, "matrix": [6, 0], "x": 175, "y": 24},
{"flags": 4, "matrix": [6, 1], "x": 166, "y": 24},
{"flags": 4, "matrix": [6, 2], "x": 158, "y": 19},
{"flags": 4, "matrix": [6, 3], "x": 149, "y": 14},
{"flags": 4, "matrix": [6, 4], "x": 141, "y": 19},
{"flags": 4, "matrix": [6, 5], "x": 133, "y": 20},
{"flags": 4, "matrix": [7, 0], "x": 175, "y": 32},
{"flags": 4, "matrix": [7, 1], "x": 166, "y": 32},
{"flags": 4, "matrix": [7, 2], "x": 158, "y": 26},
{"flags": 4, "matrix": [7, 3], "x": 149, "y": 22},
{"flags": 4, "matrix": [7, 4], "x": 141, "y": 27},
{"flags": 4, "matrix": [7, 5], "x": 133, "y": 28},

{"flags": 4, "matrix": [8, 2], "x": 146, "y": 35},
{"flags": 4, "matrix": [8, 3], "x": 134, "y": 37},
{"flags": 4, "matrix": [8, 4], "x": 123, "y": 40},
{"flags": 4, "matrix": [8, 5], "x": 113, "y": 45},
{"flags": 4, "matrix": [9, 2], "x": 146, "y": 44},
{"flags": 4, "matrix": [9, 3], "x": 136, "y": 45},
{"flags": 4, "matrix": [9, 4], "x": 126, "y": 47},
{"flags": 4, "matrix": [9, 5], "x": 117, "y": 52},

{"flags": 2, "x": 121, "y": 36},
{"flags": 2, "x": 130, "y": 8},
{"flags": 2, "x": 156, "y": 6},
{"flags": 2, "x": 172, "y": 12},
{"flags": 2, "x": 158, "y": 37}
],
"split_count": [31, 31],
"animations": {
"alphas_mods": true,
"solid_reactive": true
},
"default": {
"animation": "solid_reactive",
"hue": 126
}
}
}
Loading

0 comments on commit 30abe68

Please sign in to comment.