summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-09-01 21:08:58 -0700
committerGitHub <noreply@github.com>2021-09-01 21:08:58 -0700
commit37aef4ebe17b04de07a17748e2452c2f1ebe77bd (patch)
tree70eb1e03ff21f1c1e9fbe2b788fe1438b50fe520 /keyboards/handwired
parentc1e5c920a9929a0434edca537e6c58aed294668c (diff)
[Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h6
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c4
-rw-r--r--keyboards/handwired/tractyl_manuform/tractyl_manuform.c8
-rw-r--r--keyboards/handwired/tractyl_manuform/tractyl_manuform.h2
5 files changed, 13 insertions, 8 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
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 61a6740a2d..aafa343051 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -46,15 +46,15 @@ __attribute__((weak)) kb_pointer_data_t process_mouse(void) {
kb_pointer_data_t temp_data = {.mouse_x = 0, .mouse_y = 0};
report_pmw_t data = pmw_read_burst();
- if (data.isOnSurface && data.isMotion) {
// Reset timer if stopped moving
if (!data.isMotion) {
if (MotionStart != 0) MotionStart = 0;
return temp_data;
}
+ if (data.isOnSurface) {
// Set timer if new motion
- if ((MotionStart == 0) && data.isMotion) {
+ if (MotionStart == 0) {
if (debug_mouse) dprintf("Starting motion.\n");
MotionStart = timer_read();
}
@@ -197,3 +197,7 @@ void matrix_scan_kb(void) {
matrix_scan_sub_kb();
matrix_scan_user();
}
+
+#ifdef POINTING_DEVICE_ENABLE
+void matrix_power_up(void) { pointing_device_task(); }
+#endif
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index f49569310a..99f1481ad8 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -43,7 +43,7 @@ typedef struct {
uint16_t device_cpi;
} kb_config_data_t;
-typedef struct {
+__attribute__((aligned(16))) typedef struct {
int8_t mouse_x;
int8_t mouse_y;
} kb_pointer_data_t;