diff options
author | Jack Sangdahl <[email protected]> | 2024-07-03 16:27:34 -0600 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-07-03 16:27:34 -0600 |
commit | 6b16ad32ae125383b7b976704a9803a492ee899c (patch) | |
tree | ccfd0751d1f30e5db164139cfc9f021db9c7c47d | |
parent | c84e475efd6e4f361f1b06e277d15aeb13824ad8 (diff) | |
download | qmk_me-6b16ad32ae125383b7b976704a9803a492ee899c.tar.gz qmk_me-6b16ad32ae125383b7b976704a9803a492ee899c.zip |
tidy some code & update license headers
55 files changed, 169 insertions, 166 deletions
diff --git a/keyboards/bully/keyboard.json b/keyboards/bully/keyboard.json index 6ff9be0..d813721 100644 --- a/keyboards/bully/keyboard.json +++ b/keyboards/bully/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "bully", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "STM32F072", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c index 822b2de..ac9a0c7 100644 --- a/keyboards/bully/keymaps/waffle/keymap.c +++ b/keyboards/bully/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/grumpy/keyboard.json b/keyboards/grumpy/keyboard.json index 1ab8dd3..2ad7bf2 100644 --- a/keyboards/grumpy/keyboard.json +++ b/keyboards/grumpy/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "grumpy", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "RP2040", "bootloader": "rp2040", "diode_direction": "COL2ROW", diff --git a/keyboards/grumpy/keymaps/waffle/keymap.c b/keyboards/grumpy/keymaps/waffle/keymap.c index 031d512..3829c57 100644 --- a/keyboards/grumpy/keymaps/waffle/keymap.c +++ b/keyboards/grumpy/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/leftover30/chconf.h b/keyboards/leftover30/chconf.h index 9bc061c..2add76c 100644 --- a/keyboards/leftover30/chconf.h +++ b/keyboards/leftover30/chconf.h @@ -1,7 +1,9 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once + #define CH_CFG_ST_FREQUENCY 10000 #define CH_CFG_OPTIMIZE_SPEED FALSE #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + #include_next <chconf.h> diff --git a/keyboards/leftover30/config.h b/keyboards/leftover30/config.h index d8533fd..6912807 100644 --- a/keyboards/leftover30/config.h +++ b/keyboards/leftover30/config.h @@ -1,6 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once + #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 diff --git a/keyboards/leftover30/halconf.h b/keyboards/leftover30/halconf.h index 33a113d..4ffc260 100644 --- a/keyboards/leftover30/halconf.h +++ b/keyboards/leftover30/halconf.h @@ -1,5 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once + #define HAL_USE_SPI TRUE + #include_next <halconf.h> diff --git a/keyboards/leftover30/keyboard.json b/keyboards/leftover30/keyboard.json index e2e2b46..0a32fff 100644 --- a/keyboards/leftover30/keyboard.json +++ b/keyboards/leftover30/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "leftover30", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "STM32F072", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/leftover30/keymaps/waffle/keymap.c b/keyboards/leftover30/keymaps/waffle/keymap.c index e0dc690..d50aa83 100644 --- a/keyboards/leftover30/keymaps/waffle/keymap.c +++ b/keyboards/leftover30/keymaps/waffle/keymap.c @@ -1,6 +1,8 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" + +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle( ___BASE1___, KC_BSPC, @@ -15,3 +17,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, _______, _______, RGB_MOD, RGB_TOG ) }; +// clang-format on diff --git a/keyboards/leftover30/mcuconf.h b/keyboards/leftover30/mcuconf.h index b078bb3..10914c8 100644 --- a/keyboards/leftover30/mcuconf.h +++ b/keyboards/leftover30/mcuconf.h @@ -1,6 +1,8 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #pragma once + #include_next <mcuconf.h> + #undef STM32_SPI_USE_SPI2 #define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/locus/keyboard.json b/keyboards/locus/keyboard.json index d590c5b..ec397d1 100644 --- a/keyboards/locus/keyboard.json +++ b/keyboards/locus/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_me": "locus", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/locus/keymaps/waffle/keymap.c b/keyboards/locus/keymaps/waffle/keymap.c index dc50233..e3ec74b 100644 --- a/keyboards/locus/keymaps/waffle/keymap.c +++ b/keyboards/locus/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/minidox/keyboard.json b/keyboards/minidox/keyboard.json index 4a33c16..02d586c 100644 --- a/keyboards/minidox/keyboard.json +++ b/keyboards/minidox/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "minidox", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "development_board": "promicro", "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/minidox/keymaps/waffle/keymap.c b/keyboards/minidox/keymaps/waffle/keymap.c index e7875e0..24abb01 100644 --- a/keyboards/minidox/keymaps/waffle/keymap.c +++ b/keyboards/minidox/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/relic/keyboard.json b/keyboards/relic/keyboard.json index 583eed7..00fd1ee 100644 --- a/keyboards/relic/keyboard.json +++ b/keyboards/relic/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "relic", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c index 141bdce..addfce3 100644 --- a/keyboards/relic/keymaps/waffle/keymap.c +++ b/keyboards/relic/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/tornish/keyboard.json b/keyboards/tornish/keyboard.json index b8c8e61..5423d74 100644 --- a/keyboards/tornish/keyboard.json +++ b/keyboards/tornish/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "tornish", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "bootloader": "usbasploader", "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/tornish/keymaps/default/keymap.c b/keyboards/tornish/keymaps/default/keymap.c index 87fec9d..b3e22f8 100644 --- a/keyboards/tornish/keymaps/default/keymap.c +++ b/keyboards/tornish/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/vault35/keyboard.json b/keyboards/vault35/keyboard.json index 8568db2..39d75c4 100644 --- a/keyboards/vault35/keyboard.json +++ b/keyboards/vault35/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "vault35", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/vault35/keymaps/waffle/keymap.c b/keyboards/vault35/keymaps/waffle/keymap.c index f192061..bdd8946 100644 --- a/keyboards/vault35/keymaps/waffle/keymap.c +++ b/keyboards/vault35/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" diff --git a/keyboards/xyz60/keyboard.json b/keyboards/xyz60/keyboard.json index 18c7e8e..d605eb3 100644 --- a/keyboards/xyz60/keyboard.json +++ b/keyboards/xyz60/keyboard.json @@ -1,7 +1,7 @@ { "keyboard_name": "xyz60", - "manufacturer": "waffles", - "maintainer": "waffle87", + "manufacturer": "jacks", + "maintainer": "pngu.org", "processor": "STM32F103", "bootloader": "stm32duino", "diode_direction": "COL2ROW", diff --git a/keyboards/xyz60/keymaps/waffle/keymap.c b/keyboards/xyz60/keymaps/waffle/keymap.c index 1bb64db..8c9dc23 100644 --- a/keyboards/xyz60/keymaps/waffle/keymap.c +++ b/keyboards/xyz60/keymaps/waffle/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" #define ___NONE___ \ diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h index d84d5cc..8722b02 100644 --- a/keymaps/crkbd/config.h +++ b/keymaps/crkbd/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -9,46 +9,46 @@ #define SERIAL_USART_SPEED 921600 #ifdef OLED_ENABLE -# define LAYER_ANIM -# define BONGO_CAT -# define FELIX_DOG +#define LAYER_ANIM +#define BONGO_CAT +#define FELIX_DOG #endif #ifdef RGB_MATRIX_ENABLE -# undef WS2812_DI_PIN -# define WS2812_DI_PIN B5 -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_KEYPRESSES -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -# define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 -# define WS2812_PWM_DRIVER PWMD3 -# define WS2812_PWM_CHANNEL 3 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -# define WS2812_DMA_CHANNEL 3 -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B5 +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR +#define RGB_DISABLE_WHEN_USB_SUSPENDED +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 +#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP #endif #ifdef ENCODER_ENABLE -# define ENCODERS_PAD_A { B2 } -# define ENCODERS_PAD_B { B6 } +#define ENCODER_A_PINS {B2} +#define ENCODER_B_PINS {B6} #endif #ifdef AUDIO_ENABLE -# define AUDIO_PIN A5 -# define STARTUP_SONG SONG(ODE_TO_JOY) -# define AUDIO_CLICKY +#define AUDIO_PIN A5 +#define STARTUP_SONG SONG(ODE_TO_JOY) +#define AUDIO_CLICKY #endif #ifdef POINTING_DEVICE_ENABLE -# define SPLIT_POINTING_ENABLE -# define POINTING_DEVICE_RIGHT +#define SPLIT_POINTING_ENABLE +#define POINTING_DEVICE_RIGHT #endif diff --git a/keymaps/crkbd/halconf.h b/keymaps/crkbd/halconf.h index b54acd3..547b9db 100644 --- a/keymaps/crkbd/halconf.h +++ b/keymaps/crkbd/halconf.h @@ -1,5 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define HAL_USE_SERIAL TRUE + #include_next <halconf.h> diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index 8870511..d148d25 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" @@ -62,13 +62,31 @@ void keyboard_post_init_keymap(void) { } #endif // audio +#ifdef POINTING_DEVICE_ENABLE +uint8_t red = 255, green = 0, blue = 0; + +void trackball_hue(void) { + if (red != 255 && green != 255 && blue != 255) + red = 255; + if (red == 255 && green < 255 && !blue) + green += 15; + else if (green == 255 && !blue && red) + red -= 15; + else if (!red && blue < 255 && green == 255) + blue += 15; + else if (blue == 255 && green && !red) + green -= 15; + else if (!green && blue == 255 && red < 255) + red += 15; + else if (!green && blue && red == 255) + blue -= 15; + pimoroni_trackball_set_rgbw(red, green, blue, 0); +} +#endif // pointing device + #ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (!is_keyboard_master()) - return 3; - else - return 2; - return rotation; + return is_keyboard_master() ? 2 : 3; } bool oled_task_keymap(void) { diff --git a/keymaps/crkbd/mcuconf.h b/keymaps/crkbd/mcuconf.h index accb273..871c3e7 100644 --- a/keymaps/crkbd/mcuconf.h +++ b/keymaps/crkbd/mcuconf.h @@ -1,6 +1,8 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #include_next <mcuconf.h> + #undef STM32_PWM_USE_TIM3 #define STM32_PWM_USE_TIM3 TRUE diff --git a/keymaps/crkbd/readme.md b/keymaps/crkbd/readme.md index 5a47a50..64e4a9a 100644 --- a/keymaps/crkbd/readme.md +++ b/keymaps/crkbd/readme.md @@ -1,4 +1,4 @@ -### [proton-c crkbd](https://github.com/waffle87/waffle_corne) +### [proton-c crkbd](https://git.pngu.org/protoncrkbd) ![img](https://i.imgur.com/ob8D0hY.jpeg) #### notes diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c index b091a24..7094bde 100644 --- a/keymaps/f60/keymap.c +++ b/keymaps/f60/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #define ___NONE___ \ diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h index 47ae6b3..9899401 100644 --- a/keymaps/ferris/config.h +++ b/keymaps/ferris/config.h @@ -1,9 +1,10 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define WS2812_DI_PIN B0 #define RGB_MATRIX_LED_COUNT 34 -#define RGB_MATRIX_SPLIT {17,17} +#define RGB_MATRIX_SPLIT {17, 17} #define RGB_DISABLE_WHEN_USB_SUSPENDED #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT @@ -12,6 +13,7 @@ #define __ NO_PIN #undef DIRECT_PINS #undef DIRECT_PINS_RIGHT +// clang-format off #define DIRECT_PINS { \ {D7,F7,F6,F5,F4}, \ {B1,B3,B2,B6,D3}, \ @@ -24,3 +26,4 @@ {E6,C6,D4,D0,D1}, \ {B5,B4,__,__,__} \ } +// clang-format on diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c index 891a427..6352c5b 100644 --- a/keymaps/ferris/keymap.c +++ b/keymaps/ferris/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #define XX NO_LED diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h index 283f49e..fcad92e 100644 --- a/keymaps/kyria/config.h +++ b/keymaps/kyria/config.h @@ -1,6 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define WPM_GRAPH #define SPLIT_POINTING_ENABLE #define POINTING_DEVICE_RIGHT diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index cd07c79..4dac028 100644 --- a/keymaps/kyria/keymap.c +++ b/keymaps/kyria/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h index 4bbc7cc..6f9749e 100644 --- a/keymaps/microdox/config.h +++ b/keymaps/microdox/config.h @@ -1,6 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL diff --git a/keymaps/microdox/keymap.c b/keymaps/microdox/keymap.c index a9c96e2..adf5ddd 100644 --- a/keymaps/microdox/keymap.c +++ b/keymaps/microdox/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" @@ -27,11 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (is_keyboard_master()) - return 0; - else - return 2; - return rotation; + return is_keyboard_master() ? 0 : 2; } bool oled_task_keymap(void) { diff --git a/keymaps/onekey/rp2040/chconf.h b/keymaps/onekey/rp2040/chconf.h index 6432fad..5b38d53 100644 --- a/keymaps/onekey/rp2040/chconf.h +++ b/keymaps/onekey/rp2040/chconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keymaps/onekey/rp2040/keymap.c b/keymaps/onekey/rp2040/keymap.c index eb13966..07fb9fa 100644 --- a/keymaps/onekey/rp2040/keymap.c +++ b/keymaps/onekey/rp2040/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keymaps/onekey/rp2040/mcuconf.h b/keymaps/onekey/rp2040/mcuconf.h index f8fc268..abc250c 100644 --- a/keymaps/onekey/rp2040/mcuconf.h +++ b/keymaps/onekey/rp2040/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include_next <mcuconf.h> diff --git a/keymaps/onekey/stm32f411/config.h b/keymaps/onekey/stm32f411/config.h index 84ac83f..1b03659 100644 --- a/keymaps/onekey/stm32f411/config.h +++ b/keymaps/onekey/stm32f411/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -6,4 +6,7 @@ #undef BACKLIGHT_PIN #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS -#define DIRECT_PINS {{A0}} +#define DIRECT_PINS \ + { \ + { A0 } \ + } diff --git a/keymaps/onekey/stm32f411/keymap.c b/keymaps/onekey/stm32f411/keymap.c index 2cabe31..34b5279 100644 --- a/keymaps/onekey/stm32f411/keymap.c +++ b/keymaps/onekey/stm32f411/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/waffle/autocorrect_data.h b/waffle/autocorrect_data.h index c44ea2d..f9d6352 100644 --- a/waffle/autocorrect_data.h +++ b/waffle/autocorrect_data.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define AUTOCORRECT_MIN_LENGTH 5 diff --git a/waffle/autocorrect_dict.txt b/waffle/autocorrect_dict.txt index ef1508f..135bb64 100644 --- a/waffle/autocorrect_dict.txt +++ b/waffle/autocorrect_dict.txt @@ -1,4 +1,4 @@ -# Copyright 2024 jack (@waffle87) +# Copyright 2024 [email protected] # SPDX-License-Identifier: GPL-2.0-or-later :theri -> their diff --git a/waffle/color.c b/waffle/color.c index 9e81df8..4d833f3 100644 --- a/waffle/color.c +++ b/waffle/color.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "color.h" #include <lib/lib8tion/lib8tion.h> diff --git a/waffle/combos.def b/waffle/combos.def index e60f871..b20c3a8 100644 --- a/waffle/combos.def +++ b/waffle/combos.def @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later // name output keys diff --git a/waffle/combos.h b/waffle/combos.h index e73758a..27e7a7c 100644 --- a/waffle/combos.h +++ b/waffle/combos.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/waffle/config.h b/waffle/config.h index 2f98bdf..9a733aa 100644 --- a/waffle/config.h +++ b/waffle/config.h @@ -1,18 +1,15 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define TAPPING_TERM_PER_KEY -#define PERSMISSVE_HOLD #define TAPPING_TERM 140 -#define LAYER_STATE_8BIT #define FORCE_NKRO #define BOTH_SHIFTS_TURNS_ON_CAPS_WORD #define COMBO_TERM 40 #define NO_ACTION_ONESHOT #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX #define ENABLE_COMPILE_KEYCODE -#define IGNORE_ATOMIC_BLOCK #ifndef SPC_OFFSET #define SPC_OFFSET 40 #endif @@ -23,7 +20,7 @@ #define PRODUCT_ID 0x6B62 #endif #undef MANUFACTURER -#define MANUFACTURER "waffles" +#define MANUFACTURER "jacks" #ifdef OLED_ENABLE #define OLED_FONT_H "users/waffle/oledfont.h" diff --git a/waffle/dict.h b/waffle/dict.h index 7141e3e..c7a27f4 100644 --- a/waffle/dict.h +++ b/waffle/dict.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/waffle/oled.c b/waffle/oled.c index 23d766c..cef22ad 100644 --- a/waffle/oled.c +++ b/waffle/oled.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" uint32_t oled_timer = 0; diff --git a/waffle/oled.h b/waffle/oled.h index 26de479..e1a50ab 100644 --- a/waffle/oled.h +++ b/waffle/oled.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include "quantum.h" diff --git a/waffle/oledfont.h b/waffle/oledfont.h index 93c74b2..bf924f5 100644 --- a/waffle/oledfont.h +++ b/waffle/oledfont.h @@ -1,6 +1,7 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "progmem.h" + const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, diff --git a/waffle/raw.py b/waffle/raw.py index 851385e..994a92c 100644 --- a/waffle/raw.py +++ b/waffle/raw.py @@ -1,4 +1,4 @@ -# Copyright 2024 jack (@waffle87) +# Copyright 2024 [email protected] # SPDX-License-Identifier: GPL-2.0-or-later import hid import sys @@ -15,10 +15,14 @@ usage = 0x61 def get_raw_hid_interface(): device_interfaces = hid.enumerate(vendor_id, product_id) - raw_hid_interfaces = [i for i in device_interfaces if i['usage_page'] == usage_page and i['usage'] == usage] + raw_hid_interfaces = [ + i + for i in device_interfaces + if i["usage_page"] == usage_page and i["usage"] == usage + ] if len(raw_hid_interfaces) == 0: return None - interface = hid.Device(path=raw_hid_interfaces[0]['path']) + interface = hid.Device(path=raw_hid_interfaces[0]["path"]) return interface @@ -28,7 +32,7 @@ def send_packet(data): print("no device found") sys.exit(1) request_data = [0x00] * 32 - request_data[1:len(data) + 1] = data + request_data[1 : len(data) + 1] = data request_packet = bytes(request_data) try: interface.write(request_packet) @@ -42,8 +46,4 @@ if __name__ == "__main__": cpu_temp = psutil.sensors_temperatures()["gigabyte_wmi"][2] cur_hour = datetime.datetime.now().strftime("%H") cur_minute = datetime.datetime.now().strftime("%M") - send_packet([ - math.trunc(cpu_temp.current), - int(cur_hour), - int(cur_minute) - ]) + send_packet([math.trunc(cpu_temp.current), int(cur_hour), int(cur_minute)]) diff --git a/waffle/rules.mk b/waffle/rules.mk index 37c913c..6605ba8 100644 --- a/waffle/rules.mk +++ b/waffle/rules.mk @@ -1,16 +1,16 @@ -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes +LTO_ENABLE = yes +TOP_SYMBOLS = yes NRKO_ENABLE = yes COMBO_ENABLE = yes -CAPS_WORD_ENABLE = yes -AUTOCORRECT_ENABLE = yes -TOP_SYMBOLS = yes -LTO_ENABLE = yes -TAP_DANCE_ENABLE = yes -UNICODE_COMMON = yes -MOUSEKEY_ENABLE = yes MAGIC_ENABLE = no CONSOLE_ENABLE = no +UNICODE_COMMON = yes +EXTRAKEY_ENABLE = yes +MOUSEKEY_ENABLE = yes +BOOTMAGIC_ENABLE = yes +CAPS_WORD_ENABLE = yes +TAP_DANCE_ENABLE = yes +AUTOCORRECT_ENABLE = yes DEBOUNCE_TYPE = asym_eager_defer_pk INTROSPECTION_KEYMAP_C = waffle.c diff --git a/waffle/tapping.c b/waffle/tapping.c index d6a164b..50fea91 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "secrets.h" #include "waffle.h" diff --git a/waffle/unicode.c b/waffle/unicode.c index c0a0bd5..36dd53d 100644 --- a/waffle/unicode.c +++ b/waffle/unicode.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" diff --git a/waffle/waffle.c b/waffle/waffle.c index e788de7..05d9916 100644 --- a/waffle/waffle.c +++ b/waffle/waffle.c @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "waffle.h" #include "combos.h" @@ -74,28 +74,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_RAISE] = {{C(KC_LEFT), C(KC_RGHT)}, {C(S(KC_TAB)), C(KC_TAB)}}}; #endif -#ifdef POINTING_DEVICE_DRIVER_pimoroni_trackball -uint8_t red = 255, green = 0, blue = 0; - -void trackball_hue(void) { - if (red != 255 && green != 255 && blue != 255) - red = 255; - if (red == 255 && green < 255 && !blue) - green += 15; - else if (green == 255 && !blue && red) - red -= 15; - else if (!red && blue < 255 && green == 255) - blue += 15; - else if (blue == 255 && green && !red) - green -= 15; - else if (!green && blue == 255 && red < 255) - red += 15; - else if (!green && blue && red == 255) - blue -= 15; - pimoroni_trackball_set_rgbw(red, green, blue, 0); -} -#endif - #ifdef POINTING_DEVICE_ENABLE static bool scrolling = false; layer_state_t layer_state_set_user(layer_state_t state) { diff --git a/waffle/waffle.h b/waffle/waffle.h index 0f763a3..5694ca3 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -1,4 +1,4 @@ -// Copyright 2024 jack (@waffle87) +// Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include QMK_KEYBOARD_H @@ -69,31 +69,22 @@ enum unicode_mode { #define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4) #define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RGUI_T(k3), RALT_T(k4) +// clang-format off #define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P -#define ___BASE2___ \ - HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN) -#define ___BASE3___ \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH +#define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN) +#define ___BASE3___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH #define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, RSEPST, PNP #define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 -#define ___LOWER2___ \ - HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, \ - HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN) -#define ___LOWER3___ \ - KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ - KC_VOLU +#define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN) +#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU #define ___LOWER4___ _______, _______, _______, _______, _______, _______ -#define ___RAISE1___ \ - RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, \ - KC_BLOCKS, KC_REGIONAL, QK_MAKE -#define ___RAISE2___ \ - CK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, \ - KC_SUPER, QK_BOOT -#define ___RAISE3___ \ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 +#define ___RAISE1___ RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE +#define ___RAISE2___ CK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT +#define ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 #define ___RAISE4___ _______, _______, _______, _______, _______, _______ +// clang-format on #define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__) #define LAYOUT_stack_of_waffles(...) LAYOUT_stack(__VA_ARGS__) |