Merge branch 'master' of https://github.com/di0ib/tmk_keyboard
This commit is contained in:
commit
bcd8e2cd90
@ -70,6 +70,9 @@ uint8_t matrix_cols(void)
|
|||||||
|
|
||||||
void matrix_init(void)
|
void matrix_init(void)
|
||||||
{
|
{
|
||||||
|
// disable JTAG SWD
|
||||||
|
AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE;
|
||||||
|
|
||||||
// initialize row and col
|
// initialize row and col
|
||||||
unselect_rows();
|
unselect_rows();
|
||||||
init_cols();
|
init_cols();
|
||||||
@ -152,8 +155,8 @@ static void init_cols(void)
|
|||||||
palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOB, 1, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOA, 1, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOB, 0, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOA, 0, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLUP);
|
||||||
palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLUP);
|
palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLUP);
|
||||||
|
Loading…
Reference in New Issue
Block a user