diff options
author | Jack Sangdahl <[email protected]> | 2024-09-08 15:42:13 -0600 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-09-08 15:42:13 -0600 |
commit | b86176c7aae4be4a5b47ddd872585c43b63c78f2 (patch) | |
tree | b9eb3880bf1dd3e775d0497708fd83e0ab627712 | |
parent | bf6d201c0f852559ecee0cb55ca5a58747820b38 (diff) | |
download | qmk_me-b86176c7aae4be4a5b47ddd872585c43b63c78f2.tar.gz qmk_me-b86176c7aae4be4a5b47ddd872585c43b63c78f2.zip |
Fixup sweep firmware
-rw-r--r-- | keyboards/sweep/config.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/halconf.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/keyboard.json | 28 | ||||
-rw-r--r-- | keyboards/sweep/mcuconf.h | 2 | ||||
-rw-r--r-- | keyboards/sweep/readme.md | 6 | ||||
-rw-r--r-- | keyboards/sweep/sweep.c | 13 |
6 files changed, 34 insertions, 19 deletions
diff --git a/keyboards/sweep/config.h b/keyboards/sweep/config.h index c73735f..e6ef7f3 100644 --- a/keyboards/sweep/config.h +++ b/keyboards/sweep/config.h @@ -28,6 +28,8 @@ #define CIRQUE_PINNACLE_TAP_ENABLE #define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE #define CIRQUE_PINNACLE_DIAMETER_MM 35 +#define SPLIT_POINTING_ENABLE +#define POINTING_DEVICE_RIGHT #endif #ifdef HAL_USE_I2C diff --git a/keyboards/sweep/halconf.h b/keyboards/sweep/halconf.h index 701d0ce..63f81cd 100644 --- a/keyboards/sweep/halconf.h +++ b/keyboards/sweep/halconf.h @@ -3,8 +3,6 @@ #pragma once #define HAL_USE_SPI TRUE -#define SPI_USE_WAIT TRUE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD #define HAL_USE_I2C FALSE #include_next <halconf.h> diff --git a/keyboards/sweep/keyboard.json b/keyboards/sweep/keyboard.json index c5e9a9f..d625fc9 100644 --- a/keyboards/sweep/keyboard.json +++ b/keyboards/sweep/keyboard.json @@ -1,7 +1,7 @@ { - "manufacturer": "jacks", + "manufacturer": "pngu.org", "keyboard_name": "sweep", - "maintainer": "pngu.org", + "maintainer": "jack", "bootloader": "rp2040", "features": { "bootmagic": true, @@ -72,18 +72,18 @@ "handedness": { "pin": "GP8" }, + "matrix_pins": { + "right": { + "direct": [ + ["GP25", "GP22", "GP17", "GP16", "GP13"], + ["GP24", "GP20", "GP18", "GP15", "GP12"], + ["GP23", "GP21", "GP19", "GP14", "GP11"], + ["GP10", "GP9", null, null, null] + ] + } + }, "serial": { "driver": "vendor" - }, - "matrix_pins": { - "right": { - "direct": [ - ["GP13", "GP16", "GP17", "GP22", "GP25"], - ["GP12", "GP15", "GP18", "GP20", "GP24"], - ["GP11", "GP14", "GP19", "GP21", "GP23"], - [null, null, null, "GP9", "GP10"] - ] - } } }, "url": "https://git.pngu.org/sweep", @@ -96,6 +96,10 @@ "driver": "vendor", "pin": "GP2" }, + "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ diff --git a/keyboards/sweep/mcuconf.h b/keyboards/sweep/mcuconf.h index cd22b38..be63774 100644 --- a/keyboards/sweep/mcuconf.h +++ b/keyboards/sweep/mcuconf.h @@ -8,4 +8,4 @@ #define RP_SPI_USE_SPI0 TRUE #undef RP_I2C_USE_I2C1 -#define RP_I2C_USE_I2C1 FALSE +#define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/sweep/readme.md b/keyboards/sweep/readme.md index 5d6b42f..1ccc4f3 100644 --- a/keyboards/sweep/readme.md +++ b/keyboards/sweep/readme.md @@ -2,9 +2,9 @@ ![%KEYBOARD%](imgur.com image replace me!) -* Keyboard Maintainer: [Jack Sangdahl][https://github.com/waffle87] +* Keyboard Maintainer: [Jack Sangdahl](https://github.com/waffle87) * Hardware Supported: PCBs with integrated RP2040 microcontroller -* Hardware Availability: [git/sweep][https://git.pngu.org/sweep] +* Hardware Availability: [git/sweep](https://git.pngu.org/sweep) Make example for this keyboard (after setting up your build environment): @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make sweep:default + make sweep:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/sweep/sweep.c b/keyboards/sweep/sweep.c index 4e061f8..f14a591 100644 --- a/keyboards/sweep/sweep.c +++ b/keyboards/sweep/sweep.c @@ -35,4 +35,15 @@ void suspend_wakeup_init_kb(void) { qp_power(display, true); suspend_wakeup_init_user(); } -#endif +#endif // QUANTUM_PAINTER_ENABLE + +#ifdef OLED_ENABLE +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return rotation; } + +bool oled_task_kb(void) { + if (!oled_task_user()) + return false; + oled_write(PSTR("foo bar baz"), false); + return true; +} +#endif // OLED_ENABLE |