summaryrefslogtreecommitdiff
path: root/keyboards/barracuda
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/barracuda')
-rw-r--r--keyboards/barracuda/barracuda.c17
-rw-r--r--keyboards/barracuda/barracuda.h41
-rw-r--r--keyboards/barracuda/config.h17
-rw-r--r--keyboards/barracuda/info.json71
-rw-r--r--keyboards/barracuda/keymaps/default/config.h1
-rw-r--r--keyboards/barracuda/keymaps/via/config.h1
6 files changed, 38 insertions, 110 deletions
diff --git a/keyboards/barracuda/barracuda.c b/keyboards/barracuda/barracuda.c
deleted file mode 100644
index f863b1917e..0000000000
--- a/keyboards/barracuda/barracuda.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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 "barracuda.h"
diff --git a/keyboards/barracuda/barracuda.h b/keyboards/barracuda/barracuda.h
deleted file mode 100644
index c6389d778b..0000000000
--- a/keyboards/barracuda/barracuda.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_3x11( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, R00, R01, R02, R03, R04 }, \
- { KC_NO, R10, R11, R12, R13, R14 }, \
- { KC_NO, R20, R21, R22, R23, R24 } \
-}
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
index 5e8a798be6..5dd1c8d063 100644
--- a/keyboards/barracuda/config.h
+++ b/keyboards/barracuda/config.h
@@ -16,23 +16,6 @@
#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 { C4, C5, C6, D1, D2, D3 }
-#define MATRIX_COL_PINS { D4, D5, D6, B0, B1, B2 }
-
-/* 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 */
diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json
index d0909322c9..3b68e6e3f3 100644
--- a/keyboards/barracuda/info.json
+++ b/keyboards/barracuda/info.json
@@ -8,46 +8,51 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
+ "rows": ["C4", "C5", "C6", "D1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_3x11": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
+ {"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": [3, 1], "x": 9, "y": 0},
+ {"matrix": [3, 2], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 4], "x": 12, "y": 0},
+ {"matrix": [3, 5], "x": 13, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
+ {"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": [4, 1], "x": 9, "y": 1},
+ {"matrix": [4, 2], "x": 10, "y": 1},
+ {"matrix": [4, 3], "x": 11, "y": 1},
+ {"matrix": [4, 4], "x": 12, "y": 1},
+ {"matrix": [4, 5], "x": 13, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2}
+ {"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": [5, 1], "x": 9, "y": 2},
+ {"matrix": [5, 2], "x": 10, "y": 2},
+ {"matrix": [5, 3], "x": 11, "y": 2},
+ {"matrix": [5, 4], "x": 12, "y": 2},
+ {"matrix": [5, 5], "x": 13, "y": 2}
]
}
}
diff --git a/keyboards/barracuda/keymaps/default/config.h b/keyboards/barracuda/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/default/config.h
+++ b/keyboards/barracuda/keymaps/default/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/barracuda/keymaps/via/config.h b/keyboards/barracuda/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/via/config.h
+++ b/keyboards/barracuda/keymaps/via/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT