summaryrefslogtreecommitdiff
path: root/keyboards/fungo/rev1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/fungo/rev1')
-rw-r--r--keyboards/fungo/rev1/config.h16
-rw-r--r--keyboards/fungo/rev1/info.json170
-rw-r--r--keyboards/fungo/rev1/rev1.c17
-rw-r--r--keyboards/fungo/rev1/rev1.h42
4 files changed, 93 insertions, 152 deletions
diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h
index 43db4d05ca..187a7809bc 100644
--- a/keyboards/fungo/rev1/config.h
+++ b/keyboards/fungo/rev1/config.h
@@ -19,22 +19,6 @@
/* select keyboard master board - I2C or Serial communication master */
#define MASTER_RIGHT
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2}
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5}
-
-#define MATRIX_COL_PINS_RIGHT {F7, F6, F5, F4, B5, B4, E6}
-#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, D3} // TX
-
-
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-
/*************************************/
/** public parameter **/
/*************************************/
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index 12696e8045..c8a3248124 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -8,8 +8,19 @@
"pid": "0x1233",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D3"
+ "soft_serial_pin": "D3",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
+ "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
@@ -20,86 +31,91 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.375},
- {"x":1, "y":0.375},
- {"x":2, "y":0.125},
- {"x":3, "y":0},
- {"x":4, "y":0.125},
- {"x":5, "y":0.25},
- {"x":6, "y":0.5},
- {"x":12, "y":0.5},
- {"x":13, "y":0.25},
- {"x":14, "y":0.125},
- {"x":15, "y":0},
- {"x":16, "y":0.125},
- {"x":17, "y":0.375},
- {"x":18, "y":0.375},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [6, 0], "x": 12, "y": 0.5},
+ {"matrix": [6, 1], "x": 13, "y": 0.25},
+ {"matrix": [6, 2], "x": 14, "y": 0.125},
+ {"matrix": [6, 3], "x": 15, "y": 0},
+ {"matrix": [6, 4], "x": 16, "y": 0.125},
+ {"matrix": [6, 5], "x": 17, "y": 0.375},
+ {"matrix": [6, 6], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [7, 0], "x": 12, "y": 1.5},
+ {"matrix": [7, 1], "x": 13, "y": 1.25},
+ {"matrix": [7, 2], "x": 14, "y": 1.125},
+ {"matrix": [7, 3], "x": 15, "y": 1},
+ {"matrix": [7, 4], "x": 16, "y": 1.125},
+ {"matrix": [7, 5], "x": 17, "y": 1.375},
+ {"matrix": [7, 6], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+ {"matrix": [8, 0], "x": 12, "y": 2.5},
+ {"matrix": [8, 1], "x": 13, "y": 2.25},
+ {"matrix": [8, 2], "x": 14, "y": 2.125},
+ {"matrix": [8, 3], "x": 15, "y": 2},
+ {"matrix": [8, 4], "x": 16, "y": 2.125},
+ {"matrix": [8, 5], "x": 17, "y": 2.375},
+ {"matrix": [8, 6], "x": 18, "y": 2.375},
- {"x":0, "y":1.375},
- {"x":1, "y":1.375},
- {"x":2, "y":1.125},
- {"x":3, "y":1},
- {"x":4, "y":1.125},
- {"x":5, "y":1.25},
- {"x":6, "y":1.5},
- {"x":12, "y":1.5},
- {"x":13, "y":1.25},
- {"x":14, "y":1.125},
- {"x":15, "y":1},
- {"x":16, "y":1.125},
- {"x":17, "y":1.375},
- {"x":18, "y":1.375},
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
+ {"matrix": [4, 6], "x": 7, "y": 4.25},
+ {"matrix": [5, 2], "x": 8, "y": 4.5},
- {"x":0, "y":2.375},
- {"x":1, "y":2.375},
- {"x":2, "y":2.125},
- {"x":3, "y":2},
- {"x":4, "y":2.125},
- {"x":5, "y":2.25},
- {"x":6, "y":2.5},
- {"x":12, "y":2.5},
- {"x":13, "y":2.25},
- {"x":14, "y":2.125},
- {"x":15, "y":2},
- {"x":16, "y":2.125},
- {"x":17, "y":2.375},
- {"x":18, "y":2.375},
+ {"matrix": [11, 4], "x": 10, "y": 4.5},
+ {"matrix": [10, 0], "x": 11, "y": 4.25},
+ {"matrix": [9, 0], "x": 12, "y": 3.5},
+ {"matrix": [9, 1], "x": 13, "y": 3.25},
+ {"matrix": [9, 2], "x": 14, "y": 3.125},
+ {"matrix": [9, 3], "x": 15, "y": 3},
+ {"matrix": [9, 4], "x": 16, "y": 3.125},
+ {"matrix": [9, 5], "x": 17, "y": 3.375},
+ {"matrix": [9, 6], "x": 18, "y": 3.375},
- {"x":0, "y":3.375},
- {"x":1, "y":3.375},
- {"x":2, "y":3.125},
- {"x":3, "y":3},
- {"x":4, "y":3.125},
- {"x":5, "y":3.25},
- {"x":6, "y":3.5},
- {"x":7, "y":4.25},
- {"x":8, "y":4.5},
- {"x":10, "y":4.5},
- {"x":11, "y":4.25},
- {"x":12, "y":3.5},
- {"x":13, "y":3.25},
- {"x":14, "y":3.125},
- {"x":15, "y":3},
- {"x":16, "y":3.125},
- {"x":17, "y":3.375},
- {"x":18, "y":3.375},
+ {"matrix": [5, 0], "x": 0, "y": 4.375},
+ {"matrix": [5, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 0], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 5.75, "y": 5},
+ {"matrix": [4, 4], "x": 7, "y": 5.25},
+ {"matrix": [4, 5], "x": 8, "y": 5.5},
- {"x":0, "y":4.375},
- {"x":1, "y":4.375},
- {"x":2, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.5, "y":4.5},
- {"x":5.75, "y":5},
- {"x":7, "y":5.25},
- {"x":8, "y":5.5},
- {"x":10, "y":5.5},
- {"x":11, "y":5.25},
- {"x":12.25, "y":5},
- {"x":13.5, "y":4.5},
- {"x":14.75, "y":4.25},
- {"x":16, "y":4.25},
- {"x":17, "y":4.375},
- {"x":18, "y":4.375}
+ {"matrix": [10, 1], "x": 10, "y": 5.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.5, "y": 4.5},
+ {"matrix": [10, 5], "x": 14.75, "y": 4.25},
+ {"matrix": [10, 6], "x": 16, "y": 4.25},
+ {"matrix": [11, 5], "x": 17, "y": 4.375},
+ {"matrix": [11, 6], "x": 18, "y": 4.375}
]
}
}
diff --git a/keyboards/fungo/rev1/rev1.c b/keyboards/fungo/rev1/rev1.c
deleted file mode 100644
index 5fd3a11049..0000000000
--- a/keyboards/fungo/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * 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 "fungo.h"
diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h
deleted file mode 100644
index bb5fadcd9a..0000000000
--- a/keyboards/fungo/rev1/rev1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * 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 "fungo.h"
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \
- L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { L30, L31, L32, L33, L34, L35, L36}, \
- { L40, L41, L42, L43, L44, L45, L46}, \
- { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \
- { R06, R05, R04, R03, R02, R01, R00}, \
- { R16, R15, R14, R13, R12, R11, R10}, \
- { R26, R25, R24, R23, R22, R21, R20}, \
- { R36, R35, R34, R33, R32, R31, R30}, \
- { R46, R45, R44, R43, R42, R41, R40}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:31:07 +0000