diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-02 04:09:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-02 04:09:36 +0000 |
| commit | 98436577d711e66c01f1f7fd231d6ad1c065cba6 (patch) | |
| tree | fdd1fb5089b5ed8f970f7973dddcbdf9a943c20f /keyboards/handwired/tractyl_manuform/5x6_right | |
| parent | cfedd3054ea144c92328ad517f87b74e2655d6d3 (diff) | |
| parent | 37aef4ebe17b04de07a17748e2452c2f1ebe77bd (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired/tractyl_manuform/5x6_right')
3 files changed, 6 insertions, 5 deletions
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index cc4efedb86..93ca121590 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -87,10 +87,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPI_MISO_PAL_MODE 5 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 -// #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64 +#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // #define EXTERNAL_EEPROM_BYTE_COUNT 8196 // #define EXTERNAL_EEPROM_PAGE_SIZE 32 // #define EXTERNAL_EEPROM_ADDRESS_SIZE 2 // #define DEBUG_EEPROM_OUTPUT -#define PMW3360_CS_PIN B0 +#define PMW3360_CS_PIN B0 +#define PMW3360_SPI_MODE 3 +#define PMW3360_SPI_DIVISOR 4 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 1f6028c72a..240219f1d3 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -22,5 +22,4 @@ void matrix_scan_sub_kb(void) { if (!readPin(A0)) { reset_keyboard(); } - matrix_scan_user(); } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c index aa93de75db..ac4999161b 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN3, - KC_ACCEL, _______, _______, + _______, KC_ACCEL, _______, _______, _______, _______, _______ ), [_GAMEPAD] = LAYOUT_5x6_right( @@ -259,7 +259,7 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { } #endif -#ifdef OLED_DRIVER_ENABLE +#ifdef OLED_ENABLE // WPM-responsive animation stuff here # define SLEEP_FRAMES 2 # define SLEEP_SPEED 10 // below this wpm value your animation will idle |