Skip to content

Commit

Permalink
Move matrix config to info.json, part 1 (qmk#19985)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and coquizen committed Jun 22, 2023
1 parent d6a841b commit f131bb2
Show file tree
Hide file tree
Showing 502 changed files with 1,652 additions and 16,637 deletions.
7 changes: 0 additions & 7 deletions keyboards/0_sixty/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

#pragma once


#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
5 changes: 5 additions & 0 deletions keyboards/0_sixty/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"vid": "0x7654",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2"],
"rows": ["B1", "F7", "F6", "F5", "F4"]
},
"diode_direction": "COL2ROW",
"features": {
"extrakey": true,
"console": true,
Expand Down
17 changes: 0 additions & 17 deletions keyboards/0xc7/61key/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#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)
*
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 }

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
5 changes: 5 additions & 0 deletions keyboards/0xc7/61key/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x6161",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
Expand Down
19 changes: 0 additions & 19 deletions keyboards/0xcb/static/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once

// clang-format off

/*
* 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)
*
*/
#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 }
#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 }

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define TAP_CODE_DELAY 10
// clang-format on

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
Expand Down
5 changes: 5 additions & 0 deletions keyboards/0xcb/static/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0xA455",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
"rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D0", "pin_b": "D1"}
Expand Down
6 changes: 0 additions & 6 deletions keyboards/10bleoledhub/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/

#pragma once


#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
#define MATRIX_COL_PINS { D6, D7, B5 }

#define DIODE_DIRECTION ROW2COL

#define SSD1306OLED
#define RGB_DI_PIN B7

