indicate scroll snap mode in OLED

"SCR" in OLED will be changed to "SCH", or "SCV", when scroll snap mode is enabled.
Yowkees · Apr 15, 2024 · 753f0e3 · 753f0e3
1 parent 9fd0fb0
commit 753f0e3
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 7 deletions.
diff --git a/qmk_firmware/keyboards/keyball/keyball39/config.h b/qmk_firmware/keyboards/keyball/keyball39/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"
 #    define OLED_FONT_START 32
-#    define OLED_FONT_END 195
+#    define OLED_FONT_END 197
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)

diff --git a/qmk_firmware/keyboards/keyball/keyball44/config.h b/qmk_firmware/keyboards/keyball/keyball44/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"
 #    define OLED_FONT_START 32
-#    define OLED_FONT_END 195
+#    define OLED_FONT_END 197
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)

diff --git a/qmk_firmware/keyboards/keyball/keyball46/config.h b/qmk_firmware/keyboards/keyball/keyball46/config.h
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"
 #    define OLED_FONT_START 32
-#    define OLED_FONT_END 195
+#    define OLED_FONT_END 197
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)

diff --git a/qmk_firmware/keyboards/keyball/keyball61/config.h b/qmk_firmware/keyboards/keyball/keyball61/config.h
@@ -66,7 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"
 #    define OLED_FONT_START 32
-#    define OLED_FONT_END 195
+#    define OLED_FONT_END 197
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)

diff --git a/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c b/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c
@@ -412,7 +412,23 @@ void keyball_oled_render_ballinfo(void) {
     oled_write_P(PSTR("00 "), false);
 
     // indicate scroll mode: on/off
+    // and scroll snap mode: "SCR", "SCV", "SCH"
+#if KEYBALL_SCROLLSNAP_ENABLE == 2
+    oled_write_char('\xBE', false);
+    switch (keyball.scrollsnap_mode) {
+        case KEYBALL_SCROLLSNAP_MODE_VERTICAL:
+            oled_write_char('\xC4', false);
+            break;
+        case KEYBALL_SCROLLSNAP_MODE_HORIZONTAL:
+            oled_write_char('\xC5', false);
+            break;
+        case KEYBALL_SCROLLSNAP_MODE_FREE:
+            oled_write_char('\xBF', false);
+            break;
+    }
+#else
     oled_write_P(PSTR("\xBE\xBF"), false);
+#endif
     if (keyball.scroll_mode) {
         oled_write_P(LFSTR_ON, false);
     } else {

diff --git a/qmk_firmware/keyboards/keyball/lib/logofont/font.md b/qmk_firmware/keyboards/keyball/lib/logofont/font.md
@@ -158,6 +158,32 @@
 00000000
 ```
 
+### "CV" in 1 char, combined with a leading of "SCR"
+
+To indicate scroll snap mode is vertical.
+
+```
+00100001
+00000000
+00001111
+00110000
+00001111
+00000000
+```
+
+### "CH" in 1 char, combined with a leading of "SCR"
+
+To indicate scroll snap mode is horizontal.
+
+```
+00100001
+00000000
+00111111
+00000100
+00111111
+00000000
+```
+
 ## "DIV" in 2 chars
 
 ```

diff --git a/qmk_firmware/keyboards/keyball/lib/logofont/logofont.c b/qmk_firmware/keyboards/keyball/lib/logofont/logofont.c
@@ -193,8 +193,9 @@ const unsigned char font[] PROGMEM = {
   // 0xC0
   0x3F, 0x21, 0x1E, 0x00, 0x21, 0x3F, // C0, C1:
   0x21, 0x00, 0x0F, 0x30, 0x0F, 0x00, //   "DIV" in 2 chars indicate "divider"
-  0x3E, 0x09, 0x3E, 0x00, 0x3F, 0x06, // C2, D3:
+  0x3E, 0x09, 0x3E, 0x00, 0x3F, 0x06, // C2, C3:
   0x3F, 0x00, 0x3F, 0x20, 0x20, 0x00, //   "AML" in 2 chars
-
+  0x21, 0x00, 0x0F, 0x30, 0x0F, 0x00, // C4: A trail half of "SCV".
+  0x21, 0x00, 0x3F, 0x04, 0x3F, 0x00, // C5: A trail half of "SCH".
 };
 // clang-format on
diff --git a/qmk_firmware/keyboards/keyball/one47/config.h b/qmk_firmware/keyboards/keyball/one47/config.h
@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"
 #    define OLED_FONT_START 32
-#    define OLED_FONT_END 195
+#    define OLED_FONT_END 197
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)