summaryrefslogtreecommitdiff
path: root/keyboards/redox
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/redox')
-rw-r--r--keyboards/redox/keymaps/eightbitraptor/config.h1
-rw-r--r--keyboards/redox/keymaps/finex/config.h1
-rw-r--r--keyboards/redox/keymaps/thattolleyguy/config.h4
-rw-r--r--keyboards/redox/redox.c16
-rw-r--r--keyboards/redox/redox.h25
-rw-r--r--keyboards/redox/rev1/base/info.json8
-rw-r--r--keyboards/redox/rev1/config.h12
-rw-r--r--keyboards/redox/rev1/info.json144
-rw-r--r--keyboards/redox/rev1/proton_c/config.h11
-rw-r--r--keyboards/redox/rev1/proton_c/info.json8
-rw-r--r--keyboards/redox/rev1/proton_c/proton_c.c4
-rw-r--r--keyboards/redox/rev1/proton_c/proton_c.h6
-rw-r--r--keyboards/redox/rev1/rev1.c1
-rw-r--r--keyboards/redox/rev1/rev1.h37
14 files changed, 88 insertions, 190 deletions
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
index 9697f561da..045b6a2165 100644
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ b/keyboards/redox/keymaps/eightbitraptor/config.h
@@ -39,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_VAL_STEP 8
#define RETRO_TAPPING
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
index f155c6900c..e65e610046 100644
--- a/keyboards/redox/keymaps/finex/config.h
+++ b/keyboards/redox/keymaps/finex/config.h
@@ -39,5 +39,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_VAL_STEP 8
// #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
diff --git a/keyboards/redox/keymaps/thattolleyguy/config.h b/keyboards/redox/keymaps/thattolleyguy/config.h
index cf32745193..f3b73d8974 100644
--- a/keyboards/redox/keymaps/thattolleyguy/config.h
+++ b/keyboards/redox/keymaps/thattolleyguy/config.h
@@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
#undef RGBLED_NUM
-#undef RGB_DI_PIN
-#define RGB_DI_PIN C6
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN C6
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLED_SPLIT { 7, 7 }
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/redox/redox.c b/keyboards/redox/redox.c
deleted file mode 100644
index 7fa3545a47..0000000000
--- a/keyboards/redox/redox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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 "redox.h"
diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h
deleted file mode 100644
index 4160096b28..0000000000
--- a/keyboards/redox/redox.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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
-
-#if defined(KEYBOARD_redox_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_redox_media)
-# include "media.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json
index d65f0e2b1b..e0d1433115 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -2,9 +2,17 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index b768d2f19f..5b44f7541f 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -17,23 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_SPLIT // sync LEDs between RIGHT and LEFT hand
diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json
index bceac88bb0..908404466a 100644
--- a/keyboards/redox/rev1/info.json
+++ b/keyboards/redox/rev1/info.json
@@ -11,89 +11,85 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25},
- {"label":"1", "x":1.25, "y":0.375},
- {"label":"2", "x":2.25, "y":0.125},
- {"label":"3", "x":3.25, "y":0},
- {"label":"4", "x":4.25, "y":0.125},
- {"label":"5", "x":5.25, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 0.375},
+ {"matrix": [0, 2], "x": 2.25, "y": 0.125},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.25, "y": 0.25},
- {"label":"6", "x":12.25, "y":0.25},
- {"label":"7", "x":13.25, "y":0.125},
- {"label":"8", "x":14.25, "y":0},
- {"label":"9", "x":15.25, "y":0.125},
- {"label":"0", "x":16.25, "y":0.375},
- {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25},
+ {"matrix": [5, 5], "x": 12.25, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.25, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.25, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.25, "y": 0.375, "w": 1.25},
- {"label":"Tab", "x":0, "y":1.375, "w":1.25},
- {"label":"Q", "x":1.25, "y":1.375},
- {"label":"W", "x":2.25, "y":1.125},
- {"label":"E", "x":3.25, "y":1},
- {"label":"R", "x":4.25, "y":1.125},
- {"label":"T", "x":5.25, "y":1.25},
- {"label":"MO(_SYMB)", "x":6.25, "y":0.75},
+ {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.375},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.125},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.125},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 0.75},
- {"label":"MO(_SYMB)", "x":11.25, "y":0.75},
- {"label":"Y", "x":12.25, "y":1.25},
- {"label":"U", "x":13.25, "y":1.125},
- {"label":"I", "x":14.25, "y":1},
- {"label":"O", "x":15.25, "y":1.125},
- {"label":"P", "x":16.25, "y":1.375},
- {"label":"=", "x":17.25, "y":1.375, "w":1.25},
+ {"matrix": [5, 6], "x": 11.25, "y": 0.75},
+ {"matrix": [6, 5], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.25, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 2], "x": 15.25, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.25, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.25, "y": 1.375, "w": 1.25},
- {"label":"Esc", "x":0, "y":2.375, "w":1.25},
- {"label":"A", "x":1.25, "y":2.375},
- {"label":"S", "x":2.25, "y":2.125},
- {"label":"D", "x":3.25, "y":2},
- {"label":"F", "x":4.25, "y":2.125},
- {"label":"G", "x":5.25, "y":2.25},
- {"label":"[", "x":6.25, "y":1.75, "h":1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.125},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.125},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5},
- {"label":"]", "x":11.25, "y":1.75, "h":1.5},
- {"label":"H", "x":12.25, "y":2.25},
- {"label":"J", "x":13.25, "y":2.125},
- {"label":"K", "x":14.25, "y":2},
- {"label":"L", "x":15.25, "y":2.125},
- {"label":";", "x":16.25, "y":2.375},
- {"label":"'", "x":17.25, "y":2.375, "w":1.25},
+ {"matrix": [6, 6], "x": 11.25, "y": 1.75, "h": 1.5},
+ {"matrix": [7, 5], "x": 12.25, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.25, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.25, "y": 2},
+ {"matrix": [7, 2], "x": 15.25, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.25, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.25, "y": 2.375, "w": 1.25},
- {"label":"Shift", "x":0, "y":3.375, "w":1.25},
- {"label":"Z", "x":1.25, "y":3.375},
- {"label":"X", "x":2.25, "y":3.125},
- {"label":"C", "x":3.25, "y":3},
- {"label":"V", "x":4.25, "y":3.125},
- {"label":"B", "x":5.25, "y":3.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.375},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.125},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 3.75},
+ {"matrix": [3, 6], "x": 7.75, "y": 3.75},
- {"label":"_Adjust/Page Up", "x":6.75, "y":3.75},
- {"label":"Page Down", "x":7.75, "y":3.75},
+ {"matrix": [8, 6], "x": 9.75, "y": 3.75},
+ {"matrix": [7, 6], "x": 10.75, "y": 3.75},
+ {"matrix": [8, 5], "x": 12.25, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.25, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.25, "y": 3},
+ {"matrix": [8, 2], "x": 15.25, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.25, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.25, "y": 3.375, "w": 1.25},
- {"label":"Home", "x":9.75, "y":3.75},
- {"label":"_Adjust/End", "x":10.75, "y":3.75},
+ {"matrix": [4, 0], "x": 0.25, "y": 4.375},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.375},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.125},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5},
+ {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5},
- {"label":"N", "x":12.25, "y":3.25},
- {"label":"M", "x":13.25, "y":3.125},
- {"label":",", "x":14.25, "y":3},
- {"label":",", "x":15.25, "y":3.125},
- {"label":"\\", "x":16.25, "y":3.375},
- {"label":"Shift", "x":17.25, "y":3.375, "w":1.25},
-
- {"label":"LGUI", "x":0.25, "y":4.375},
- {"label":"P+", "x":1.25, "y":4.375},
- {"label":"P-", "x":2.25, "y":4.125},
- {"label":"LAlt || P*", "x":3.25, "y":4},
-
- {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25},
- {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5},
- {"label":"Delete", "x":7.75, "y":4.75, "h":1.5},
-
- {"label":"Enter", "x":9.75, "y":4.75, "h":1.5},
- {"label":"Space", "x":10.75, "y":4.75, "h":1.5},
- {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25},
-
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4.125},
- {"label":"Up", "x":16.25, "y":4.375},
- {"label":"Right", "x":17.25, "y":4.375}
+ {"matrix": [9, 6], "x": 9.75, "y": 4.75, "h": 1.5},
+ {"matrix": [9, 5], "x": 10.75, "y": 4.75, "h": 1.5},
+ {"matrix": [9, 4], "x": 11.75, "y": 5.25, "w": 1.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4},
+ {"matrix": [9, 2], "x": 15.25, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.25, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.25, "y": 4.375}
]
}
}
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 71d3470569..08a74aef2c 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -3,13 +3,6 @@
#pragma once
-
-// wiring of each half
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 }
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { A1, A0, B8, B13, B14, B15, B9 }
-
// //we are using hardware serial, so lets undef the softserial used otherwise
/* serial.c configuration for split keyboard */
@@ -32,10 +25,6 @@
#define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
#define SERIAL_USART_TIMEOUT 20 // USART driver timeout. default 20
-/* ws2812 RGB LED */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN A9
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json
index 4f6bae6891..7fec1e7950 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -2,6 +2,14 @@
"usb": {
"device_version": "1.0.1"
},
+ "ws2812": {
+ "pin": "A9"
+ },
+ "matrix_pins": {
+ "cols": ["A1", "A0", "B8", "B13", "B14", "B15", "B9"],
+ "rows": ["B5", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c
deleted file mode 100644
index 796e2c8c3d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "proton_c.h"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h
deleted file mode 100644
index d8813d9c4d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "rev1.h"
diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c
deleted file mode 100644
index b1ab15df32..0000000000
--- a/keyboards/redox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "redox.h"
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
deleted file mode 100644
index 5a24122048..0000000000
--- a/keyboards/redox/rev1/rev1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "redox.h"
-
-#if defined(KEYBOARD_redox_rev1_proton_c)
-# include "proton_c.h"
-#endif
-
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \
- k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \
- k28, k29, k30, k31, k32, k33, k20, k21, k36, k37, k38, k39, k40, k41, \
- k42, k43, k44, k45, k46, k47, k34, k48, k49, k35, k50, k51, k52, k53, k54, k55, \
- k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k14, k15, k16, k17, k18, k19, k20 }, \
- { k28, k29, k30, k31, k32, k33, k34 }, \
- { k42, k43, k44, k45, k46, k47, k48 }, \
- { k56, k57, k58, k59, k60, k61, k62 }, \
- { k13, k12, k11, k10, k09, k08, k07 }, \
- { k27, k26, k25, k24, k23, k22, k21 }, \
- { k41, k40, k39, k38, k37, k36, k35 }, \
- { k55, k54, k53, k52, k51, k50, k49 }, \
- { k69, k68, k67, k66, k65, k64, k63 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:12:05 +0000