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

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

@ -14,50 +14,51 @@
* 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) #if defined(RGB_MATRIX_EFFECT)
# undef RGB_MATRIX_EFFECT # undef RGB_MATRIX_EFFECT
#endif // defined(RGB_MATRIX_EFFECT) #endif // defined(RGB_MATRIX_EFFECT)
#define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x, #define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
enum { enum {
RGB_MATRIX_EFFECT_NONE, RGB_MATRIX_EFFECT_NONE,
#include "rgb_matrix_effects.inc" #include "rgb_matrix_effects.inc"
#ifdef RGB_MATRIX_CUSTOM_KB #ifdef RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_kb.inc" # include "rgb_matrix_kb.inc"
#endif // RGB_MATRIX_CUSTOM_KB #endif // RGB_MATRIX_CUSTOM_KB
#ifdef RGB_MATRIX_CUSTOM_USER #ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
#endif // RGB_MATRIX_CUSTOM_USER #endif // RGB_MATRIX_CUSTOM_USER
#undef RGB_MATRIX_EFFECT #undef RGB_MATRIX_EFFECT
}; };
#define RGB_MATRIX_EFFECT(x) \ #define RGB_MATRIX_EFFECT(x) \
case RGB_MATRIX_EFFECT_##x: \ case RGB_MATRIX_EFFECT_##x: \
return #x; return #x;
const char *rgb_matrix_name(uint8_t effect) { const char *rgb_matrix_name(uint8_t effect) {
switch (effect) { switch (effect) {
case RGB_MATRIX_EFFECT_NONE: case RGB_MATRIX_EFFECT_NONE:
return "NONE"; return "NONE";
#include "rgb_matrix_effects.inc" #include "rgb_matrix_effects.inc"
#ifdef RGB_MATRIX_CUSTOM_KB #ifdef RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_kb.inc" # include "rgb_matrix_kb.inc"
#endif // RGB_MATRIX_CUSTOM_KB #endif // RGB_MATRIX_CUSTOM_KB
#ifdef RGB_MATRIX_CUSTOM_USER #ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
#endif // RGB_MATRIX_CUSTOM_USER #endif // RGB_MATRIX_CUSTOM_USER
#undef RGB_MATRIX_EFFECT #undef RGB_MATRIX_EFFECT
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }
} }
static uint8_t effect_name_len = 0; static uint8_t effect_name_len = 0;
const char *rgb_matrix_get_effect_name(void) { const char *rgb_matrix_get_effect_name(void) {
static char buf[32] = {0}; static char buf[32] = {0};
snprintf(buf, sizeof(buf), "%s", rgb_matrix_name(rgb_matrix_get_mode())); snprintf(buf, sizeof(buf), "%s", rgb_matrix_name(rgb_matrix_get_mode()));
@ -73,7 +74,7 @@
buf[i] = tolower(buf[i]); 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; }
@ -83,7 +84,7 @@ bool oled_task_kb(void) {
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) {
@ -116,10 +117,8 @@ bool oled_task_kb(void) {
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;