diff options
Diffstat (limited to 'keyboards/matrix')
-rw-r--r-- | keyboards/matrix/abelx/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/cain_re/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/falcon/config.h | 4 | ||||
-rw-r--r-- | keyboards/matrix/falcon/info.json | 1 | ||||
-rw-r--r-- | keyboards/matrix/falcon/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/config.h | 4 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev2/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/m20add/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/me/config.h | 4 | ||||
-rw-r--r-- | keyboards/matrix/noah/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/noah/info.json | 1 | ||||
-rw-r--r-- | keyboards/matrix/noah/keymaps/blockader/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/matrix/noah/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/matrix/noah/rules.mk | 2 |
14 files changed, 8 insertions, 23 deletions
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h index 06f9d31860..ba603684a5 100644 --- a/keyboards/matrix/abelx/config.h +++ b/keyboards/matrix/abelx/config.h @@ -80,7 +80,6 @@ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 // i2c setting #define USE_I2CV1 diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 74acef9af3..b6750798a8 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -19,7 +19,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 9 diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h index d25668115c..79eb536d14 100644 --- a/keyboards/matrix/falcon/config.h +++ b/keyboards/matrix/falcon/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -26,9 +25,6 @@ #define DIODE_DIRECTION ROW2COL -/* 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/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json index f1b7267681..a8e43410ff 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/info.json @@ -8,6 +8,7 @@ "pid": "0x474E", "device_version": "0.0.1" }, + "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_60_hhkb": { "layout": [ diff --git a/keyboards/matrix/falcon/rules.mk b/keyboards/matrix/falcon/rules.mk index a279def303..3ff392a61f 100644 --- a/keyboards/matrix/falcon/rules.mk +++ b/keyboards/matrix/falcon/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_hhkb diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h index ca4ee5b96c..cf109f852e 100644 --- a/keyboards/matrix/m12og/rev1/config.h +++ b/keyboards/matrix/m12og/rev1/config.h @@ -17,7 +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 6 @@ -52,6 +51,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h index c63f92d151..a2ea47b542 100644 --- a/keyboards/matrix/m12og/rev2/config.h +++ b/keyboards/matrix/m12og/rev2/config.h @@ -4,7 +4,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 7 diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 664dd3d0c1..d7b846cbcf 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -71,7 +71,6 @@ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 // i2c setting #define I2C1_SCL_PIN B8 diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h index 85ec6a04c7..7291a6dcbc 100644 --- a/keyboards/matrix/me/config.h +++ b/keyboards/matrix/me/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 @@ -24,9 +23,6 @@ #define MATRIX_COL_PINS {B7, B3, B2, B1, B0, F0, F1, F4, F5, F6, F7, C7, C6, B6, D7} #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/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 9222c1cad9..a5688556f2 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -15,7 +15,6 @@ #define MATRIX_COL_PINS { C15, B10, B7, B6, B5, B4, A15, A10, A9, A8, B15, B14, B13, B12, B2} #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 // i2c setting #define I2C1_SCL_PIN B8 diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 5a4477931b..9251760aa2 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -8,6 +8,7 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/matrix/noah/keymaps/blockader/keymap.c b/keyboards/matrix/noah/keymaps/blockader/keymap.c index b6d9a9acc3..b6caf43f91 100644 --- a/keyboards/matrix/noah/keymaps/blockader/keymap.c +++ b/keyboards/matrix/noah/keymaps/blockader/keymap.c @@ -32,7 +32,7 @@ enum{ DANCE_PGUP_TOP, }; -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [DANCE_PGDN_BOTTOM] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, LGUI(KC_DOWN)), [DANCE_PGUP_TOP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, LGUI(KC_UP)), }; @@ -645,7 +645,7 @@ bool process_record_user(uint16_t key, keyrecord_t* record) { return handle_common_key(key, record); } -void keyboard_post_init_user() { +void keyboard_post_init_user(void) { rgblight_disable_noeeprom(); rgb_matrix_disable(); common_layer_data.back = false; diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c index 17f7a2fb62..d5aca79cf6 100644 --- a/keyboards/matrix/noah/matrix.c +++ b/keyboards/matrix/noah/matrix.c @@ -13,6 +13,10 @@ #include "print.h" #include "matrix.h" +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + /** * * Row pins are input with internal pull-down. diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index 7971d628d6..616574f4ae 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -33,5 +33,3 @@ RGBLIGHT_CUSTOM_DRIVER = yes CUSTOM_MATRIX = yes # project specific files SRC += ws2812.c matrix.c - -LAYOUTS = 65_iso_blocker |