From d3008110096db2ac098db9b5cb47ad77582c01d9 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Mon, 3 Apr 2023 05:24:04 +0700
Subject: [PATCH] Add user horrortroll in userspace (#19769)
---
keyboards/gopolar/gg86/gg86.c | 63 +++-
.../gopolar/gg86/keymaps/bongocat/keymap.c | 111 +------
.../gopolar/gg86/keymaps/bongocat/readme.md | 2 -
.../gopolar/gg86/keymaps/default/keymap.c | 111 +------
.../gopolar/gg86/keymaps/horrortroll/config.h | 52 ---
.../gopolar/gg86/keymaps/horrortroll/keymap.c | 5 +-
.../gg86/keymaps/horrortroll/keymap_stuff.h | 305 ------------------
.../keymaps/horrortroll/led/cool_diagonal.c | 22 --
.../keymaps/horrortroll/led/custom_gradient.c | 74 -----
.../led/flower_blooming/flower_blooming.h | 20 --
.../gg86/keymaps/horrortroll/led/kitt.c | 68 ----
.../rainbow_reactive_simple.h | 45 ---
.../horrortroll/led/random_breath_rainbow.c | 55 ----
.../gg86/keymaps/horrortroll/readme.md | 12 -
.../keymaps/horrortroll/rgb_matrix_user.inc | 17 -
.../gopolar/gg86/keymaps/horrortroll/rules.mk | 3 -
keyboards/gopolar/gg86/keymaps/via/keymap.c | 111 +------
.../pila87/keymaps/default/keymap.c | 26 +-
.../pila87/keymaps/horrortroll/config.h | 26 --
.../pila87/keymaps/horrortroll/keymap.c | 33 +-
.../led/flower_blooming/flower_blooming.c | 27 --
.../pila87/keymaps/horrortroll/led/kitt.c | 68 ----
.../pila87/keymaps/horrortroll/readme.md | 9 -
.../pila87/keymaps/horrortroll/rules.mk | 3 -
.../phage_studio/pila87/keymaps/via/keymap.c | 26 +-
keyboards/phage_studio/pila87/pila87.c | 31 +-
users/horrortroll/config.h | 64 ++++
.../horrortroll/horrortroll.c | 77 +----
users/horrortroll/horrortroll.h | 49 +++
.../horrortroll/led/cool_diagonal.c | 0
.../horrortroll/led/custom_gradient.c | 0
.../led/flower_blooming/flower_blooming.c | 0
.../led/flower_blooming/flower_blooming.h | 0
.../horrortroll/led/random_breath_rainbow.c | 0
.../horrortroll/readme.md | 15 +-
.../horrortroll/rgb_matrix_user.inc | 2 -
users/horrortroll/rules.mk | 6 +
37 files changed, 258 insertions(+), 1280 deletions(-)
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/config.h
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/cool_diagonal.c
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.h
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/kitt.c
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/readme.md
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/rgb_matrix_user.inc
delete mode 100644 keyboards/gopolar/gg86/keymaps/horrortroll/rules.mk
delete mode 100644 keyboards/phage_studio/pila87/keymaps/horrortroll/config.h
delete mode 100644 keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.c
delete mode 100644 keyboards/phage_studio/pila87/keymaps/horrortroll/led/kitt.c
delete mode 100644 keyboards/phage_studio/pila87/keymaps/horrortroll/readme.md
delete mode 100644 keyboards/phage_studio/pila87/keymaps/horrortroll/rules.mk
create mode 100644 users/horrortroll/config.h
rename keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h => users/horrortroll/horrortroll.c (69%)
create mode 100644 users/horrortroll/horrortroll.h
rename {keyboards/phage_studio/pila87/keymaps => users}/horrortroll/led/cool_diagonal.c (100%)
rename {keyboards/phage_studio/pila87/keymaps => users}/horrortroll/led/custom_gradient.c (100%)
rename {keyboards/gopolar/gg86/keymaps => users}/horrortroll/led/flower_blooming/flower_blooming.c (100%)
rename {keyboards/phage_studio/pila87/keymaps => users}/horrortroll/led/flower_blooming/flower_blooming.h (100%)
rename {keyboards/phage_studio/pila87/keymaps => users}/horrortroll/led/random_breath_rainbow.c (100%)
rename keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c => users/horrortroll/readme.md (55%)
rename {keyboards/phage_studio/pila87/keymaps => users}/horrortroll/rgb_matrix_user.inc (89%)
create mode 100644 users/horrortroll/rules.mk
diff --git a/keyboards/gopolar/gg86/gg86.c b/keyboards/gopolar/gg86/gg86.c
index 3e790cd61e..814ee5ec3e 100644
--- a/keyboards/gopolar/gg86/gg86.c
+++ b/keyboards/gopolar/gg86/gg86.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Gopolar
+/* Copyright 2023 Gopolar
*
* 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
@@ -20,6 +20,11 @@
#include "lib/logo.h"
#ifdef RGB_MATRIX_ENABLE
+
+#include <string.h>
+#include <math.h>
+#include <lib/lib8tion/lib8tion.h>
+
led_config_t g_led_config = { {
{ 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, NO_LED, 74, 73, 72 },
{ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71 },
@@ -50,6 +55,62 @@ led_config_t g_led_config = { {
// Underglow (88 -> 99)
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
} };
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case RGB_TOG:
+ if (record->event.pressed) {
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL: {
+ rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+ rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ case (LED_FLAG_UNDERGLOW): {
+ rgb_matrix_set_flags(LED_FLAG_NONE);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ default: {
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ rgb_matrix_enable_noeeprom();
+ }
+ break;
+ }
+ }
+ return false;
+ }
+ return process_record_user(keycode, record);
+}
+
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
+
+ HSV hsv = rgb_matrix_config.hsv;
+ uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+ hsv.h = time;
+ RGB rgb = hsv_to_rgb(hsv);
+
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
+ } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+ rgb_matrix_set_color(25, 0, 0, 0);
+ }
+
+ if (host_keyboard_led_state().scroll_lock) {
+ rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
+ } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+ rgb_matrix_set_color(73, 0, 0, 0);
+ }
+ return true;
+}
#endif
#ifdef OLED_ENABLE
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
index 454d346f18..e0c17f868a 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -19,11 +19,6 @@
// OLED animation
#include "oled/bongocat.h"
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -34,22 +29,6 @@ enum layer_names {
_FN,
};
-enum user_rgb_mode {
- RGB_MODE_ALL,
- RGB_MODE_KEYLIGHT,
- RGB_MODE_UNDERGLOW,
- RGB_MODE_NONE,
-};
-
-typedef union {
- uint32_t raw;
- struct {
- uint8_t rgb_mode :8;
- };
-} user_config_t;
-
-user_config_t user_config;
-
// enum layer_keycodes { };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -121,94 +100,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-void keyboard_post_init_user(void) {
- user_config.raw = eeconfig_read_user();
- switch (user_config.rgb_mode) {
- case RGB_MODE_ALL:
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- break;
- case RGB_MODE_KEYLIGHT:
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_UNDERGLOW:
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_NONE:
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_KEYLIGHT;
- }
- break;
- case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_UNDERGLOW;
- }
- break;
- case (LED_FLAG_UNDERGLOW): {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_NONE;
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- user_config.rgb_mode = RGB_MODE_ALL;
- }
- break;
- }
- eeconfig_update_user(user_config.raw);
- }
- return false;
- }
-
- return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
- HSV hsv = rgb_matrix_config.hsv;
- uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
- hsv.h = time;
- RGB rgb = hsv_to_rgb(hsv);
-
- if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- }
- } else {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(25, 0, 0, 0);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(73, 0, 0, 0);
- }
- }
- return false;
-}
-
#ifdef OLED_ENABLE
bool oled_task_user(void) {
led_t led_usb_state = host_keyboard_led_state();
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/readme.md b/keyboards/gopolar/gg86/keymaps/bongocat/readme.md
index 632f9c67e2..9e02220c4c 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/readme.md
+++ b/keyboards/gopolar/gg86/keymaps/bongocat/readme.md
@@ -1,3 +1 @@
# Keymap with VIA and Bongo Cat on OLED
-
-Keymap is default 87 qwerty, with TKL 7u-spacebar layout
diff --git a/keyboards/gopolar/gg86/keymaps/default/keymap.c b/keyboards/gopolar/gg86/keymaps/default/keymap.c
index 1d043a95d8..e192d46a80 100644
--- a/keyboards/gopolar/gg86/keymaps/default/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Gopolar
+/* Copyright 2023 Gopolar
*
* 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
@@ -19,11 +19,6 @@
// OLED animation
#include "lib/wave.h"
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -31,22 +26,6 @@
// enum layer_names { };
-enum user_rgb_mode {
- RGB_MODE_ALL,
- RGB_MODE_KEYLIGHT,
- RGB_MODE_UNDERGLOW,
- RGB_MODE_NONE,
-};
-
-typedef union {
- uint32_t raw;
- struct {
- uint8_t rgb_mode :8;
- };
-} user_config_t;
-
-user_config_t user_config;
-
// enum layer_keycodes { };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -170,94 +149,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-void keyboard_post_init_user(void) {
- user_config.raw = eeconfig_read_user();
- switch (user_config.rgb_mode) {
- case RGB_MODE_ALL:
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- break;
- case RGB_MODE_KEYLIGHT:
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_UNDERGLOW:
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_NONE:
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_KEYLIGHT;
- }
- break;
- case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_UNDERGLOW;
- }
- break;
- case (LED_FLAG_UNDERGLOW): {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_NONE;
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- user_config.rgb_mode = RGB_MODE_ALL;
- }
- break;
- }
- eeconfig_update_user(user_config.raw);
- }
- return false;
- }
-
- return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
- HSV hsv = rgb_matrix_config.hsv;
- uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
- hsv.h = time;
- RGB rgb = hsv_to_rgb(hsv);
-
- if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- }
- } else {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(25, 0, 0, 0);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(73, 0, 0, 0);
- }
- }
- return false;
-}
-
#ifdef OLED_ENABLE
static void render_layer_info(void) {
switch (get_highest_layer(layer_state)) {
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/config.h b/keyboards/gopolar/gg86/keymaps/horrortroll/config.h
deleted file mode 100644
index 246f36bb94..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-#define NO_ACTION_ONESHOT
-
-#ifdef RGB_MATRIX_ENABLE
- /* RGB Matrix effect */
- #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
- #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
- #undef ENABLE_RGB_MATRIX_BAND_SAT
- #undef ENABLE_RGB_MATRIX_BAND_VAL
- #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
- #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
- #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
- #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
- #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
- #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
- #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
- #undef ENABLE_RGB_MATRIX_DUAL_BEACON
- #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
- #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
- #undef ENABLE_RGB_MATRIX_RAINDROPS
- #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
- #undef ENABLE_RGB_MATRIX_HUE_WAVE
- #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
- #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
- #undef ENABLE_RGB_MATRIX_SPLASH
- #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
- #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
index 65d473639d..fc725ad3f0 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -16,7 +16,8 @@
#include QMK_KEYBOARD_H
-#include "keymap_stuff.h"
+#include "horrortroll.h"
+#include "oled/oled_stuff.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
deleted file mode 100644
index 9003cd5e6b..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#include "oled/oled_stuff.h"
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum layer_names {
- _BASE,
- _FN,
-};
-
-// For CUSTOM_GRADIENT
-HSV gradient_0 = {205, 250, 255};
-HSV gradient_100 = {140, 215, 125};
-bool reflected_gradient = false;
-uint8_t gp_i = 0;
-
-typedef struct {
- HSV gradient_0;
- HSV gradient_1;
- bool reflected;
-} CUSTOM_PRESETS;
-
-enum user_rgb_mode {
- RGB_MODE_ALL,
- RGB_MODE_KEYLIGHT,
- RGB_MODE_UNDERGLOW,
- RGB_MODE_NONE,
-};
-
-typedef union {
- uint32_t raw;
- struct {
- uint8_t rgb_mode :8;
- };
-} user_config_t;
-
-user_config_t user_config;
-
-enum layer_keycodes {
- //Custom Gradient control keycode
- G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
- G1_HUD, //Custom gradient color 1 hue decrease
- G1_SAI, //Custom gradient color 1 saturation increase
- G1_SAD, //Custom gradient color 1 saturation decrease
- G1_VAI, //Custom gradient color 1 value increase
- G1_VAD, //Custom gradient color 1 value decrease
- G2_HUI, //Custom gradient color 2 hue increase
- G2_HUD, //Custom gradient color 2 hue decrease
- G2_SAI, //Custom gradient color 2 saturation increase
- G2_SAD, //Custom gradient color 2 saturation decrease
- G2_VAI, //Custom gradient color 2 value increase
- G2_VAD, //Custom gradient color 2 value decrease
- G_PRE, //Gradient presets
- REF_G, //Toggle between linear and reflected gradient
- G_FLIP, //Flip the gradient colors
-
- //Custom led effect keycode
- RGB_C_E, //Cycle user effect
-};
-
-void keyboard_post_init_user(void) {
- user_config.raw = eeconfig_read_user();
- switch (user_config.rgb_mode) {
- case RGB_MODE_ALL:
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- break;
- case RGB_MODE_KEYLIGHT:
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_UNDERGLOW:
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_NONE:
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- process_record_user_oled(keycode, record);
-
- uint8_t color_adj_step = 5;
-
- CUSTOM_PRESETS gradient_presets[] = {
- {{41 , 255, 255}, {233, 245, 255}, false },
- {{45 , 245, 155}, {160, 255, 80}, false },
- {{173, 245, 40}, {41 , 255, 205}, true },
- {{32 , 255, 165}, {217, 185, 70}, false },
- {{240, 255, 145}, {115, 255, 245}, true },
- {{118, 255, 255}, {242, 255, 255}, false },
- {{212, 0 , 0}, {223, 235, 165}, true },
- {{205, 250, 255}, {140, 215, 125}, false },
- };
-
- uint8_t gp_length = ARRAY_SIZE(gradient_presets);
-
- switch (keycode) {
- case G1_HUI:
- if (record->event.pressed) {
- gradient_0.h += color_adj_step;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G1_HUD:
- if (record->event.pressed) {
- gradient_0.h -= color_adj_step;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G1_SAI:
- if (record->event.pressed) {
- gradient_0.s = (gradient_0.s + color_adj_step * 2 <= 255) ? gradient_0.s + color_adj_step * 2 : 255;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G1_SAD:
- if (record->event.pressed) {
- gradient_0.s = (gradient_0.s - color_adj_step * 2 >= 0) ? gradient_0.s - color_adj_step * 2 : 0;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G1_VAI:
- if (record->event.pressed) {
- gradient_0.v = (gradient_0.v + color_adj_step * 2 <= 255) ? gradient_0.v + color_adj_step * 2 : 255;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G1_VAD:
- if (record->event.pressed) {
- gradient_0.v = (gradient_0.v - color_adj_step * 2 >= 0) ? gradient_0.v - color_adj_step * 2 : 0;
- dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
- }
- return false;
- case G2_HUI:
- if (record->event.pressed) {
- gradient_100.h += color_adj_step;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G2_HUD:
- if (record->event.pressed) {
- gradient_100.h -= color_adj_step;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G2_SAI:
- if (record->event.pressed) {
- gradient_100.s = (gradient_100.s + color_adj_step * 2 <= 255) ? gradient_100.s + color_adj_step * 2 : 255;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G2_SAD:
- if (record->event.pressed) {
- gradient_100.s = (gradient_100.s - color_adj_step * 2 >= 0) ? gradient_100.s - color_adj_step * 2 : 0;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G2_VAI:
- if (record->event.pressed) {
- gradient_100.v = (gradient_100.v + color_adj_step * 2 <= 255) ? gradient_100.v + color_adj_step * 2 : 255;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G2_VAD:
- if (record->event.pressed) {
- gradient_100.v = (gradient_100.v - color_adj_step * 2 >= 0) ? gradient_100.v - color_adj_step * 2 : 0;
- dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
- }
- return false;
- case G_PRE:
- if (record->event.pressed) {
- gp_i = (gp_i + gp_length ) % gp_length;
-
- gradient_0 = gradient_presets[gp_i].gradient_0;
- gradient_100 = gradient_presets[gp_i].gradient_1;
- reflected_gradient = gradient_presets[gp_i].reflected;
-
- gp_i += 1;
- }
- return false;
- case REF_G:
- if (record->event.pressed) {
- reflected_gradient = !reflected_gradient;
- }
- return false;
- case G_FLIP:
- if (record->event.pressed) {
- HSV temp_color = gradient_0;
- gradient_0 = gradient_100;
- gradient_100 = temp_color;
- }
- return false;
- case RGB_C_E:
- if (record->event.pressed) {
- switch (rgb_matrix_get_mode()) {
- case RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_COOL_DIAGONAL);
- return false;
- case RGB_MATRIX_CUSTOM_COOL_DIAGONAL:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_FLOWER_BLOOMING);
- return false;
- case RGB_MATRIX_CUSTOM_FLOWER_BLOOMING:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_RAINBOW_REACTIVE_SIMPLE);
- return false;
- case RGB_MATRIX_CUSTOM_RAINBOW_REACTIVE_SIMPLE:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_KITT);
- return false;
- case RGB_MATRIX_CUSTOM_KITT:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_RANDOM_BREATH_RAINBOW);
- return false;
- default:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT);
- return false;
- }
- }
- return false;
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_KEYLIGHT;
- }
- break;
- case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_UNDERGLOW;
- }
- break;
- case (LED_FLAG_UNDERGLOW): {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_NONE;
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- user_config.rgb_mode = RGB_MODE_ALL;
- }
- break;
- }
- eeconfig_update_user(user_config.raw);
- }
- return false;
- }
-
- return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
- HSV hsv = rgb_matrix_config.hsv;
- uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
- hsv.h = time;
- RGB rgb = hsv_to_rgb(hsv);
-
- if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- }
- } else {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(25, 0, 0, 0);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(73, 0, 0, 0);
- }
- }
- return false;
-}
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/cool_diagonal.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/cool_diagonal.c
deleted file mode 100644
index 2c518a5431..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/cool_diagonal.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-static HSV COOL_DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
- hsv.h = (g_led_config.point[i].x / 4) - g_led_config.point[i].y - time;
- return hsv;
-}
-
-bool COOL_DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &COOL_DIAGONAL_math); }
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
deleted file mode 100644
index 951884b456..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-extern HSV gradient_0;
-extern HSV gradient_100;
-extern bool reflected_gradient;
-
-static HSV INTERPOLATE_HSV(float step, HSV gradient_0, HSV gradient_100) {
- uint8_t cw, ccw;
- HSV color;
-
- cw = (gradient_0.h >= gradient_100.h) ? 255 + gradient_100.h - gradient_0.h : gradient_100.h - gradient_0.h; // Hue range is 0 to 255.
- ccw = (gradient_0.h >= gradient_100.h) ? gradient_0.h - gradient_100.h : 255 + gradient_0.h - gradient_100.h;
-
- if( cw < ccw ) { // going clockwise
- color.h = gradient_0.h + (uint8_t)(step * cw);
- } else { // Going counter clockwise
- color.h = gradient_0.h - (uint8_t)(step * ccw);
- }
-
- color.s = gradient_0.s + step * (gradient_100.s - gradient_0.s);
-
- // Scale V with global RGB Matrix's V, so users can still control overall brightness with RGB_VAI & RGB_VAD0
- color.v = round((gradient_0.v + step * (gradient_100.v - gradient_0.v)) * ((float)rgb_matrix_config.hsv.v / 255));
-
- return color;
-}
-
-static HSV CUSTOM_GRADIENT_math(uint8_t led_x, uint8_t min_x, uint8_t max_x) {
- float step = (float)led_x / (max_x - min_x);
- float mid_gradient_pos = 0.5;
-
- if( reflected_gradient ) {
- if( step <= mid_gradient_pos ) {
- return INTERPOLATE_HSV(step * (1/mid_gradient_pos), gradient_0, gradient_100);
- } else {
- return INTERPOLATE_HSV((step - mid_gradient_pos) * (1/(1-mid_gradient_pos)), gradient_100, gradient_0);
- }
-
- } else {
- return INTERPOLATE_HSV(step, gradient_0, gradient_100);
- }
-}
-
-static bool CUSTOM_GRADIENT(effect_params_t* params) {
- RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
- uint8_t min_x = 0; // X coordinate of the left-most LED
- uint8_t max_x = 224; // X coordinate of the right-most LED
-
- for (uint8_t i = led_min; i < led_max; i++) {
- RGB_MATRIX_TEST_LED_FLAGS();
-
- HSV hsv_orig = CUSTOM_GRADIENT_math(g_led_config.point[i].x, min_x, max_x);
- RGB rgb = hsv_to_rgb(hsv_orig);
-
- rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
- }
-
- return led_max < RGB_MATRIX_LED_COUNT;
-}
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.h b/keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.h
deleted file mode 100644
index 941dab975a..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-typedef HSV (*flower_blooming_f)(HSV hsv, uint8_t i, uint8_t time);
-
-bool effect_runner_bloom(effect_params_t* params, flower_blooming_f effect_func) {
- RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
- uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 10, 1));
- for (uint8_t i = led_min; i < led_max; i++) {
- RGB_MATRIX_TEST_LED_FLAGS();
- if (g_led_config.point[i].y > k_rgb_matrix_center.y) {
- RGB bgr = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
- rgb_matrix_set_color(i, bgr.b, bgr.g, bgr.r);
- } else {
- RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
- rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
- }
- }
- return rgb_matrix_check_finished_leds(led_max);
-}
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/kitt.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/kitt.c
deleted file mode 100644
index bfc32ce040..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/kitt.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-// variable for startup animation
-bool BASE_EFFECT_NOT_STARTED_YET = true;
-uint8_t base_effect_startup_counter = 255;
-
-uint8_t led_count = 11;
-uint8_t led_first = 41;
-
-static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
- uint16_t led_time = led_count * time;
- uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
- uint8_t led;
-
- if (step < led_count) {
- led = step;
- } else {
- led = led_count - 1 - (step - led_count);
- }
-
- return led;
-}
-
-static HSV KITT_math(HSV hsv, uint8_t i, uint8_t time) {
-
- // reset base effect startup
- if (i == 0) {
- BASE_EFFECT_NOT_STARTED_YET = true;
- }
-
- hsv.h = 0;
- hsv.s = 255;
-
- if (i >= led_first && i < led_first + led_count) {
- uint8_t j = i - led_first;
- if (j == time_to_led(time, 0)) {
- hsv.v = hsv.v;
- } else if (j == time_to_led(time, 1)) {
- hsv.v = hsv.v/2;
- } else if (j == time_to_led(time, 2)) {
- hsv.v = hsv.v/4;
- } else if (j == time_to_led(time, 3)) {
- hsv.v = hsv.v/8;
- } else {
- hsv.v = 0;
- }
- } else {
- hsv.v = 0;
- }
-
- return hsv;
-}
-
-bool KITT(effect_params_t* params) { return effect_runner_i(params, &KITT_math); }
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h b/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
deleted file mode 100644
index 9fff344664..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-typedef HSV (*rainbow_reactive_f)(HSV hsv, uint8_t i, uint8_t time, uint16_t offset);
-
-bool effect_rainbow_reactive(effect_params_t* params, rainbow_reactive_f effect_func) {
- RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
- uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
- uint16_t max_tick = 65535 / rgb_matrix_config.speed;
-
- for (uint8_t i = led_min; i < led_max; i++) {
- RGB_MATRIX_TEST_LED_FLAGS();
- uint16_t tick = max_tick;
-
- // Reverse search to find most recent key hit
- for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
- if (g_last_hit_tracker.index[j] == i && g_last_hit_tracker.tick[j] < tick) {
- tick = g_last_hit_tracker.tick[j];
- break;
- }
- }
-
- uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
- RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time, offset));
- rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
- }
-
- return led_max < RGB_MATRIX_LED_COUNT;
-}
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
deleted file mode 100644
index b5ffef665f..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-static uint8_t offset[RGB_MATRIX_LED_COUNT];
-
-static void doRandom_breath_rainbow(int i, effect_params_t* params) {
- if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
- uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 6);
-
- if (rand() * 50 == 1) {
- if (rand() * 2 == 1) {
- offset[i]++;
- }
- else {
- offset[i]--;
- }
- }
-
- //float val = (((float)sin8(time + offset[i]) / 256)/2.1) + .05;
- HSV hsv = {0, 255, 255};
- hsv.h = scale16by8(g_rgb_timer + offset[i], rgb_matrix_config.speed / 4) + (offset[i]*2);
- hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
- RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
- rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-}
-
-bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
-
- if (!params->init) {
- // Change one LED every tick, make sure speed is not 0
- doRandom_breath_rainbow(rand() % RGB_MATRIX_LED_COUNT, params);
- return false;
- }
-
- RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
- for (uint8_t i = led_min; i < led_max; i++) {
- doRandom_breath_rainbow(i, params);
- }
-
- return led_max < RGB_MATRIX_LED_COUNT;
-}
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/readme.md b/keyboards/gopolar/gg86/keymaps/horrortroll/readme.md
deleted file mode 100644
index 363330e98f..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# My personal keymap with VIA and custom LED / OLED
-
-Keymap is default 87 qwerty, with TKL 7u-spacebar layout
-
-It have new LED effect:
-
-- Custom gradient (ported from SirTimmyTimbit code [https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt])
-- Cool diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
-- Flower Blooming
-- Rainbow reactive simple
-- Knight Rider (ported from jumper149 code [https://github.com/jumper149/qmk_firmware/blob/jumper149/keyboards/dztech/dz65rgb/keymaps/jumper149/])
-- Random breath rainbow (based from daed code [https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed] and modify by me)
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/rgb_matrix_user.inc b/keyboards/gopolar/gg86/keymaps/horrortroll/rgb_matrix_user.inc
deleted file mode 100644
index 7a31991027..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/rgb_matrix_user.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-RGB_MATRIX_EFFECT(CUSTOM_GRADIENT)
-RGB_MATRIX_EFFECT(COOL_DIAGONAL)
-RGB_MATRIX_EFFECT(FLOWER_BLOOMING)
-RGB_MATRIX_EFFECT(RAINBOW_REACTIVE_SIMPLE)
-RGB_MATRIX_EFFECT(KITT)
-RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-#include "led/custom_gradient.c"
-#include "led/cool_diagonal.c"
-#include "led/flower_blooming/flower_blooming.c"
-#include "led/rainbow_reactive_simple/rainbow_reactive_simple.c"
-#include "led/kitt.c"
-#include "led/random_breath_rainbow.c"
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/rules.mk b/keyboards/gopolar/gg86/keymaps/horrortroll/rules.mk
deleted file mode 100644
index d475530c87..0000000000
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/gopolar/gg86/keymaps/via/keymap.c b/keyboards/gopolar/gg86/keymaps/via/keymap.c
index 1d043a95d8..e192d46a80 100644
--- a/keyboards/gopolar/gg86/keymaps/via/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Gopolar
+/* Copyright 2023 Gopolar
*
* 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
@@ -19,11 +19,6 @@
// OLED animation
#include "lib/wave.h"
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -31,22 +26,6 @@
// enum layer_names { };
-enum user_rgb_mode {
- RGB_MODE_ALL,
- RGB_MODE_KEYLIGHT,
- RGB_MODE_UNDERGLOW,
- RGB_MODE_NONE,
-};
-
-typedef union {
- uint32_t raw;
- struct {
- uint8_t rgb_mode :8;
- };
-} user_config_t;
-
-user_config_t user_config;
-
// enum layer_keycodes { };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -170,94 +149,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-void keyboard_post_init_user(void) {
- user_config.raw = eeconfig_read_user();
- switch (user_config.rgb_mode) {
- case RGB_MODE_ALL:
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- break;
- case RGB_MODE_KEYLIGHT:
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_UNDERGLOW:
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- case RGB_MODE_NONE:
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- break;
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_KEYLIGHT;
- }
- break;
- case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
- rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_UNDERGLOW;
- }
- break;
- case (LED_FLAG_UNDERGLOW): {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- user_config.rgb_mode = RGB_MODE_NONE;
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- user_config.rgb_mode = RGB_MODE_ALL;
- }
- break;
- }
- eeconfig_update_user(user_config.raw);
- }
- return false;
- }
-
- return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
- HSV hsv = rgb_matrix_config.hsv;
- uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
- hsv.h = time;
- RGB rgb = hsv_to_rgb(hsv);
-
- if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- }
- } else {
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(25, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(25, 0, 0, 0);
- }
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(73, rgb.r, rgb.g, rgb.b);
- } else {
- rgb_matrix_set_color(73, 0, 0, 0);
- }
- }
- return false;
-}
-
#ifdef OLED_ENABLE
static void render_layer_info(void) {
switch (get_highest_layer(layer_state)) {
diff --git a/keyboards/phage_studio/pila87/keymaps/default/keymap.c b/keyboards/phage_studio/pila87/keymaps/default/keymap.c
index f2de085ca6..10f01dbae5 100644
--- a/keyboards/phage_studio/pila87/keymaps/default/keymap.c
+++ b/keyboards/phage_studio/pila87/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
-/* Copyright 2022 Phage Studio
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 Phage Studio
+ * Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -151,25 +151,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- }
- break;
- }
- }
- return false;
- }
- return true;
-}
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/config.h b/keyboards/phage_studio/pila87/keymaps/horrortroll/config.h
deleted file mode 100644
index 04ddd591a5..0000000000
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Forcing to use NKRO instead 6KRO */
-#define FORCE_NKRO
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
-#ifdef RGB_MATRIX_ENABLE
- #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
-#endif
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap.c b/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap.c
index 5528e28055..28de8ad449 100644
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap.c
+++ b/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap.c
@@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H
-#include "keymap_stuff.h"
+#include "horrortroll.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
@@ -86,3 +86,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI
),
};
+
+#ifdef RGB_MATRIX_ENABLE
+
+#include <string.h>
+#include <math.h>
+#include <lib/lib8tion/lib8tion.h>
+
+bool rgb_matrix_indicators_user(void) {
+ HSV hsv = rgb_matrix_config.hsv;
+ uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+ hsv.h = time;
+ RGB rgb = hsv_to_rgb(hsv);
+
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
+ } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+ rgb_matrix_set_color(40, 0, 0, 0);
+ }
+
+ if (host_keyboard_led_state().scroll_lock) {
+ rgb_matrix_set_color(89, rgb.r, rgb.g, rgb.b);
+ } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+ rgb_matrix_set_color(89, 0, 0, 0);
+ }
+ return false;
+}
+#endif
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.c b/keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.c
deleted file mode 100644
index add83149cc..0000000000
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#include "led/flower_blooming/flower_blooming.h"
-
-static HSV FLOWER_BLOOMING_math(HSV hsv, uint8_t i, uint8_t time) {
- if (g_led_config.point[i].y > k_rgb_matrix_center.y)
- hsv.h = g_led_config.point[i].x * 3 - g_led_config.point[i].y * 3 + time;
- else
- hsv.h = g_led_config.point[i].x * 3 - g_led_config.point[i].y * 3 - time;
- return hsv;
-}
-
-bool FLOWER_BLOOMING(effect_params_t* params) { return effect_runner_bloom(params, &FLOWER_BLOOMING_math); }
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/kitt.c b/keyboards/phage_studio/pila87/keymaps/horrortroll/led/kitt.c
deleted file mode 100644
index 432eb117f2..0000000000
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/kitt.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-// variable for startup animation
-bool BASE_EFFECT_NOT_STARTED_YET = true;
-uint8_t base_effect_startup_counter = 255;
-
-uint8_t led_count = 11;
-uint8_t led_first = 29;
-
-static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
- uint16_t led_time = led_count * time;
- uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
- uint8_t led;
-
- if (step < led_count) {
- led = step;
- } else {
- led = led_count - 1 - (step - led_count);
- }
-
- return led;
-}
-
-static HSV KITT_math(HSV hsv, uint8_t i, uint8_t time) {
-
- // reset base effect startup
- if (i == 0) {
- BASE_EFFECT_NOT_STARTED_YET = true;
- }
-
- hsv.h = 0;
- hsv.s = 255;
-
- if (i >= led_first && i < led_first + led_count) {
- uint8_t j = i - led_first;
- if (j == time_to_led(time, 0)) {
- hsv.v = hsv.v;
- } else if (j == time_to_led(time, 1)) {
- hsv.v = hsv.v/2;
- } else if (j == time_to_led(time, 2)) {
- hsv.v = hsv.v/4;
- } else if (j == time_to_led(time, 3)) {
- hsv.v = hsv.v/8;
- } else {
- hsv.v = 0;
- }
- } else {
- hsv.v = 0;
- }
-
- return hsv;
-}
-
-bool KITT(effect_params_t* params) { return effect_runner_i(params, &KITT_math); }
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/readme.md b/keyboards/phage_studio/pila87/keymaps/horrortroll/readme.md
deleted file mode 100644
index 8e0d1974fa..0000000000
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# My personal keymap with VIA and custom LED
-
-### Custom LED effect list:
-
-- Custom gradient ([ported from SirTimmyTimbit code](https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt))
-- Cool diagonal ([ported from pleasuretek code](https://github.com/pleasuretek/qmk_firmware))
-- Flower Blooming
-- Knight Rider ([ported from jumper149 code](https://github.com/jumper149/qmk_firmware/blob/jumper149/keyboards/dztech/dz65rgb/keymaps/jumper149/))
-- Random breath rainbow ([based from daed code](https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed) and modify by me)
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/rules.mk b/keyboards/phage_studio/pila87/keymaps/horrortroll/rules.mk
deleted file mode 100644
index d475530c87..0000000000
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/phage_studio/pila87/keymaps/via/keymap.c b/keyboards/phage_studio/pila87/keymaps/via/keymap.c
index f2de085ca6..10f01dbae5 100644
--- a/keyboards/phage_studio/pila87/keymaps/via/keymap.c
+++ b/keyboards/phage_studio/pila87/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
-/* Copyright 2022 Phage Studio
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 Phage Studio
+ * Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -151,25 +151,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- }
- break;
- }
- }
- return false;
- }
- return true;
-}
diff --git a/keyboards/phage_studio/pila87/pila87.c b/keyboards/phage_studio/pila87/pila87.c
index c379be228e..23304c03bb 100644
--- a/keyboards/phage_studio/pila87/pila87.c
+++ b/keyboards/phage_studio/pila87/pila87.c
@@ -1,5 +1,5 @@
-/* Copyright 2022 Phage Studio
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 Phage Studio
+ * Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -17,11 +17,12 @@
#include "pila87.h"
+#ifdef RGB_MATRIX_ENABLE
+
#include <string.h>
#include <math.h>
#include <lib/lib8tion/lib8tion.h>
-#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
{ 75, NO_LED, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90 },
{ 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58 },
@@ -44,7 +45,28 @@ led_config_t g_led_config = { {
4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4,
} };
-#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case RGB_TOG:
+ if (record->event.pressed) {
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL: {
+ rgb_matrix_set_flags(LED_FLAG_NONE);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ default: {
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ rgb_matrix_enable_noeeprom();
+ }
+ break;
+ }
+ }
+ return false;
+ }
+ return process_record_user(keycode, record);
+}
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
@@ -63,3 +85,4 @@ bool rgb_matrix_indicators_kb(void) {
}
return true;
}
+#endif
diff --git a/users/horrortroll/config.h b/users/horrortroll/config.h
new file mode 100644
index 0000000000..50bc7da537
--- /dev/null
+++ b/users/horrortroll/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+#if defined(__arm__)
+ #ifdef RGB_MATRIX_ENABLE
+ #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+ #endif
+#endif
+
+#if defined(__AVR_ATmega32U4__)
+ #define NO_ACTION_ONESHOT
+
+ #ifdef RGB_MATRIX_ENABLE
+ /* RGB Matrix effect */
+ #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+ #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+ #undef ENABLE_RGB_MATRIX_BAND_SAT
+ #undef ENABLE_RGB_MATRIX_BAND_VAL
+ #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+ #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+ #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+ #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+ #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+ #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+ #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+ #undef ENABLE_RGB_MATRIX_DUAL_BEACON
+ #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+ #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+ #undef ENABLE_RGB_MATRIX_RAINDROPS
+ #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+ #undef ENABLE_RGB_MATRIX_HUE_WAVE
+ #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+ #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+ #undef ENABLE_RGB_MATRIX_SPLASH
+ #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+ #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+ #endif
+#endif
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h b/users/horrortroll/horrortroll.c
similarity index 69%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h
rename to users/horrortroll/horrortroll.c
index e850ccfc2e..1152b2cc9d 100644
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h
+++ b/users/horrortroll/horrortroll.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -14,19 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <string.h>
-#include <math.h>
-#include <lib/lib8tion/lib8tion.h>
+#include "horrortroll.h"
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum layer_names {
- _BASE,
- _FN,
-};
+#include "rgb_matrix.h"
// For CUSTOM_GRADIENT
HSV gradient_0 = {205, 250, 255};
@@ -40,28 +30,6 @@ typedef struct {
bool reflected;
} CUSTOM_PRESETS;
-enum layer_keycodes {
- //Custom Gradient control keycode
- G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
- G1_HUD, //Custom gradient color 1 hue decrease
- G1_SAI, //Custom gradient color 1 saturation increase
- G1_SAD, //Custom gradient color 1 saturation decrease
- G1_VAI, //Custom gradient color 1 value increase
- G1_VAD, //Custom gradient color 1 value decrease
- G2_HUI, //Custom gradient color 2 hue increase
- G2_HUD, //Custom gradient color 2 hue decrease
- G2_SAI, //Custom gradient color 2 saturation increase
- G2_SAD, //Custom gradient color 2 saturation decrease
- G2_VAI, //Custom gradient color 2 value increase
- G2_VAD, //Custom gradient color 2 value decrease
- G_PRE, //Gradient presets
- REF_G, //Toggle between linear and reflected gradient
- G_FLIP, //Flip the gradient colors
-
- //Custom led effect keycode
- RGB_C_E, //Cycle user effect
-};
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
uint8_t color_adj_step = 5;
@@ -184,9 +152,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
rgb_matrix_mode(RGB_MATRIX_CUSTOM_FLOWER_BLOOMING);
return false;
case RGB_MATRIX_CUSTOM_FLOWER_BLOOMING:
- rgb_matrix_mode(RGB_MATRIX_CUSTOM_KITT);
- return false;
- case RGB_MATRIX_CUSTOM_KITT:
rgb_matrix_mode(RGB_MATRIX_CUSTOM_RANDOM_BREATH_RAINBOW);
return false;
default:
@@ -195,42 +160,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
return false;
- case RGB_TOG:
- if (record->event.pressed) {
- switch (rgb_matrix_get_flags()) {
- case LED_FLAG_ALL: {
- rgb_matrix_set_flags(LED_FLAG_NONE);
- rgb_matrix_set_color_all(0, 0, 0);
- }
- break;
- default: {
- rgb_matrix_set_flags(LED_FLAG_ALL);
- rgb_matrix_enable_noeeprom();
- }
- break;
- }
- }
- return false;
}
return true;
}
-
-bool rgb_matrix_indicators_user(void) {
- HSV hsv = rgb_matrix_config.hsv;
- uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
- hsv.h = time;
- RGB rgb = hsv_to_rgb(hsv);
-
- if (host_keyboard_led_state().caps_lock) {
- rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
- } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
- rgb_matrix_set_color(40, 0, 0, 0);
- }
-
- if (host_keyboard_led_state().scroll_lock) {
- rgb_matrix_set_color(89, rgb.r, rgb.g, rgb.b);
- } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
- rgb_matrix_set_color(89, 0, 0, 0);
- }
- return false;
-}
diff --git a/users/horrortroll/horrortroll.h b/users/horrortroll/horrortroll.h
new file mode 100644
index 0000000000..a251f74d6c
--- /dev/null
+++ b/users/horrortroll/horrortroll.h
@@ -0,0 +1,49 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+ _BASE,
+ _FN,
+};
+
+enum custom_keycodes {
+ //Custom Gradient control keycode
+ G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
+ G1_HUD, //Custom gradient color 1 hue decrease
+ G1_SAI, //Custom gradient color 1 saturation increase
+ G1_SAD, //Custom gradient color 1 saturation decrease
+ G1_VAI, //Custom gradient color 1 value increase
+ G1_VAD, //Custom gradient color 1 value decrease
+ G2_HUI, //Custom gradient color 2 hue increase
+ G2_HUD, //Custom gradient color 2 hue decrease
+ G2_SAI, //Custom gradient color 2 saturation increase
+ G2_SAD, //Custom gradient color 2 saturation decrease
+ G2_VAI, //Custom gradient color 2 value increase
+ G2_VAD, //Custom gradient color 2 value decrease
+ G_PRE, //Gradient presets
+ REF_G, //Toggle between linear and reflected gradient
+ G_FLIP, //Flip the gradient colors
+
+ //Custom led effect keycode
+ RGB_C_E, //Cycle user effect
+};
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/cool_diagonal.c b/users/horrortroll/led/cool_diagonal.c
similarity index 100%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/led/cool_diagonal.c
rename to users/horrortroll/led/cool_diagonal.c
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/custom_gradient.c b/users/horrortroll/led/custom_gradient.c
similarity index 100%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/led/custom_gradient.c
rename to users/horrortroll/led/custom_gradient.c
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.c b/users/horrortroll/led/flower_blooming/flower_blooming.c
similarity index 100%
rename from keyboards/gopolar/gg86/keymaps/horrortroll/led/flower_blooming/flower_blooming.c
rename to users/horrortroll/led/flower_blooming/flower_blooming.c
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.h b/users/horrortroll/led/flower_blooming/flower_blooming.h
similarity index 100%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/led/flower_blooming/flower_blooming.h
rename to users/horrortroll/led/flower_blooming/flower_blooming.h
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/led/random_breath_rainbow.c b/users/horrortroll/led/random_breath_rainbow.c
similarity index 100%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/led/random_breath_rainbow.c
rename to users/horrortroll/led/random_breath_rainbow.c
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c b/users/horrortroll/readme.md
similarity index 55%
rename from keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c
rename to users/horrortroll/readme.md
index ce3fff8ec5..420c9b0986 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c
+++ b/users/horrortroll/readme.md
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
*
* 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
@@ -14,12 +14,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "led/rainbow_reactive_simple/rainbow_reactive_simple.h"
+# My personal keymap with custom LED
-static HSV RAINBOW_REACTIVE_SIMPLE_math(HSV hsv, uint8_t i, uint8_t time, uint16_t offset) {
- hsv.h = g_led_config.point[i].x - time;
- hsv.v = scale8(255 - offset, hsv.v);
- return hsv;
-}
+### Custom LED effect list:
-bool RAINBOW_REACTIVE_SIMPLE(effect_params_t* params) { return effect_rainbow_reactive(params, &RAINBOW_REACTIVE_SIMPLE_math); }
\ No newline at end of file
+- Custom gradient ([ported from SirTimmyTimbit code](https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt))
+- Cool diagonal ([ported from pleasuretek code](https://github.com/pleasuretek/qmk_firmware))
+- Flower Blooming
+- Random breath rainbow ([based from daed code](https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed) and modify by me)
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/rgb_matrix_user.inc b/users/horrortroll/rgb_matrix_user.inc
similarity index 89%
rename from keyboards/phage_studio/pila87/keymaps/horrortroll/rgb_matrix_user.inc
rename to users/horrortroll/rgb_matrix_user.inc
index 1e09e3f0c1..08c608dc44 100644
--- a/keyboards/phage_studio/pila87/keymaps/horrortroll/rgb_matrix_user.inc
+++ b/users/horrortroll/rgb_matrix_user.inc
@@ -1,7 +1,6 @@
RGB_MATRIX_EFFECT(CUSTOM_GRADIENT)
RGB_MATRIX_EFFECT(COOL_DIAGONAL)
RGB_MATRIX_EFFECT(FLOWER_BLOOMING)
-RGB_MATRIX_EFFECT(KITT)
RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
@@ -9,7 +8,6 @@ RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
#include "led/custom_gradient.c"
#include "led/cool_diagonal.c"
#include "led/flower_blooming/flower_blooming.c"
-#include "led/kitt.c"
#include "led/random_breath_rainbow.c"
#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/users/horrortroll/rules.mk b/users/horrortroll/rules.mk
new file mode 100644
index 0000000000..579f5fd38b
--- /dev/null
+++ b/users/horrortroll/rules.mk
@@ -0,0 +1,6 @@
+VIA_ENABLE = yes
+RGB_MATRIX_CUSTOM_USER = yes
+
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+ SRC += $(USER_PATH)/horrortroll.c
+endif