The blacktyl works as soldered...

This commit is contained in:
Thomas Haukland 2022-03-30 23:09:08 +02:00
parent 17744429a4
commit f9a455fa53
4 changed files with 27 additions and 23 deletions

View File

@ -20,19 +20,19 @@
// clang-format off // clang-format off
#define LAYOUT_split_3x5_3( \ #define LAYOUT_split_3x5_3( \
k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
k33, k34, k31, k71, k74, k73 \ k33, k34, k31, k71, k74, k73 \
) \ ) \
{ \ { \
{ k00, k01, k02, k03, k04 }, \ { k00, k01, k02, k03, k04 }, \
{ k10, k11, k12, k13, k14 }, \ { k10, k11, k12, k13, k14 }, \
{ k20, k21, k22, k23, k24 }, \ { k20, k21, k22, k23, k24 }, \
{ k31, KC_NO, k33, k34, KC_NO }, \ { k31, KC_NO, k33, k34, KC_NO }, \
{ k40, k41, k42, k43, k44 }, \ { k40, k41, k42, k43, k44 }, \
{ k50, k51, k52, k53, k54 }, \ { k50, k51, k52, k53, k54 }, \
{ k60, k61, k62, k63, k64 }, \ { k60, k61, k62, k63, k64 }, \
{ k71, KC_NO, k73, k74, KC_NO }, \ { k71, KC_NO, k73, k74, KC_NO }, \
} }
// clang-format on // clang-format on

View File

@ -14,9 +14,13 @@
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ B1, B10, B4, B3, B8 } { B1, B10, B4, B3, B8 }
#define MATRIX_COL_PINS_RIGHT \
{ B1, B10, B3, B4, B5 }
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ A2, B5, B9, A8 } { A2, B5, B9, A8 }
#define MATRIX_ROW_PINS_RIGHT \
{ A2, B8, A8, B9 }
#define DIODE_DIRECTION ROW2COL #define DIODE_DIRECTION ROW2COL
// #define DEBUG_MATRIX_SCAN_RATE // #define DEBUG_MATRIX_SCAN_RATE
@ -56,10 +60,10 @@
/* SPI DRIVER /* SPI DRIVER
*/ */
#define SPI_DRIVER SPID1 //#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5 //#define SPI_SCK_PIN A5
#define SPI_MOSI_PIN B7 //&#define SPI_MOSI_PIN B7
#define SPI_MISO_PIN A6 //#define SPI_MISO_PIN A6
/* EEPROM DRIVER */ /* EEPROM DRIVER */
//#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 //#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#define HAL_USE_SPI TRUE //#define HAL_USE_SPI TRUE
#define HAL_USE_PWM TRUE //#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE #define HAL_USE_SERIAL TRUE
// #define PAL_USE_CALLBACKS TRUE // #define PAL_USE_CALLBACKS TRUE

View File

@ -8,8 +8,8 @@
#undef STM32_ST_USE_TIMER #undef STM32_ST_USE_TIMER
#define STM32_ST_USE_TIMER 5 #define STM32_ST_USE_TIMER 5
#undef STM32_PWM_USE_TIM2 //#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE //#define STM32_PWM_USE_TIM2 TRUE
#undef STM32_SPI_USE_SPI1 #undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE #define STM32_SPI_USE_SPI1 TRUE