Expand Down
5 changes: 5 additions & 0 deletions keyboards/10bleoledhub/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x7C99",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D6", "D7", "B5"],
"rows": ["F0", "F5", "F4", "F6"]
},
"diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "C7", "pin_b": "F7"}
Expand Down
17 changes: 0 additions & 17 deletions keyboards/1upkeyboards/1up60hse/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#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)
*
*/
#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN F0
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
5 changes: 5 additions & 0 deletions keyboards/1upkeyboards/1up60hse/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x6873",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
"rows": ["B3", "B2", "B1", "B0", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
Expand Down
8 changes: 0 additions & 8 deletions keyboards/1upkeyboards/1up60hte/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* key matrix pins */
#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

Expand Down
5 changes: 5 additions & 0 deletions keyboards/1upkeyboards/1up60hte/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x6874",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
"rows": ["B3", "B2", "B1", "B0", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
Expand Down
8 changes: 0 additions & 8 deletions keyboards/1upkeyboards/1up60rgb/config.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#pragma once


/* key matrix pins */
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

Expand Down
5 changes: 5 additions & 0 deletions keyboards/1upkeyboards/1up60rgb/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x7267",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
Expand Down
9 changes: 8 additions & 1 deletion keyboards/1upkeyboards/pi40/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@

#pragma once

#define OLED_DISPLAY_128X32

#define DYNAMIC_KEYMAP_LAYER_COUNT 10

#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X32
#define I2C1_SCL_PIN GP17
#define I2C1_SDA_PIN GP16
#define I2C_DRIVER I2CD0
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
#endif

#define RGB_DI_PIN GP0
#define RGB_MATRIX_LED_COUNT 47
#define RGBLED_NUM 47
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGBLIGHT_LIMIT_VAL 150
Expand Down
128 changes: 128 additions & 0 deletions keyboards/1upkeyboards/pi40/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"keyboard_name": "pi40",
"manufacturer": "1upkeyboards",
"usb": {
"vid": "0x6F75",
"pid": "0x5600",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"],
"rows": ["GP21", "GP20", "GP19", "GP18"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "GP14", "pin_b": "GP13"}
]
},
"processor": "RP2040",
"bootloader": "rp2040",
"board": "GENERIC_RP_RP2040",
"layouts": {
"LAYOUT": {
"layout": [
{ "matrix": [3, 6], "x": 11, "y": 0 },
{ "matrix": [0, 0], "x": 0, "y": 1 },
{ "matrix": [0, 1], "x": 1, "y": 1 },
{ "matrix": [0, 2], "x": 2, "y": 1 },
{ "matrix": [0, 3], "x": 3, "y": 1 },
{ "matrix": [0, 4], "x": 4, "y": 1 },
{ "matrix": [0, 5], "x": 5, "y": 1 },
{ "matrix": [0, 6], "x": 6, "y": 1 },
{ "matrix": [0, 7], "x": 7, "y": 1 },
{ "matrix": [0, 8], "x": 8, "y": 1 },
{ "matrix": [0, 9], "x": 9, "y": 1 },
{ "matrix": [0, 10], "x": 10, "y": 1 },
{ "matrix": [0, 11], "x": 11, "y": 1 },
{ "matrix": [1, 0], "x": 0, "y": 2 },
{ "matrix": [1, 1], "x": 1, "y": 2 },
{ "matrix": [1, 2], "x": 2, "y": 2 },
{ "matrix": [1, 3], "x": 3, "y": 2 },
{ "matrix": [1, 4], "x": 4, "y": 2 },
{ "matrix": [1, 5], "x": 5, "y": 2 },
{ "matrix": [1, 6], "x": 6, "y": 2 },
{ "matrix": [1, 7], "x": 7, "y": 2 },
{ "matrix": [1, 8], "x": 8, "y": 2 },
{ "matrix": [1, 9], "x": 9, "y": 2 },
{ "matrix": [1, 10], "x": 10, "y": 2 },
{ "matrix": [1, 11], "x": 11, "y": 2 },
{ "matrix": [2, 0], "x": 0, "y": 3 },
{ "matrix": [2, 1], "x": 1, "y": 3 },
{ "matrix": [2, 2], "x": 2, "y": 3 },
{ "matrix": [2, 3], "x": 3, "y": 3 },
{ "matrix": [2, 4], "x": 4, "y": 3 },
{ "matrix": [2, 5], "x": 5, "y": 3 },
{ "matrix": [2, 6], "x": 6, "y": 3 },
{ "matrix": [2, 7], "x": 7, "y": 3 },
{ "matrix": [2, 8], "x": 8, "y": 3 },
{ "matrix": [2, 9], "x": 9, "y": 3 },
{ "matrix": [2, 10], "x": 10, "y": 3 },
{ "matrix": [2, 11], "x": 11, "y": 3 },
{ "matrix": [3, 0], "x": 0, "y": 4 },
{ "matrix": [3, 1], "x": 1, "y": 4 },
{ "matrix": [3, 2], "x": 2, "y": 4 },
{ "matrix": [3, 3], "x": 3, "y": 4 },
{ "matrix": [3, 4], "x": 4, "y": 4 },
{ "matrix": [3, 5], "x": 5, "y": 4, "w": 2},
{ "matrix": [3, 7], "x": 7, "y": 4 },
{ "matrix": [3, 8], "x": 8, "y": 4 },
{ "matrix": [3, 9], "x": 9, "y": 4 },
{ "matrix": [3, 10], "x": 10, "y": 4 },
{ "matrix": [3, 11], "x": 11, "y": 4 }
]
},
"LAYOUT_ortho_4x12": {
"layout": [
{ "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": [0, 6], "x": 6, "y": 0 },
{ "matrix": [0, 7], "x": 7, "y": 0 },
{ "matrix": [0, 8], "x": 8, "y": 0 },
{ "matrix": [0, 9], "x": 9, "y": 0 },
{ "matrix": [0, 10], "x": 10, "y": 0 },
{ "matrix": [0, 11], "x": 11, "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": [1, 6], "x": 6, "y": 1 },
{ "matrix": [1, 7], "x": 7, "y": 1 },
{ "matrix": [1, 8], "x": 8, "y": 1 },
{ "matrix": [1, 9], "x": 9, "y": 1 },
{ "matrix": [1, 10], "x": 10, "y": 1 },
{ "matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2 },
{ "matrix": [2, 7], "x": 7, "y": 2 },
{ "matrix": [2, 8], "x": 8, "y": 2 },
{ "matrix": [2, 9], "x": 9, "y": 2 },
{ "matrix": [2, 10], "x": 10, "y": 2 },
{ "matrix": [2, 11], "x": 11, "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": [3, 6], "x": 6, "y": 3, "label": "ENC" },
{ "matrix": [3, 7], "x": 7, "y": 3 },
{ "matrix": [3, 8], "x": 8, "y": 3 },
{ "matrix": [3, 9], "x": 9, "y": 3 },
{ "matrix": [3, 10], "x": 10, "y": 3 },
{ "matrix": [3, 11], "x": 11, "y": 3 }
]
}
}
}
19 changes: 0 additions & 19 deletions keyboards/1upkeyboards/super16/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#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)
*
*/
#define MATRIX_ROW_PINS \
{ D1, D0, F4, F5 }
#define MATRIX_COL_PINS \
{ D4, C6, F6, F7 }

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring
Expand Down
Loading

0 comments on commit f131bb2

Please sign in to comment.