gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-17 21:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve oled_task_kb based on review

Browse Source 
Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
mawaeg 2025-03-09 20:17:28 +01:00
parent ad2eb9aa21
commit b1c22b2107
1 changed files with 105 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
keyboards/mawaeg/sharkropad/sharkropad.c
View File

@ -14,113 +14,112 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "quantum.h" #include "quantum.h"
#include <ctype.h> #include <ctype.h>
#include <rgb_matrix.h> #include <lib/lib8tion/lib8tion.h>
#include <rgb_matrix.h>
#if defined(RGB_MATRIX_EFFECT)
# undef RGB_MATRIX_EFFECT #if defined(RGB_MATRIX_EFFECT)
#endif // defined(RGB_MATRIX_EFFECT) # undef RGB_MATRIX_EFFECT
#endif // defined(RGB_MATRIX_EFFECT)
#define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
enum { #define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
RGB_MATRIX_EFFECT_NONE, enum {
#include "rgb_matrix_effects.inc" RGB_MATRIX_EFFECT_NONE,
#ifdef RGB_MATRIX_CUSTOM_KB #include "rgb_matrix_effects.inc"
# include "rgb_matrix_kb.inc" #ifdef RGB_MATRIX_CUSTOM_KB
#endif // RGB_MATRIX_CUSTOM_KB # include "rgb_matrix_kb.inc"
#ifdef RGB_MATRIX_CUSTOM_USER #endif // RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_user.inc" #ifdef RGB_MATRIX_CUSTOM_USER
#endif // RGB_MATRIX_CUSTOM_USER # include "rgb_matrix_user.inc"
#undef RGB_MATRIX_EFFECT #endif // RGB_MATRIX_CUSTOM_USER
}; #undef RGB_MATRIX_EFFECT
};
#define RGB_MATRIX_EFFECT(x) \
case RGB_MATRIX_EFFECT_##x: \ #define RGB_MATRIX_EFFECT(x) \
return #x; case RGB_MATRIX_EFFECT_##x: \
const char *rgb_matrix_name(uint8_t effect) { return #x;
switch (effect) { const char *rgb_matrix_name(uint8_t effect) {
case RGB_MATRIX_EFFECT_NONE: switch (effect) {
return "NONE"; case RGB_MATRIX_EFFECT_NONE:
#include "rgb_matrix_effects.inc" return "NONE";
#ifdef RGB_MATRIX_CUSTOM_KB #include "rgb_matrix_effects.inc"
# include "rgb_matrix_kb.inc" #ifdef RGB_MATRIX_CUSTOM_KB
#endif // RGB_MATRIX_CUSTOM_KB # include "rgb_matrix_kb.inc"
#ifdef RGB_MATRIX_CUSTOM_USER #endif // RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_user.inc" #ifdef RGB_MATRIX_CUSTOM_USER
#endif // RGB_MATRIX_CUSTOM_USER # include "rgb_matrix_user.inc"
#undef RGB_MATRIX_EFFECT #endif // RGB_MATRIX_CUSTOM_USER
default: #undef RGB_MATRIX_EFFECT
return "UNKNOWN"; default:
} return "UNKNOWN";
} }
}
static uint8_t effect_name_len = 0;
static uint8_t effect_name_len = 0;
const char *rgb_matrix_get_effect_name(void) {
static char buf[32] = {0}; const char *rgb_matrix_get_effect_name(void) {
static char buf[32] = {0};
snprintf(buf, sizeof(buf), "%s", rgb_matrix_name(rgb_matrix_get_mode()));
for (uint8_t i = 1; i < sizeof(buf); ++i) { snprintf(buf, sizeof(buf), "%s", rgb_matrix_name(rgb_matrix_get_mode()));
if (buf[i] == 0) { for (uint8_t i = 1; i < sizeof(buf); ++i) {
effect_name_len = i; if (buf[i] == 0) {
break; effect_name_len = i;
} else if (buf[i] == '_') break;
buf[i] = ' '; } else if (buf[i] == '_')
else if (buf[i - 1] == ' ') buf[i] = ' ';
buf[i] = toupper(buf[i]); else if (buf[i - 1] == ' ')
else if (buf[i - 1] != ' ') buf[i] = toupper(buf[i]);
buf[i] = tolower(buf[i]); else if (buf[i - 1] != ' ')
} buf[i] = tolower(buf[i]);
return buf; }
} return buf;
}
bool oled_task_kb(void) { bool oled_task_kb(void) {
if (!oled_task_user()) { return false; } if (!oled_task_user()) { return false; }
static uint8_t last_effect = 0; static uint8_t last_effect = 0;
static uint8_t last_speed = 0; static uint8_t last_speed = 0;
static uint16_t key_timer = 0; static uint16_t key_timer = 0;
static uint8_t start_index = 0; static uint8_t start_index = 0;
uint8_t speedPercentage = (uint8_t)(((float)rgb_matrix_get_speed() / 255.0) * 100.0); uint8_t speedPercentage = scale8(rgb_matrix_get_speed(), 100);
bool is_timer_elapsed = timer_elapsed(key_timer) > 200; bool is_timer_elapsed = timer_elapsed(key_timer) > 200;
if (last_effect != rgb_matrix_get_mode() || last_speed != speedPercentage || is_timer_elapsed) { if (last_effect != rgb_matrix_get_mode() || last_speed != speedPercentage || is_timer_elapsed) {
last_effect = rgb_matrix_get_mode(); last_effect = rgb_matrix_get_mode();
last_speed = speedPercentage; last_speed = speedPercentage;
oled_write_ln_P(PSTR("Mode: "), false); oled_write_ln_P(PSTR("Mode: "), false);
const char *name = rgb_matrix_get_effect_name(); const char *name = rgb_matrix_get_effect_name();
if (effect_name_len > 21) { if (effect_name_len > 21) {
if (!is_timer_elapsed && start_index != 0) { if (!is_timer_elapsed && start_index != 0) {
start_index -= 1; start_index -= 1;
} else { } else {
key_timer = timer_read(); key_timer = timer_read();
} }
if (start_index > effect_name_len) { if (start_index > effect_name_len) {
start_index = 0; start_index = 0;
} }
for (uint8_t char_index = 0; char_index < 21; char_index++) { for (uint8_t char_index = 0; char_index < 21; char_index++) {
if ((start_index + char_index) % effect_name_len == 0 && char_index != 0) { if ((start_index + char_index) % effect_name_len == 0 && char_index != 0) {
oled_write_char(' ', false); oled_write_char(' ', false);
} else { } else {
oled_write_char(name[(start_index + char_index) % (effect_name_len + 1)], false); oled_write_char(name[(start_index + char_index) % (effect_name_len + 1)], false);
} }
} }
start_index += 1; start_index += 1;
} else { } else {
oled_write_ln(name, false); oled_write_ln(name, false);
start_index = 0; start_index = 0;
} }
oled_set_cursor(0, 2); oled_set_cursor(0, 2);
oled_write_ln_P(PSTR("RGB Speed: "), false); oled_write_ln_P(PSTR("RGB Speed: "), false);
char speedBuffer[4]; oled_write(get_u8_str(speedPercentage, ' '), false);
sprintf(speedBuffer, "%d", speedPercentage); oled_write("%", false);
oled_write(speedBuffer, false); }
oled_write("% ", false);
} return true;
return true;
} }