diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/deng/djam | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/deng/djam')
| -rw-r--r-- | keyboards/deng/djam/config.h | 7 | ||||
| -rw-r--r-- | keyboards/deng/djam/info.json | 6 | ||||
| -rw-r--r-- | keyboards/deng/djam/rules.mk | 7 |
3 files changed, 6 insertions, 14 deletions
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index edb558930d..8193eae02f 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -15,17 +15,10 @@ */ #pragma once -#include "config_common.h" -#define MATRIX_ROWS 3 -#define MATRIX_COLS 8 #define MATRIX_ROW_PINS { F0, F1, F4 } #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D5 diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 3e871ae85b..abf18685b2 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,12 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk index 9685c1ce76..42a6d2bd1b 100644 --- a/keyboards/deng/djam/rules.mk +++ b/keyboards/deng/djam/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -14,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes |