diff options
Diffstat (limited to 'keyboards/dp60')
| -rw-r--r-- | keyboards/dp60/config.h | 4 | ||||
| -rw-r--r-- | keyboards/dp60/info.json | 1 | ||||
| -rw-r--r-- | keyboards/dp60/keymaps/indicator/config.h | 1 | ||||
| -rw-r--r-- | keyboards/dp60/matrix.c | 6 | ||||
| -rw-r--r-- | keyboards/dp60/rules.mk | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h index 9105e1ffb9..16df72781b 100644 --- a/keyboards/dp60/config.h +++ b/keyboards/dp60/config.h @@ -15,16 +15,12 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index 783999f8ed..fd97cf38fe 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -12,6 +12,7 @@ "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" }, + "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi_tsangan_split_rshift": { "layout": [ diff --git a/keyboards/dp60/keymaps/indicator/config.h b/keyboards/dp60/keymaps/indicator/config.h index 0476faca94..c7b52b27a5 100644 --- a/keyboards/dp60/keymaps/indicator/config.h +++ b/keyboards/dp60/keymaps/indicator/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define RGB_INDICATOR_NUM 8 #undef RGBLED_NUM diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index a9974757dd..1803e0f94f 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -15,6 +15,10 @@ */ #include "quantum.h" +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + static uint8_t debouncing = DEBOUNCE; static matrix_row_t matrix[MATRIX_ROWS]; @@ -123,7 +127,7 @@ static void init_rows(void) setPinInputHigh(D4); } -static uint8_t read_rows() +static uint8_t read_rows(void) { return ((readPin(E6) ? 0 : (1 << 0)) | (readPin(F6) ? 0 : (1 << 1)) | diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 8acc7d85d4..3d162925f2 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -19,7 +19,5 @@ RGBLIGHT_ENABLE = no # Use RGB underglow light RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3731 # Use RGB matrix -LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift - CUSTOM_MATRIX = yes SRC += matrix.c |