summaryrefslogtreecommitdiff
path: root/keyboards/oddball
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/oddball')
-rw-r--r--keyboards/oddball/config.h4
-rw-r--r--keyboards/oddball/info.json55
-rw-r--r--keyboards/oddball/oddball.h17
-rw-r--r--keyboards/oddball/v1/config.h30
-rw-r--r--keyboards/oddball/v1/info.json5
-rw-r--r--keyboards/oddball/v1/v1.c17
-rw-r--r--keyboards/oddball/v1/v1.h19
-rw-r--r--keyboards/oddball/v2/config.h30
-rw-r--r--keyboards/oddball/v2/info.json5
-rw-r--r--keyboards/oddball/v2/v2.c17
-rw-r--r--keyboards/oddball/v2/v2.h19
-rw-r--r--keyboards/oddball/v2_1/config.h30
-rw-r--r--keyboards/oddball/v2_1/info.json5
-rw-r--r--keyboards/oddball/v2_1/v2_1.c17
-rw-r--r--keyboards/oddball/v2_1/v2_1.h19
15 files changed, 62 insertions, 227 deletions
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index 3666225a0e..71c4ecd4db 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -16,10 +16,6 @@
#pragma once
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Split Keyboard specific options */
#define USE_I2C
#define SPLIT_USB_DETECT
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 2eaca18e65..8e21be5d69 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -12,14 +12,53 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"sw1", "x":0, "y":0.37}, {"label":"sw2", "x":1, "y":0.37}, {"label":"sw3", "x":2, "y":0.12}, {"label":"sw4", "x":3, "y":0}, {"label":"sw5", "x":4, "y":0.12}, {"label":"sw6", "x":5, "y":0.25},
- {"label":"sw6", "x":8 , "y":0.25}, {"label":"sw5", "x":9 , "y":0.12}, {"label":"sw4", "x":10, "y":0}, {"label":"sw3", "x":11, "y":0.12}, {"label":"sw2", "x":12, "y":0.37}, {"label":"sw1", "x":13, "y":0.37},
- {"label":"sw7", "x":0, "y":1.37}, {"label":"sw8", "x":1, "y":1.37}, {"label":"sw9", "x":2, "y":1.12}, {"label":"sw10", "x":3, "y":1}, {"label":"sw11", "x":4, "y":1.12}, {"label":"sw12", "x":5, "y":1.25},
- {"label":"sw12", "x":8, "y":1.25}, {"label":"sw11", "x":9, "y":1.12}, {"label":"sw10", "x":10, "y":1}, {"label":"sw9", "x":11, "y":1.12}, {"label":"sw8", "x":12, "y":1.37}, {"label":"sw7", "x":13, "y":1.37},
- {"label":"sw13", "x":0, "y":2.37}, {"label":"sw14", "x":1, "y":2.37}, {"label":"sw15", "x":2, "y":2.12}, {"label":"sw16", "x":3, "y":2}, {"label":"sw17", "x":4, "y":2.12}, {"label":"sw18", "x":5, "y":2.25},
- {"label":"sw18", "x":8, "y":2.25}, {"label":"sw17", "x":9, "y":2.12}, {"label":"sw16", "x":10, "y":2}, {"label":"sw15", "x":11, "y":2.12}, {"label":"sw14", "x":12, "y":2.37}, {"label":"sw13", "x":13, "y":2.37},
- {"label":"sw19", "x":4.5, "y":3.5, "h":1.25}, {"label":"sw20", "x":5.5, "y":3.5, "h":1.25},
- {"label":"sw20", "x":7.5, "y":3.5, "h":1.25}, {"label":"sw19", "x":8.5, "y":3.5, "h":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0.37},
+ {"matrix": [0, 1], "x": 1, "y": 0.37},
+ {"matrix": [0, 2], "x": 2, "y": 0.12},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.12},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [4, 5], "x": 8, "y": 0.25},
+ {"matrix": [4, 4], "x": 9, "y": 0.12},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.12},
+ {"matrix": [4, 1], "x": 12, "y": 0.37},
+ {"matrix": [4, 0], "x": 13, "y": 0.37},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.37},
+ {"matrix": [1, 1], "x": 1, "y": 1.37},
+ {"matrix": [1, 2], "x": 2, "y": 1.12},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.12},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [5, 5], "x": 8, "y": 1.25},
+ {"matrix": [5, 4], "x": 9, "y": 1.12},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.12},
+ {"matrix": [5, 1], "x": 12, "y": 1.37},
+ {"matrix": [5, 0], "x": 13, "y": 1.37},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.37},
+ {"matrix": [2, 1], "x": 1, "y": 2.37},
+ {"matrix": [2, 2], "x": 2, "y": 2.12},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.12},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [6, 5], "x": 8, "y": 2.25},
+ {"matrix": [6, 4], "x": 9, "y": 2.12},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.12},
+ {"matrix": [6, 1], "x": 12, "y": 2.37},
+ {"matrix": [6, 0], "x": 13, "y": 2.37},
+
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5, "h": 1.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5, "h": 1.25},
+
+ {"matrix": [7, 5], "x": 7.5, "y": 3.5, "h": 1.25},
+ {"matrix": [7, 4], "x": 8.5, "y": 3.5, "h": 1.25}
]
}
}
diff --git a/keyboards/oddball/oddball.h b/keyboards/oddball/oddball.h
index 2a8e2fd92d..7897621e2d 100644
--- a/keyboards/oddball/oddball.h
+++ b/keyboards/oddball/oddball.h
@@ -18,23 +18,6 @@
#include "quantum.h"
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- LT1, LT2, RT1, RT2 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, LT1, LT2 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, RT2, RT1 } \
- }
-
enum custom_keycodes {
KC_SCROLL = QK_KB_0,
KC_CPI_1,
diff --git a/keyboards/oddball/v1/config.h b/keyboards/oddball/v1/config.h
deleted file mode 100644
index 7a33a7049a..0000000000
--- a/keyboards/oddball/v1/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 { F6, B5, B6, F7 }
-#define MATRIX_COL_PINS { D6, D7, B4, D3, C6, C7 }
diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/info.json
index 66ed86e13c..f2bc9062ed 100644
--- a/keyboards/oddball/v1/info.json
+++ b/keyboards/oddball/v1/info.json
@@ -1,3 +1,8 @@
{
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "D3", "C6", "C7"],
+ "rows": ["F6", "B5", "B6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"bootloader": "halfkay"
}
diff --git a/keyboards/oddball/v1/v1.c b/keyboards/oddball/v1/v1.c
deleted file mode 100644
index 932df2be2f..0000000000
--- a/keyboards/oddball/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "v1.h"
diff --git a/keyboards/oddball/v1/v1.h b/keyboards/oddball/v1/v1.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v1/v1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "oddball.h"
diff --git a/keyboards/oddball/v2/config.h b/keyboards/oddball/v2/config.h
deleted file mode 100644
index 793d305931..0000000000
--- a/keyboards/oddball/v2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 { D4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B7, B5, B4, F5, F6, F7 }
diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/info.json
index cc90702804..854f80649e 100644
--- a/keyboards/oddball/v2/info.json
+++ b/keyboards/oddball/v2/info.json
@@ -1,3 +1,8 @@
{
+ "matrix_pins": {
+ "cols": ["B7", "B5", "B4", "F5", "F6", "F7"],
+ "rows": ["D4", "E6", "D7", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"bootloader": "qmk-dfu"
}
diff --git a/keyboards/oddball/v2/v2.c b/keyboards/oddball/v2/v2.c
deleted file mode 100644
index 319592b53d..0000000000
--- a/keyboards/oddball/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "v2.h"
diff --git a/keyboards/oddball/v2/v2.h b/keyboards/oddball/v2/v2.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v2/v2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "oddball.h"
diff --git a/keyboards/oddball/v2_1/config.h b/keyboards/oddball/v2_1/config.h
deleted file mode 100644
index 9f138d7d52..0000000000
--- a/keyboards/oddball/v2_1/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 { D4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B5, B4, F5, F6, F7 }
diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/info.json
index cc90702804..ef4a6de85d 100644
--- a/keyboards/oddball/v2_1/info.json
+++ b/keyboards/oddball/v2_1/info.json
@@ -1,3 +1,8 @@
{
+ "matrix_pins": {
+ "cols": ["B6", "B5", "B4", "F5", "F6", "F7"],
+ "rows": ["D4", "E6", "D7", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"bootloader": "qmk-dfu"
}
diff --git a/keyboards/oddball/v2_1/v2_1.c b/keyboards/oddball/v2_1/v2_1.c
deleted file mode 100644
index 4c2433b413..0000000000
--- a/keyboards/oddball/v2_1/v2_1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "v2_1.h"
diff --git a/keyboards/oddball/v2_1/v2_1.h b/keyboards/oddball/v2_1/v2_1.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v2_1/v2_1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * 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 "oddball.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:37:55 +0000