qmk_me

commit 9fd39337e1c4ce006cafbf576b40479ef4831f69
parent 7976a931a0f1a65b54a34b74c5387b27e4d0ce86
Author: jack <0x6A73@pm.me>
Date:   Sat, 29 Jul 2023 18:08:33 -0600

fixup some keyboards & unicode

Diffstat:
M
keymaps/ferris/config.h
 | 
2
+-
M
keymaps/kyria/config.h
 | 
1
+
M
keymaps/microdox/config.h
 | 
1
-
M
waffle/oled.c
 | 
7
+++----
M
waffle/tapping.c
 | 
3
++-

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h
@@ -1,7 +1,7 @@
 // Copyright 2022 jack (@waffle87)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-#define RGB_DI_PIN B0
+#define WS2812_DI_PIN B0
 #define RGB_MATRIX_LED_COUNT 34
 #define RGB_MATRIX_SPLIT {17,17}
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h
@@ -12,6 +12,7 @@
 #define CRC8_USE_TABLE
 #define CRC8_OPTIMIZE_SPEED
 #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_TIMEOUT 600000
 #define ENABLE_RGB_MATRIX_BAND_SAT
 #define ENABLE_RGB_MATRIX_RAINDROPS
 #define I2C1_CLOCK_SPEED 1000000
diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h
@@ -1,7 +1,6 @@
 // Copyright 2022 jack (@waffle87)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-#define RGBLED_NUM RGB_MATRIX_LED_COUNT
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
diff --git a/waffle/oled.c b/waffle/oled.c
@@ -170,11 +170,10 @@ void bongo(void) {
 
 #ifdef WPM_GRAPH
 void wpm_graph(void) {
-  float max_wpm = 160;
-  static uint8_t height = OLED_DISPLAY_HEIGHT - 1, vert_count = 0;
+  static uint8_t height = OLED_DISPLAY_HEIGHT - 1, vert_count = 0, max_wpm = 160;
   static uint16_t graph_timer = 0;
   if (timer_elapsed(graph_timer) > 100) {
-    height = 63 - ((get_current_wpm() / max_wpm) * 63);
+    height = 63 - ((get_current_wpm() / (float)max_wpm) * 63);
     for (uint8_t i = 0; i <= 1; i++)
       oled_write_pixel(3, height + i, true);
     if (vert_count == 3) {
@@ -185,7 +184,7 @@ void wpm_graph(void) {
       }
     } else {
       for (uint8_t i = 63; i > height; i--)
-        if (i % 3 == 0)
+        if (!(i % 3))
           oled_write_pixel(3, i, true);
       vert_count++;
     }
diff --git a/waffle/tapping.c b/waffle/tapping.c
@@ -115,7 +115,8 @@ tap_dance_action_t tap_dance_actions[] = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef UNICODE_COMMON_ENABLE
-  process_record_unicode(keycode, record);
+  if (!process_record_unicode(keycode, record))
+    return false;
 #endif
 #ifdef OLED_ENABLE
   if (record->event.pressed) {