summaryrefslogtreecommitdiff
path: root/keyboards/0xcb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/0xcb')
-rw-r--r--keyboards/0xcb/1337/1337.c2
-rw-r--r--keyboards/0xcb/1337/1337.h40
-rw-r--r--keyboards/0xcb/1337/config.h17
-rw-r--r--keyboards/0xcb/1337/info.json30
-rw-r--r--keyboards/0xcb/1337/rules.mk6
-rw-r--r--keyboards/0xcb/static/config.h12
-rw-r--r--keyboards/0xcb/static/info.json2
-rw-r--r--keyboards/0xcb/static/rules.mk6
-rw-r--r--keyboards/0xcb/tutelpad/config.h32
-rw-r--r--keyboards/0xcb/tutelpad/info.json27
-rw-r--r--keyboards/0xcb/tutelpad/rules.mk6
-rw-r--r--keyboards/0xcb/tutelpad/tutelpad.c2
-rw-r--r--keyboards/0xcb/tutelpad/tutelpad.h35
13 files changed, 44 insertions, 173 deletions
diff --git a/keyboards/0xcb/1337/1337.c b/keyboards/0xcb/1337/1337.c
index 85781209b3..d5937540b2 100644
--- a/keyboards/0xcb/1337/1337.c
+++ b/keyboards/0xcb/1337/1337.c
@@ -14,7 +14,7 @@ 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 "1337.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/0xcb/1337/1337.h b/keyboards/0xcb/1337/1337.h
deleted file mode 100644
index e1f238c126..0000000000
--- a/keyboards/0xcb/1337/1337.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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 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.
- */
-// clang-format off
- #define LAYOUT( \
- KA1, KA2, KA3, \
- KB1, KB2, KB3, \
- KC1, KC2, KC3 \
- ) \
- { \
- { KA1, KA2, KA3 }, \
- { KB1, KB2, KB3 }, \
- { KC1, KC2, KC3 } \
- }
-// clang-format on
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 6ee93887f7..5b576cc0c5 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -16,19 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
// clang-format off
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
- { D2, D4, F4 }, \
- { D7, B1, B3 }, \
- { E6, B4, B2 } \
-}
#define TAP_CODE_DELAY 10
#define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { F6 }
@@ -65,9 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
// clang-format on
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -76,6 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define OLED_DISPLAY_128X64
#define OLED_FONT_END 255
#define OLED_FONT_H "gfxfont.c"
-
-/* QMK DFU */
-#define QMK_LED B0
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index cd5993ee0d..d37fc515f7 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -8,18 +8,30 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
+ "qmk_lufa_bootloader": {
+ "led": "B0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["D2", "D4", "F4"],
+ ["D7", "B1", "B3"],
+ ["E6", "B4", "B2"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]}
]
}
}
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk
index 267c4d09ae..77dd67f53f 100644
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 784baadc2c..0f517163e5 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,14 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
// clang-format off
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-
/*
* Keyboard Matrix Assignments
*
@@ -45,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENCODERS_PAD_A { D0 }
#define ENCODERS_PAD_B { D1 }
// clang-format on
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -56,7 +48,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* oled custom font */
#define OLED_FONT_END 255
#define OLED_FONT_H "gfxfont.c"
-
-/* bootmagic */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index 4a6232abad..b6e5f01b27 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -8,6 +8,8 @@
"pid": "0xA455",
"device_version": "0.0.1"
},
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
index a06dda50ba..24ff2f2cfd 100644
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index a19fa7e83f..cdb29e6bd1 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,28 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * 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)
- *
- */
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
- { E6, D7, B1, B3 }, \
- { B5, B4, B2, B6 } \
-}
-
#define RGB_DI_PIN D3 // LED data pin on controller
#define RGBLED_NUM 4 // Number of LEDs connected
@@ -62,12 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define OLED_BRIGHTNESS 128
#define OLED_DISPLAY_128X64
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
@@ -83,7 +55,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 00261daad3..646b4dc882 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -8,18 +8,29 @@
"pid": "0xF09F",
"device_version": "0.0.1"
},
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["E6", "D7", "B1", "B3"],
+ ["B5", "B4", "B2", "B6"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k03", "x": 0, "y": 0},
- {"label": "k02", "x": 1, "y": 0},
- {"label": "k01", "x": 2, "y": 0},
- {"label": "k00", "x": 3, "y": 0},
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
- {"label": "k13", "x": 0, "y": 1},
- {"label": "k12", "x": 1, "y": 1},
- {"label": "k11", "x": 2, "y": 1},
- {"label": "k10", "x": 3, "y": 1}
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]},
+ {"x": 3, "y": 1, "matrix": [1, 3]}
]
}
}
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
index e022c905cd..9cc3b02a22 100644
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ b/keyboards/0xcb/tutelpad/rules.mk
@@ -1,9 +1,3 @@
-## MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/0xcb/tutelpad/tutelpad.c b/keyboards/0xcb/tutelpad/tutelpad.c
index 25c2d22219..36671d5bd1 100644
--- a/keyboards/0xcb/tutelpad/tutelpad.c
+++ b/keyboards/0xcb/tutelpad/tutelpad.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "tutelpad.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
diff --git a/keyboards/0xcb/tutelpad/tutelpad.h b/keyboards/0xcb/tutelpad/tutelpad.h
deleted file mode 100644
index 0115c50fa4..0000000000
--- a/keyboards/0xcb/tutelpad/tutelpad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 ItsFiremanSam
- *
- * 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( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 04:23:19 +0000