diff options
author | Jack Sangdahl <[email protected]> | 2024-08-31 15:38:09 -0600 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-08-31 15:38:09 -0600 |
commit | bf6d201c0f852559ecee0cb55ca5a58747820b38 (patch) | |
tree | 2792fae266f633689aa957cb290ed19a18496b55 | |
parent | f12a94d11b0a3bc9e572a74937d596648e002e9b (diff) | |
download | qmk_me-bf6d201c0f852559ecee0cb55ca5a58747820b38.tar.gz qmk_me-bf6d201c0f852559ecee0cb55ca5a58747820b38.zip |
Fix sweep config, AVR builds, and tap dance
-rw-r--r-- | keyboards/sweep/config.h | 8 | ||||
-rw-r--r-- | keyboards/sweep/keyboard.json | 2 | ||||
-rw-r--r-- | keyboards/sweep/mcuconf.h | 4 | ||||
-rw-r--r-- | waffle/rules.mk | 1 | ||||
-rw-r--r-- | waffle/tapping.c | 5 |
5 files changed, 13 insertions, 7 deletions
diff --git a/keyboards/sweep/config.h b/keyboards/sweep/config.h index f1a5681..c73735f 100644 --- a/keyboards/sweep/config.h +++ b/keyboards/sweep/config.h @@ -6,6 +6,8 @@ #define SERIAL_USART_TX_PIN GP0 #define SERIAL_USART_RX_PIN GP1 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET + #ifdef HAL_USE_SPI #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP6 @@ -29,7 +31,7 @@ #endif #ifdef HAL_USE_I2C -#define I2C_DRIVER I2CD0 -#define I2C_SDA_PIN GP3 -#define I2C_SCL_PIN GP6 +#define I2C_DRIVER I2CD1 +#define I2C1_SDA_PIN GP3 +#define I2C1_SCL_PIN GP6 #endif diff --git a/keyboards/sweep/keyboard.json b/keyboards/sweep/keyboard.json index 3da98bd..c5e9a9f 100644 --- a/keyboards/sweep/keyboard.json +++ b/keyboards/sweep/keyboard.json @@ -7,7 +7,7 @@ "bootmagic": true, "oled": false, "pointing_device": true, - "quantum_painter": false, + "quantum_painter": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/sweep/mcuconf.h b/keyboards/sweep/mcuconf.h index 32da2a1..cd22b38 100644 --- a/keyboards/sweep/mcuconf.h +++ b/keyboards/sweep/mcuconf.h @@ -7,5 +7,5 @@ #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE -#undef RP_I2C_USE_I2C0 -#define RP_I2C_USE_I2C0 FALSE +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 FALSE diff --git a/waffle/rules.mk b/waffle/rules.mk index ad4a03f..37ab4ff 100644 --- a/waffle/rules.mk +++ b/waffle/rules.mk @@ -11,6 +11,7 @@ TAP_DANCE_ENABLE = yes AUTOCORRECT_ENABLE = yes MOUSE_JIGGLE_ENABLE = yes DEBOUNCE_TYPE = asym_eager_defer_pk +AVR_CFLAGS += -mrelax INTROSPECTION_KEYMAP_C = waffle.c SRC += tapping.c diff --git a/waffle/tapping.c b/waffle/tapping.c index 793b8b6..c4351ec 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -95,11 +95,14 @@ void td_reset(tap_dance_state_t *state, void *user_data) { void em_dash_mins(tap_dance_state_t *state, void *user_data) { switch (state->count) { - case 2: + case 3: #ifdef UNICODE_COMMON_ENABLE register_unicode(0x2014); // — #endif break; + case 2: + tap_code(KC_MINS), tap_code(KC_MINS); + break; default: tap_code(KC_MINS); } |