Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
38d071d662
@ -34,7 +34,7 @@
|
|||||||
#define GET_PORT(pp) (((pp) >> 8) & 0xFF)
|
#define GET_PORT(pp) (((pp) >> 8) & 0xFF)
|
||||||
#define GET_PIN(pp) ((pp) & 0xFF)
|
#define GET_PIN(pp) ((pp) & 0xFF)
|
||||||
|
|
||||||
#define MATRIX_ROW_PINS { \
|
#define CUSTOM_MATRIX_ROW_PINS { \
|
||||||
DEF_PIN(TCA6424_PORT2, 7), \
|
DEF_PIN(TCA6424_PORT2, 7), \
|
||||||
DEF_PIN(TCA6424_PORT2, 6), \
|
DEF_PIN(TCA6424_PORT2, 6), \
|
||||||
DEF_PIN(TCA6424_PORT2, 0), \
|
DEF_PIN(TCA6424_PORT2, 0), \
|
||||||
@ -42,7 +42,7 @@
|
|||||||
DEF_PIN(TCA6424_PORT2, 4), \
|
DEF_PIN(TCA6424_PORT2, 4), \
|
||||||
DEF_PIN(TCA6424_PORT2, 5) }
|
DEF_PIN(TCA6424_PORT2, 5) }
|
||||||
|
|
||||||
#define MATRIX_COL_PINS { \
|
#define CUSTOM_MATRIX_COL_PINS { \
|
||||||
DEF_PIN(TCA6424_PORT2, 1), \
|
DEF_PIN(TCA6424_PORT2, 1), \
|
||||||
DEF_PIN(TCA6424_PORT1, 7), \
|
DEF_PIN(TCA6424_PORT1, 7), \
|
||||||
DEF_PIN(TCA6424_PORT1, 6), \
|
DEF_PIN(TCA6424_PORT1, 6), \
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "tca6424.h"
|
#include "tca6424.h"
|
||||||
#include "abelx.h"
|
#include "abelx.h"
|
||||||
|
|
||||||
static const uint16_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
static const uint16_t col_pins[MATRIX_COLS] = CUSTOM_MATRIX_COL_PINS;
|
||||||
|
|
||||||
void matrix_init_custom(void)
|
void matrix_init_custom(void)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user