1
0
Fork 0

Move matrix config to info.json, part 6 (#20019)

This commit is contained in:
Ryan 2023-03-11 00:32:05 +11:00 committed by GitHub
parent 9e64300e67
commit 76cc7fe109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
702 changed files with 1779 additions and 5015 deletions

View file

@ -1,21 +0,0 @@
/*
* Copyright 2022 Uthol
*
* 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 DIODE_DIRECTION COL2ROW

View file

@ -1,23 +0,0 @@
/*
* Copyright 2022 Uthol
*
* 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
/* Uthol PCB default pin-out */
#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }

View file

@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"],
"rows": ["D1", "D0", "D4", "C6", "D7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}

View file

@ -17,11 +17,6 @@
#pragma once
/* Uthol PCB default pin-out */
#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
//RGB Stuff
#define RGB_DI_PIN E6
#define RGBLED_NUM 39

View file

@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.2"
},
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"],
"rows": ["B1", "F7", "F6", "F5", "F4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}

View file

@ -17,14 +17,6 @@
#pragma once
/* key matrix size */
// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1
#define MATRIX_COL_PINS \
{ B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 }
#define MATRIX_ROW_PINS \
{ A4, A3, A2, A1, A0 }
// OLED config
#define OLED_DISPLAY_128X64
#define OLED_DISPLAY_WIDTH 128

View file

@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.3"
},
"matrix_pins": {
"cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
"rows": ["A4", "A3", "A2", "A1", "A0"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C15", "pin_b": "C14", "resolution": 2}