summaryrefslogtreecommitdiffstats
path: root/keyboards/atreus
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 05:41:58 +1100
committerGitHub <noreply@github.com>2023-03-11 05:41:58 +1100
commite933e0411f442fa411d3d5ec488180fee241e2ef (patch)
treef091f00a1408d752389385ff793c2878ec99e368 /keyboards/atreus
parent1022afa6c24a64c78d1c9be99a695ff5335876f7 (diff)
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/atreus')
-rw-r--r--keyboards/atreus/astar/config.h38
-rw-r--r--keyboards/atreus/astar/info.json5
-rw-r--r--keyboards/atreus/astar_mirrored/config.h17
-rw-r--r--keyboards/atreus/astar_mirrored/info.json5
-rw-r--r--keyboards/atreus/f103/config.h36
-rw-r--r--keyboards/atreus/f103/info.json5
-rw-r--r--keyboards/atreus/feather/config.h19
-rw-r--r--keyboards/atreus/feather/info.json5
-rw-r--r--keyboards/atreus/promicro/config.h40
-rw-r--r--keyboards/atreus/promicro/info.json5
-rw-r--r--keyboards/atreus/teensy2/config.h34
-rw-r--r--keyboards/atreus/teensy2/info.json5
12 files changed, 30 insertions, 184 deletions
diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h
deleted file mode 100644
index 90bf37823d..0000000000
--- a/keyboards/atreus/astar/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-
-/*
- * 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 { D0, D1, D3, D2 }
-#if defined(PCBDOWN)
- #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-#else
- #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#endif
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/info.json
index 4369a04103..e201078ffe 100644
--- a/keyboards/atreus/astar/info.json
+++ b/keyboards/atreus/astar/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["D7", "C6", "B5", "B4", "E6", "D4", "B6", "F6", "F7", "D6", "B7"],
+ "rows": ["D0", "D1", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/atreus/astar_mirrored/config.h b/keyboards/atreus/astar_mirrored/config.h
index 83c9cf7fc6..3bd163dec3 100644
--- a/keyboards/atreus/astar_mirrored/config.h
+++ b/keyboards/atreus/astar_mirrored/config.h
@@ -16,21 +16,4 @@
#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 PCBDOWN 1
-
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/info.json
index 4369a04103..b83be5d29d 100644
--- a/keyboards/atreus/astar_mirrored/info.json
+++ b/keyboards/atreus/astar_mirrored/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["B7", "D6", "F7", "F6", "B6", "D4", "E6", "B4", "B5", "C6", "D7"],
+ "rows": ["D0", "D1", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/atreus/f103/config.h b/keyboards/atreus/f103/config.h
deleted file mode 100644
index d6d3b033dd..0000000000
--- a/keyboards/atreus/f103/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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
-
-
-/*
- * 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)
- *
-*/
-
-/* key matrix pins */
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, B5, B4, B3, A15, A10, A9 }
-#define MATRIX_ROW_PINS { A5, A4, A3, A2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json
index cf993be247..341ed4e8e6 100644
--- a/keyboards/atreus/f103/info.json
+++ b/keyboards/atreus/f103/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
+ "rows": ["A5", "A4", "A3", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino"
}
diff --git a/keyboards/atreus/feather/config.h b/keyboards/atreus/feather/config.h
index 34880f0e3e..505296a505 100644
--- a/keyboards/atreus/feather/config.h
+++ b/keyboards/atreus/feather/config.h
@@ -16,23 +16,4 @@
#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 { D0, D1, D3, D2 }
-// #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#define MATRIX_ROW_PINS { B7, D6, C7, F5 }
-#define MATRIX_COL_PINS { D7, B5, D1, D0, C6, B6, F0, D2, D3, F4, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define OUTPUT_AUTO_ENABLE
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
index 4369a04103..1f70534b7f 100644
--- a/keyboards/atreus/feather/info.json
+++ b/keyboards/atreus/feather/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"],
+ "rows": ["B7", "D6", "C7", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/atreus/promicro/config.h b/keyboards/atreus/promicro/config.h
deleted file mode 100644
index 6c0dd1d4b9..0000000000
--- a/keyboards/atreus/promicro/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-
-/*
- * 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)
- *
-*/
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B2, B4, B5 }
-#if defined(PCBDOWN)
- #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B6, B3, B1, F7, F6, F5 }
-#else
- #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B6, E6, D7, C6, D4, D0 }
-#endif
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/info.json
index 4369a04103..e614b4e2a0 100644
--- a/keyboards/atreus/promicro/info.json
+++ b/keyboards/atreus/promicro/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B6", "E6", "D7", "C6", "D4", "D0"],
+ "rows": ["F4", "B2", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h
deleted file mode 100644
index 4664561f9b..0000000000
--- a/keyboards/atreus/teensy2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-
-/*
- * 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 { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/info.json
index 0b2db81c11..067ea9a01d 100644
--- a/keyboards/atreus/teensy2/info.json
+++ b/keyboards/atreus/teensy2/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F4", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+ "rows": ["D0", "D1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "halfkay"
}