summaryrefslogtreecommitdiff
path: root/keyboards/draytronics
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/draytronics')
-rw-r--r--keyboards/draytronics/daisy/config.h37
-rw-r--r--keyboards/draytronics/daisy/info.json8
-rw-r--r--keyboards/draytronics/daisy/rules.mk6
-rw-r--r--keyboards/draytronics/elise/config.h8
-rw-r--r--keyboards/draytronics/elise/info.json3
-rw-r--r--keyboards/draytronics/elise/rules.mk8
-rw-r--r--keyboards/draytronics/elise_v2/config.h8
-rw-r--r--keyboards/draytronics/elise_v2/info.json3
-rw-r--r--keyboards/draytronics/elise_v2/rules.mk8
-rw-r--r--keyboards/draytronics/scarlet/config.h34
-rw-r--r--keyboards/draytronics/scarlet/info.json3
-rw-r--r--keyboards/draytronics/scarlet/rules.mk8
12 files changed, 20 insertions, 114 deletions
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index b0db92620a..e701420bee 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -18,11 +18,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 3
-#define MATRIX_COLS 4
/*
* Keyboard Matrix Assignments
@@ -38,43 +33,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B0, C0, C1}
#define MATRIX_COL_PINS { C2, C3, C4, C5 }
-#define ENCODERS_PAD_A { B1, D0 }
-#define ENCODERS_PAD_B { B2, D1 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define TAP_CODE_DELAY 10
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
+
/* 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
-/* 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
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
+
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index 80f9da0e59..c847a45650 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -8,6 +8,14 @@
"pid": "0x4441",
"device_version": "1.0.0"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B1", "pin_b": "B2"},
+ {"pin_a": "D0", "pin_b": "D1"}
+ ]
+ },
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
"layout_aliases": {
"LAYOUT_daisy": "LAYOUT"
},
diff --git a/keyboards/draytronics/daisy/rules.mk b/keyboards/draytronics/daisy/rules.mk
index 7bf0a86667..09169eaf7f 100644
--- a/keyboards/draytronics/daisy/rules.mk
+++ b/keyboards/draytronics/daisy/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/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 36d1e7f481..63619e7148 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -18,11 +18,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 5
-#define MATRIX_COLS 15
/*
* Keyboard Matrix Assignments
@@ -40,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* 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 */
diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json
index 2ff8a98db8..9772e6d872 100644
--- a/keyboards/draytronics/elise/info.json
+++ b/keyboards/draytronics/elise/info.json
@@ -8,6 +8,8 @@
"pid": "0x454C",
"device_version": "1.0.0"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT_65_ansi_right_lrg": "LAYOUT_65_ansi_rwkl",
"LAYOUT_65_ansi_left_lrg": "LAYOUT_65_ansi_lwkl",
@@ -16,6 +18,7 @@
"LAYOUT_65_iso_left_lrg": "LAYOUT_65_iso_lwkl",
"LAYOUT_65_iso_lrg": "LAYOUT_65_iso_wkl"
},
+ "community_layouts": ["65_ansi", "65_iso"],
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/draytronics/elise/rules.mk b/keyboards/draytronics/elise/rules.mk
index e7017486de..28c29a3b4d 100644
--- a/keyboards/draytronics/elise/rules.mk
+++ b/keyboards/draytronics/elise/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -16,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = 65_ansi 65_iso
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index d4e4e2dc28..f352f96b39 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -18,11 +18,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 5
-#define MATRIX_COLS 15
/*
* Keyboard Matrix Assignments
@@ -40,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* 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 */
diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json
index f4477680d1..d04e1374ed 100644
--- a/keyboards/draytronics/elise_v2/info.json
+++ b/keyboards/draytronics/elise_v2/info.json
@@ -8,6 +8,8 @@
"pid": "0x454C",
"device_version": "2.0.0"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT_65_ansi_right_lrg": "LAYOUT_65_ansi_rwkl",
"LAYOUT_65_ansi_left_lrg": "LAYOUT_65_ansi_lwkl",
@@ -16,6 +18,7 @@
"LAYOUT_65_iso_left_lrg": "LAYOUT_65_iso_lwkl",
"LAYOUT_65_iso_lrg": "LAYOUT_65_iso_wkl"
},
+ "community_layouts": ["65_ansi", "65_iso"],
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/draytronics/elise_v2/rules.mk b/keyboards/draytronics/elise_v2/rules.mk
index e7017486de..28c29a3b4d 100644
--- a/keyboards/draytronics/elise_v2/rules.mk
+++ b/keyboards/draytronics/elise_v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -16,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = 65_ansi 65_iso
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
index 4d55960783..c10d9fe357 100644
--- a/keyboards/draytronics/scarlet/config.h
+++ b/keyboards/draytronics/scarlet/config.h
@@ -18,11 +18,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 5
-#define MATRIX_COLS 4
/*
* Keyboard Matrix Assignments
@@ -41,38 +36,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
/* 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
-/* 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
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
+
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json
index 95b225f614..af0894ce3d 100644
--- a/keyboards/draytronics/scarlet/info.json
+++ b/keyboards/draytronics/scarlet/info.json
@@ -8,6 +8,9 @@
"pid": "0x5343",
"device_version": "0.0.1"
},
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "community_layouts": ["numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk
index 7c1e85cc4e..1e9f925544 100644
--- a/keyboards/draytronics/scarlet/rules.mk
+++ b/keyboards/draytronics/scarlet/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
@@ -19,5 +13,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = numpad_5x4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 17:23:17 +0000