diff options
Diffstat (limited to 'keymaps')
-rw-r--r-- | keymaps/crkbd/config.h | 6 | ||||
-rw-r--r-- | keymaps/crkbd/keymap.c | 21 | ||||
-rw-r--r-- | keymaps/microdox/config.h | 8 | ||||
-rw-r--r-- | keymaps/microdox/keymap.c | 40 | ||||
-rw-r--r-- | keymaps/microdox/readme.md | 6 | ||||
-rw-r--r-- | keymaps/microdox/rules.mk | 1 | ||||
-rw-r--r-- | keymaps/the_q/keymap.c | 20 |
7 files changed, 16 insertions, 86 deletions
diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h index 7ca4fe5..db15b46 100644 --- a/keymaps/crkbd/config.h +++ b/keymaps/crkbd/config.h @@ -8,12 +8,6 @@ #define CRC8_OPTIMIZE_SPEED #define SERIAL_USART_SPEED 921600 -#ifdef OLED_ENABLE -#define LAYER_ANIM -#define BONGO_CAT -#define FELIX_DOG -#endif - #ifdef RGB_MATRIX_ENABLE #undef WS2812_DI_PIN #define WS2812_DI_PIN B5 diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index dcbe585..2269e90 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on void housekeeping_task_keymap(void) { - if (last_input_activity_elapsed() > 15000) { + if (last_input_activity_elapsed() > 300000) { const pin_t row_pins[] = MATRIX_ROW_PINS, col_pins[] = MATRIX_COL_PINS; for (uint8_t i = 0; i < ARRAY_SIZE(col_pins); ++i) { setPinOutput(col_pins[i]); @@ -93,22 +93,13 @@ bool oled_task_keymap(void) { if (is_keyboard_master()) layer_anim(); else { - oled_set_cursor(0, 0); - render_wpm(); + layer_status(); oled_set_cursor(0, 3); - felix(); + felix_dog(); oled_set_cursor(0, 7); - render_keyboard(); - oled_set_cursor(0, 9); - layer_status(); - oled_set_cursor(0, 11); - mod_status(get_mods()); - oled_set_cursor(0, 13); - keylock_status(host_keyboard_led_state()); - oled_set_cursor(1, 15); - render_keylogger(); - oled_set_cursor(0, 15); - keylogger_status(); + render_wpm(); + render_keylog(); + render_mod_status(); } return false; } diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h deleted file mode 100644 index f088833..0000000 --- a/keymaps/microdox/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef OLED_ENABLE -#define BONGO_CAT -#define LAYER_ANIM -#endif diff --git a/keymaps/microdox/keymap.c b/keymaps/microdox/keymap.c deleted file mode 100644 index adf5ddd..0000000 --- a/keymaps/microdox/keymap.c +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle_3x5( - ___BASE1___, - ___BASE2___, - ___BASE3___, - ___BASE4___ - ), - [_LOWER] = LAYOUT_waffle_3x5( - ___LOWER1___, - ___LOWER2___, - ___LOWER3___, - ___LOWER4___ - ), - [_RAISE] = LAYOUT_waffle_3x5( - ___RAISE1___, - ___RAISE2___, - ___RAISE3___, - ___RAISE4___ - ) -}; -// clang-format on - -#ifdef OLED_ENABLE -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return is_keyboard_master() ? 0 : 2; -} - -bool oled_task_keymap(void) { - if (is_keyboard_master()) - layer_anim(); - else - render_wpm(); - return false; -} -#endif diff --git a/keymaps/microdox/readme.md b/keymaps/microdox/readme.md deleted file mode 100644 index 0291124..0000000 --- a/keymaps/microdox/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -### rp2040 microdox v2 - - -* microcontrollers: [sparkfun rp2040 pro micro](https://www.sparkfun.com/products/18288) - -only complaint is the added height from the buttons, qwiic connector, & usb-c port, but still seems to work with [low profile sockets](https://www.digikey.com/product-detail/en/mill-max-manufacturing-corp/315-43-164-41-003000/ED4764-64-ND/1212143). diff --git a/keymaps/microdox/rules.mk b/keymaps/microdox/rules.mk deleted file mode 100644 index cbfafcd..0000000 --- a/keymaps/microdox/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = promicro_rp2040 diff --git a/keymaps/the_q/keymap.c b/keymaps/the_q/keymap.c index 91eaf38..da7dfb4 100644 --- a/keymaps/the_q/keymap.c +++ b/keymaps/the_q/keymap.c @@ -1,6 +1,5 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "lib/oled.h" #include "waffle.h" // clang-format off @@ -26,18 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -#ifdef RGB_MATRIX_ENABLE -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - for (uint8_t i = led_min; i <= led_max; i++) - if (g_led_config.flags[i] & LED_FLAG_UNDERGLOW) - rgb_matrix_set_color(i, RGB_OFF); - return false; +#ifdef OLED_ENABLE +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + return OLED_ROTATION_270; } -#endif // RGB_MATRIX_ENABLE -#ifdef OLED_ENABLE bool oled_task_keymap(void) { - render_layer_state(); + layer_status(); + oled_set_cursor(0, 3); + felix_dog(); + oled_set_cursor(0, 7); + render_wpm(); + render_keylog(); + render_mod_status(); return false; } #endif // OLED_ENABLE |