1
0
Fork 0

Move matrix config to info.json, part 2 (#19987)

This commit is contained in:
Ryan 2023-03-10 22:16:56 +11:00 committed by GitHub
parent 80661e5f19
commit dd086a51d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
494 changed files with 1235 additions and 3287 deletions

View file

@ -1,40 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@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
//#define AUDIO_VOICES
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

View file

@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Hadron Ver0 PCB default pin-out */
#define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 }
#define MATRIX_COL_PINS { F6, F7, D6, C7, F5, F4, F1, F0, D2, D3, D5, B3, B2, B1, B0 }
// configure oled driver for the 128x32 oled
#define OLED_UPDATE_INTERVAL 33 // ~30fps

View file

@ -2,6 +2,11 @@
"usb": {
"device_version": "0.0.2"
},
"matrix_pins": {
"cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
"rows": ["D7", "E6", "B4", "B5", "B6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "halfkay"
}

View file

@ -17,22 +17,6 @@
#pragma once
/*
* 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)
*
*/
#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS
#define MATRIX_ROW_PINS { C15, C14, A10, A9, A8 }
#define MATRIX_COL_PINS { B8, B2, B10, A0, A1, A2, B0, A3, B1, A6, A7, B12, C13, B11, B9 }
//Audio
#undef AUDIO_VOICES
#undef AUDIO_PIN

View file

@ -2,6 +2,11 @@
"usb": {
"device_version": "0.0.3"
},
"matrix_pins": {
"cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
"rows": ["C15", "C14", "A10", "A9", "A8"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B13", "pin_b": "B14"}