summaryrefslogtreecommitdiff
path: root/keyboards/recompile_keys/choco60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/recompile_keys/choco60')
-rw-r--r--keyboards/recompile_keys/choco60/choco60.c17
-rw-r--r--keyboards/recompile_keys/choco60/rev1/config.h16
-rw-r--r--keyboards/recompile_keys/choco60/rev1/info.json5
-rw-r--r--keyboards/recompile_keys/choco60/rev1/rev1.c17
-rw-r--r--keyboards/recompile_keys/choco60/rev1/rev1.h19
-rw-r--r--keyboards/recompile_keys/choco60/rev2/config.h19
-rw-r--r--keyboards/recompile_keys/choco60/rev2/info.json13
-rw-r--r--keyboards/recompile_keys/choco60/rev2/rev2.c17
-rw-r--r--keyboards/recompile_keys/choco60/rev2/rev2.h19
9 files changed, 17 insertions, 125 deletions
diff --git a/keyboards/recompile_keys/choco60/choco60.c b/keyboards/recompile_keys/choco60/choco60.c
deleted file mode 100644
index fc56c68ac8..0000000000
--- a/keyboards/recompile_keys/choco60/choco60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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/>.
- */
-
-#include "choco60.h"
diff --git a/keyboards/recompile_keys/choco60/rev1/config.h b/keyboards/recompile_keys/choco60/rev1/config.h
index 20fefc2180..ba9e3a474e 100644
--- a/keyboards/recompile_keys/choco60/rev1/config.h
+++ b/keyboards/recompile_keys/choco60/rev1/config.h
@@ -17,20 +17,4 @@ 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 { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN D0
diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json
index 81738c4d47..3960f575ab 100644
--- a/keyboards/recompile_keys/choco60/rev1/info.json
+++ b/keyboards/recompile_keys/choco60/rev1/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.c b/keyboards/recompile_keys/choco60/rev1/rev1.c
deleted file mode 100644
index fe60477e34..0000000000
--- a/keyboards/recompile_keys/choco60/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.h b/keyboards/recompile_keys/choco60/rev1/rev1.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/choco60/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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
-
-#include "quantum.h"
diff --git a/keyboards/recompile_keys/choco60/rev2/config.h b/keyboards/recompile_keys/choco60/rev2/config.h
index 0540d16151..e081d748ce 100644
--- a/keyboards/recompile_keys/choco60/rev2/config.h
+++ b/keyboards/recompile_keys/choco60/rev2/config.h
@@ -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 { C5, C4, B6, B7, C7 }
-#define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 }
-/* The last three NO_PIN are dummies to make the same size as MATRIX_ROW_PINS_RIGHT. */
-#define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0, NO_PIN, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN D1
#define SPLIT_USB_DETECT
diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json
index a768c060db..c03e8678f6 100644
--- a/keyboards/recompile_keys/choco60/rev2/info.json
+++ b/keyboards/recompile_keys/choco60/rev2/info.json
@@ -1,6 +1,17 @@
{
+ "matrix_pins": {
+ "cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null],
+ "rows": ["C5", "C4", "B6", "B7", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
+ "rows": ["D3", "D2", "D5", "D6", "B0"]
+ }
+ }
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu"
diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.c b/keyboards/recompile_keys/choco60/rev2/rev2.c
deleted file mode 100644
index 5eabb33ac6..0000000000
--- a/keyboards/recompile_keys/choco60/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.h b/keyboards/recompile_keys/choco60/rev2/rev2.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/choco60/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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
-
-#include "quantum.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 11:26:59 +0000