From fb405c27ad07313f5d564c02bf03130d9aaf59c7 Mon Sep 17 00:00:00 2001 From: stanrc85 <47038504+stanrc85@users.noreply.github.com> Date: Thu, 1 Jul 2021 04:06:06 -0400 Subject: [PATCH] [Keymap] RGB Timeout added to userspace (#13339) --- .../wanderland/keymaps/stanrc85/keymap.c | 36 ----------- users/stanrc85/rgb_timeout.c | 62 +++++++++++++++++++ users/stanrc85/rules.mk | 6 ++ 3 files changed, 68 insertions(+), 36 deletions(-) create mode 100644 users/stanrc85/rgb_timeout.c diff --git a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c index a2f65ae5ee..cd11c427ba 100644 --- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c +++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c @@ -83,39 +83,3 @@ void oled_task_user(void) { oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); } #endif - -// Backlight timeout feature -#define BACKLIGHT_TIMEOUT 20 // in minutes -static uint16_t idle_timer = 0; -static uint8_t halfmin_counter = 0; -static bool led_on = true; -static bool rgb_on = true; - -void matrix_scan_user(void) { - // idle_timer needs to be set one time - if (idle_timer == 0) idle_timer = timer_read(); - if ( (led_on && timer_elapsed(idle_timer) > 30000) || (rgb_on && timer_elapsed(idle_timer) > 30000)) { - halfmin_counter++; - idle_timer = timer_read(); - } - - if ( (led_on && halfmin_counter >= BACKLIGHT_TIMEOUT * 2) || (rgb_on && halfmin_counter >= BACKLIGHT_TIMEOUT * 2)) { - rgblight_disable_noeeprom(); - led_on = false; - rgb_on = false; - halfmin_counter = 0; - } -}; - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - if (record->event.pressed) { - if (led_on == false || rgb_on == false ) { - rgblight_enable_noeeprom(); - led_on = true; - rgb_on = true; - } - idle_timer = timer_read(); - halfmin_counter = 0; - } - return true; -} diff --git a/users/stanrc85/rgb_timeout.c b/users/stanrc85/rgb_timeout.c new file mode 100644 index 0000000000..4aa2427816 --- /dev/null +++ b/users/stanrc85/rgb_timeout.c @@ -0,0 +1,62 @@ +/* +Copyright 2021 Stanrc85 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#include "stanrc85.h" + +// Backlight timeout feature +// Modified from https://www.reddit.com/r/MechanicalKeyboards/comments/ix65z0/looking_for_qmk_led_idle_timeout_info/g64yov7/ +#define BACKLIGHT_TIMEOUT 10 // in minutes +static uint16_t idle_timer = 0; +static uint8_t halfmin_counter = 0; +static bool led_on = true; +static bool rgb_on = true; +static bool rgb_was_on = false; + +void matrix_scan_user(void) { + // idle_timer needs to be set one time + if (idle_timer == 0) idle_timer = timer_read(); + if ( (led_on && timer_elapsed(idle_timer) > 30000) || (rgb_on && timer_elapsed(idle_timer) > 30000)) { + halfmin_counter++; + idle_timer = timer_read(); + } + + if ( (led_on && halfmin_counter >= BACKLIGHT_TIMEOUT * 2) || (rgb_on && halfmin_counter >= BACKLIGHT_TIMEOUT * 2)) { + if(rgblight_is_enabled()) { + rgb_was_on = true; + rgblight_disable_noeeprom(); + led_on = false; + rgb_on = false; + } else { + rgb_was_on = false; + } + halfmin_counter = 0; + } +}; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + if (led_on == false || rgb_on == false ) { + if (rgb_was_on) { + rgblight_enable_noeeprom(); + led_on = true; + rgb_on = true; + } + } + idle_timer = timer_read(); + halfmin_counter = 0; + } + return true; +} diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk index 805a2929f9..45929575c3 100644 --- a/users/stanrc85/rules.mk +++ b/users/stanrc85/rules.mk @@ -36,3 +36,9 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65) RGB_MATRIX_ENABLE = yes RGBLIGHT_ENABLE = no endif +ifeq ($(strip $(KEYBOARD)), tkc/portico) + SRC += rgb_timeout.c +endif +ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland) + SRC += rgb_timeout.c +endif