aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDasky <32983009+daskygit@users.noreply.github.com>2021-07-25 03:33:30 +0100
committerGitHub <noreply@github.com>2021-07-25 12:33:30 +1000
commita938c54512b85251c5dae3bccae835a919460e71 (patch)
treeb616576f54eb9a59debc9c74e38c3a9d286a61bd
parent4ec8764c70da13366f8cb7f8240e3124ea509da5 (diff)
downloadqmk_firmware-a938c54512b85251c5dae3bccae835a919460e71.tar.gz
qmk_firmware-a938c54512b85251c5dae3bccae835a919460e71.zip
dirty fix (#13695)
-rw-r--r--keyboards/meira/featherble/config.h1
-rw-r--r--keyboards/meira/matrix.c2
-rw-r--r--keyboards/meira/promicro/config.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index dadc10d60..7abe2b1d6 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/meira/featherble/config.h
@@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#define MATRIX_ROW_PINS { F7, F6, F5, F4 } 33#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
34// Column pins to demux in LSB order 34// Column pins to demux in LSB order
35#define MATRIX_COL_PINS { C7, B7, B6, C6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } 35#define MATRIX_COL_PINS { C7, B7, B6, C6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
36#define MATRIX_COL_PINS_SCANNED { C7, B7, B6, C6 }
36#define LED_EN_PIN D2 37#define LED_EN_PIN D2
37#define UNUSED_PINS 38#define UNUSED_PINS
38 39
diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c
index c1bfb5868..ae1ae5ce9 100644
--- a/keyboards/meira/matrix.c
+++ b/keyboards/meira/matrix.c
@@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62static matrix_row_t matrix_debouncing[MATRIX_ROWS]; 62static matrix_row_t matrix_debouncing[MATRIX_ROWS];
63 63
64static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; 64static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
65static const uint8_t col_pins[4] = MATRIX_COL_PINS; 65static const uint8_t col_pins[4] = MATRIX_COL_PINS_SCANNED;
66//static const uint8_t lrow_pins[MATRIX_ROWS] = LED_ROW_PINS; 66//static const uint8_t lrow_pins[MATRIX_ROWS] = LED_ROW_PINS;
67//static const uint8_t lcol_pins[4] = LED_COL_PINS; 67//static const uint8_t lcol_pins[4] = LED_COL_PINS;
68 68
diff --git a/keyboards/meira/promicro/config.h b/keyboards/meira/promicro/config.h
index be5fae9aa..edd8a954f 100644
--- a/keyboards/meira/promicro/config.h
+++ b/keyboards/meira/promicro/config.h
@@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#define MATRIX_ROW_PINS { F7, F6, F5, F4 } 33#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
34// Column pins to demux in LSB order 34// Column pins to demux in LSB order
35#define MATRIX_COL_PINS { B1, B3, B2, B6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } 35#define MATRIX_COL_PINS { B1, B3, B2, B6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
36#define MATRIX_COL_PINS_SCANNED { B1, B3, B2, B6 }
37
36#define LED_EN_PIN D2 38#define LED_EN_PIN D2
37#define UNUSED_PINS 39#define UNUSED_PINS
38 40