From 4394fc35ea0af6b30aae5dc244281388903b9aa9 Mon Sep 17 00:00:00 2001 From: Zach White Date: Wed, 6 Jan 2021 10:42:37 -0800 Subject: change matrix/m20add to use non-standard names for non-standard pins --- keyboards/matrix/m20add/config.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboards/matrix/m20add/config.h') diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 8c3f922ab9..3164346495 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -45,7 +45,8 @@ #define COL15_MASK 0x04 #define COL16_MASK 0x02 -#define MATRIX_ROW_PINS { \ +// Note: MATRIX_ROW_PINS only works with standard pin names. +#define MATRIX_M20_ROW_PINS { \ DEF_PIN(TCA6424_PORT2, 7), \ DEF_PIN(TCA6424_PORT2, 6), \ DEF_PIN(TCA6424_PORT2, 0), \ @@ -53,7 +54,8 @@ DEF_PIN(TCA6424_PORT2, 4), \ DEF_PIN(TCA6424_PORT2, 5) } -#define MATRIX_COL_PINS { \ +// Note: MATRIX_COL_PINS only works with standard pin names. +#define MATRIX_M20_COL_PINS { \ DEF_PIN(TCA6424_PORT2, 1), \ DEF_PIN(TCA6424_PORT1, 7), \ DEF_PIN(TCA6424_PORT1, 6), \ -- cgit v1.2.3 From d85b27bbbc6b086db469570cf741b515695dd816 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 20 Jan 2021 00:23:07 +1100 Subject: Leftover early initialisation conversions (#11615) * jm60 * ergodox_stm32 * F042 bootloader jumps. * xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072. * matrix/m20add, matrix/noah --- keyboards/matrix/m20add/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/matrix/m20add/config.h') diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 3164346495..f404ef9ccd 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -5,6 +5,8 @@ #pragma once +#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE + /* USB Device descriptor parameter */ #define VENDOR_ID 0x4D58 // MX #define PRODUCT_ID 0x20AD // 8XV2.0 Additional @@ -94,5 +96,3 @@ #define DRIVER_ADDR_1 0b1110100 #define DRIVER_COUNT 1 #define DRIVER_LED_TOTAL RGBLED_NUM - -#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE // disable jump to system bootloader -- cgit v1.2.3