diff options
author | Nick Brassel <[email protected]> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/dtisaac | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
download | qmk_firmware-bacec14073b2e897d5a52caf12de5a6a1f7b4078.tar.gz qmk_firmware-bacec14073b2e897d5a52caf12de5a6a1f7b4078.zip |
Merge remote-tracking branch 'upstream/develop'0.20.0
Diffstat (limited to 'keyboards/dtisaac')
-rw-r--r-- | keyboards/dtisaac/cg108/config.h | 13 | ||||
-rw-r--r-- | keyboards/dtisaac/cg108/info.json | 8 | ||||
-rw-r--r-- | keyboards/dtisaac/cg108/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/dtisaac/dosa40rgb/config.h | 8 | ||||
-rw-r--r-- | keyboards/dtisaac/dosa40rgb/info.json | 2 | ||||
-rw-r--r-- | keyboards/dtisaac/dosa40rgb/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/dtisaac/dtisaac01/config.h | 43 | ||||
-rw-r--r-- | keyboards/dtisaac/dtisaac01/info.json | 11 | ||||
-rw-r--r-- | keyboards/dtisaac/dtisaac01/rules.mk | 6 |
9 files changed, 21 insertions, 82 deletions
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h index 211b60b3e0..fb60cba345 100644 --- a/keyboards/dtisaac/cg108/config.h +++ b/keyboards/dtisaac/cg108/config.h @@ -17,11 +17,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 11 -#define MATRIX_COLS 11 /* * Keyboard Matrix Assignments @@ -40,14 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN B5 -#define LED_CAPS_LOCK_PIN B6 -#define LED_SCROLL_LOCK_PIN B7 -#define LED_PIN_ON_STATE 0 - -/* 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/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index eb6189088c..d386e9148a 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -8,6 +8,14 @@ "pid": "0x4973", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "B6", + "num_lock": "B5", + "scroll_lock": "B7", + "on_state": 0 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/cg108/rules.mk b/keyboards/dtisaac/cg108/rules.mk index e0403a960b..718a1e8d09 100644 --- a/keyboards/dtisaac/cg108/rules.mk +++ b/keyboards/dtisaac/cg108/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h index 7a931c998c..12402c7d3f 100644 --- a/keyboards/dtisaac/dosa40rgb/config.h +++ b/keyboards/dtisaac/dosa40rgb/config.h @@ -17,11 +17,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 4 -#define MATRIX_COLS 11 /* * Keyboard Matrix Assignments @@ -95,6 +90,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -//#define DEBOUNCE 5 diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index d24975ca8b..286396776e 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x4973", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "lufa-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk index caecba365e..c3b1c4ef11 100644 --- a/keyboards/dtisaac/dosa40rgb/rules.mk +++ b/keyboards/dtisaac/dosa40rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h index 9b9a012ab4..aa0f99f104 100644 --- a/keyboards/dtisaac/dtisaac01/config.h +++ b/keyboards/dtisaac/dtisaac01/config.h @@ -17,11 +17,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 12 -#define MATRIX_COLS 9 /* * Keyboard Matrix Assignments @@ -38,41 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL - -#define LED_CAPS_LOCK_PIN D3 -#define LED_SCROLL_LOCK_PIN D5 -#define LED_PIN_ON_STATE 0 - - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 3 -#define BACKLIGHT_BREATHING - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - - -/* - * 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 - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index 790648d64b..bbbc5ede5d 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -8,6 +8,17 @@ "pid": "0x4973", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, + "indicators": { + "caps_lock": "D3", + "scroll_lock": "D5", + "on_state": 0 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dtisaac01/rules.mk b/keyboards/dtisaac/dtisaac01/rules.mk index dfb44b1bf9..e2a6fcff00 100644 --- a/keyboards/dtisaac/dtisaac01/rules.mk +++ b/keyboards/dtisaac/dtisaac01/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |