Custom oled fonts cleanup (#25665)

11 files changed, 2 insertions, 248 deletions

diff --git a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c b/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
deleted file mode 100644
index c3c79d76ee..0000000000
--- a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2019 MechMerlin
-// Copyright 2020 @ben_roe (keycapsss.com)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "progmem.h"
-
-// Corne 8x6 font
-// Online editor: https://helixfonteditor.netlify.com
-// or https://joric.github.io/qle/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-const unsigned char font[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x00, 0x13, 0x07, 0x08, 0x00, 0x00,
-    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
-    0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-    0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-    0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-    0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-    0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-    0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-    0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-    0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-    0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-    0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-    0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-    0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-    0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-    0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-    0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-    0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-    0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-    0x1F, 0x1F, 0x0E, 0x1B, 0x11, 0xC0,
-    0x1F, 0x1F, 0x00, 0x1F, 0x1F, 0x06,
-    0x0C, 0xC6, 0x1F, 0x1F, 0x80, 0x5F,
-    0x1F, 0x00, 0x1F, 0x1F, 0x8E, 0x9B,
-    0x91, 0x80, 0x9F, 0x9F, 0x91, 0x1F,
-    0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-    0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-    0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-    0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-    0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-    0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-    0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-    0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-    0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-    0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-    0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-    0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-    0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-    0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-    0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-    0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-    0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-    0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-    0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-    0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-    0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-    0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-    0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-    0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-    0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-    0x00, 0x84, 0x87, 0x7D, 0x55, 0x57,
-    0x55, 0x7D, 0x87, 0x84, 0x00, 0x91,
-    0x95, 0x55, 0x55, 0x3F, 0x55, 0x55,
-    0x95, 0x91, 0x00, 0x08, 0x08, 0x08,
-    0x88, 0xFC, 0x0A, 0x09, 0x08, 0x08,
-    0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-    0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-    0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-    0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-    0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-    0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-    0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-    0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-    0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-    0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-    0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-    0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-    0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-    0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-    0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-    0x03, 0x02, 0x01, 0x01, 0x00, 0x00,
-};
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev1/keymaps/default/config.h
index 8be15d964a..fc6f93bec0 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/config.h
@@ -17,10 +17,6 @@
 
 #pragma once
 
-#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c"
-// #define OLED_FONT_WIDTH 5
-// #define OLED_FONT_HEIGHT 7
-
 #ifdef RGBLIGHT_ENABLE
 #   define RGBLIGHT_HUE_STEP 8
 #   define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev1/keymaps/default/keymap.c
index c61fdfc03a..c61fdfc03a 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/keymap.c
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/rev1/keymaps/default/rules.mk
index ef4f0c0b43..16cecbdbc6 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
+++ b/keyboards/keycapsss/kimiko/rev1/keymaps/default/rules.mk
@@ -1,4 +1,3 @@
-OLED_ENABLE = yes
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 
diff --git a/keyboards/keycapsss/kimiko/post_config.h b/keyboards/keycapsss/kimiko/rev2/config.h
index 31be5898cf..c728510c30 100644
--- a/keyboards/keycapsss/kimiko/post_config.h
+++ b/keyboards/keycapsss/kimiko/rev2/config.h
@@ -18,8 +18,4 @@
 
 #pragma once
 
-// OLED definitions
-#ifndef OLED_FONT_H
-#   define OLED_FONT_H "keyboards/keycapsss/kimiko/glcdfont.c"
-#endif
-
+#define OLED_FONT_H "keyboards/keycapsss/kimiko/rev2/glcdfont.c"
diff --git a/keyboards/keycapsss/kimiko/glcdfont.c b/keyboards/keycapsss/kimiko/rev2/glcdfont.c
index ff2f3bdcd5..ff2f3bdcd5 100644
--- a/keyboards/keycapsss/kimiko/glcdfont.c
+++ b/keyboards/keycapsss/kimiko/rev2/glcdfont.c
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/config.h
index ddb539fb09..74597b4253 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/config.h
@@ -17,4 +17,4 @@
 #pragma once
 
 // place overrides here
-#define OLED_FONT_H "keyboards/keycapsss/plaid_pad/keymaps/oled/glcdfont.c"
+#define OLED_FONT_H "keyboards/keycapsss/plaid_pad/rev3/lib/glcdfont.c"
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/keymap.c
index 3b28233ab7..3b28233ab7 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/keymap.c
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/readme.md b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/readme.md
index 0e2493266d..0e2493266d 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/readme.md
+++ b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/readme.md
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/rules.mk
index 33bd0c3611..33bd0c3611 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rev3/keymaps/oled/rules.mk
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/glcdfont.c b/keyboards/keycapsss/plaid_pad/rev3/lib/glcdfont.c
index 9fef5067f4..9fef5067f4 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/glcdfont.c
+++ b/keyboards/keycapsss/plaid_pad/rev3/lib/glcdfont.c