add new fonts containing all the keymaps

alinelena · Jun 3, 2024 · 21d7cf8 · 21d7cf8
1 parent 8b41458
commit 21d7cf8
Show file tree

Hide file tree

Showing 30 changed files with 13,705 additions and 55 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -90,6 +90,7 @@ jobs:
       run: |
         git config --global --add safe.directory '*'
         python3 -m pip install -r requirements-dev.txt
+        python3 -m pip install fontTools
         make git-submodule
         #if [ -d keyboards/${{ matrix.keyboard}}/keymaps/${{ matrix.keymap }} ]; then
           qmk compile -kb ${{ matrix.keyboard}} -km ${{ matrix.keymap }}

diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json
@@ -1,13 +1,12 @@
 {
-    "keyboard_name": "m60",
+    "keyboard_name": "mlego/m60 rev1",
     "manufacturer": "alin elena",
     "url": "https://gitlab.com/m-lego/m60",
     "maintainer": "alin elena",
     "diode_direction": "COL2ROW",
     "usb": {
         "pid": "0x6161",
-        "vid": "0xBABA",
-        "device_version": "0.0.1"
+        "vid": "0xBABA"
     },
     "features": {
         "bootmagic": true,
@@ -25,34 +24,6 @@
             "resync": true
         }
     },
-    "matrix_pins": {
-        "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"],
-        "rows": ["A6", "A7", "B0", "B1", "B10"]
-    },
-    "manufacturer": "alin elena",
-    "keyboard_name": "mlego/m60 rev1",
-    "maintainer": "alin elena",
-    "board": "BLACKPILL_STM32_F401",
-    "bootloader": "tinyuf2",
-    "debounce": 5,
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A0", "pin_b": "B8"}
-        ]
-    },
-    "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {

diff --git a/keyboards/mlego/m60/rev2/info.json b/keyboards/mlego/m60/rev2/info.json
@@ -1,7 +1,8 @@
 {
     "keyboard_name": "m60 rev2 with rp2040 ",
-    "bootloader": "rp2040",
     "processor": "RP2040",
+    "board": "GENERIC_RP_RP2040",
+    "bootloader": "rp2040",
     "usb": {
         "device_version": "0.0.2"
     },

diff --git a/keyboards/mlego/m66/keymaps/uk/keymap.c b/keyboards/mlego/m66/keymaps/uk/keymap.c
@@ -63,8 +63,8 @@ const uint32_t unicode_map[] PROGMEM = {
     [lP1] = 0x2213 , // ∓
     [lq1] = 0x00D7 , // ×
     [lQ1] = 0x22C5 , // ⋅
-    [ll1] = 0x1D53C, // 𝔼
-    [lL1] = 0x2112 , // Å
+    [ll1] = 0x00B0, // °
+    [lL1] = 0x2112 , // ℒ
     [lk1] = 0x221D , // ∝
     [lK1] = 0x212b , // Å
     [lbo1] = 0x22DC , // ⋜
@@ -164,7 +164,7 @@ raise layer
 ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┘
 │ 🖰3 │ σϕ │ ωΩ │ εℇ │ ρ∇ │ ϑθ │ ℝℤ │ τℂ │ ∫∮ │ ∞⊗ │ π∏ │ ⋜≠ │ ⋝≅ │
 ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
-│ 🖰2 │ αΑ │ ∑⨋ │ δ∂ │ φψ │ γΓ │ ℏℋ │ ∈∉ │ ϰ∆ │ λΛ │ᵓCℒ │ ∝Å │    │
+│ 🖰2 │ αΑ │ ∑⨋ │ δ∂ │ φψ │ γΓ │ ℏℋ │ ∈∉ │ ϰ∆ │ λΛ │ °ℒ │ ∝Å │    │
 ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
 │    │ ≡≢ │ ζ∡ │ ξΞ │ χ⊂ │ ν⊃ │ β∩ │ η∪ │ μ∘ │ ≈≉ │ ±∓ │ 🖰↟ │ ×⋅ │
 ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤

diff --git a/keyboards/mlego/m66/m66.c b/keyboards/mlego/m66/m66.c
@@ -232,7 +232,7 @@ void user_lcd_magic(void) {
     if (layer != current_layer) {
         const char *layer_name = get_layer_name(layer);
         snprintf(buf, sizeof(buf), "layer: %s", layer_name);
-        qp_drawtext_recolor(lcd, 0, 0.5 * h, qp_fonts[0], buf, HSV_ORANGE, HSV_BLACK);
+        qp_drawtext_recolor(lcd, 0, 0.0* h, qp_fonts[0], buf, HSV_ORANGE, HSV_BLACK);
         if (DISP_WIDTH < 130) {
             draw_lcd_icon(20, 72, true, 5 + layer, HSV_BLACK, HSV_ORANGE);
 
@@ -247,12 +247,15 @@ void user_lcd_magic(void) {
     if (uni != current_unicode) {
         const char *uni_name = get_unicode_name(uni);
         snprintf(buf, sizeof(buf), "uni: %s", uni_name);
-        qp_drawtext_recolor(lcd, 0, 1.5 * h, qp_fonts[0], buf, HSV_PINK, HSV_BLACK);
+        qp_drawtext_recolor(lcd, 0, 1.0 * h, qp_fonts[0], buf, HSV_PINK, HSV_BLACK);
         current_unicode = uni;
     }
+        // snprintf(buf, sizeof(buf), "%s", "↹qwertyuiop[]");
+        //snprintf(buf, sizeof(buf), "%s", "⎈⇓⎇ ⇑   ⎇ ⇧←↓→");
+        // qp_drawtext_recolor(lcd, 0, 2.0 * h, qp_fonts[0], buf, HSV_PINK, HSV_BLACK);
 #    endif
 
-    h = 36;
+    h = 40;
     // this is lifted from djinn
     if (last_led_state.raw != host_keyboard_led_state().raw) {
         show_icons_lcd();
@@ -282,7 +285,7 @@ void init_lcd_timer(void) {
 };
 
 void show_icons_lcd(void) {
-    const int h = 36;
+    const int h = 40;
 
     last_led_state.raw = host_keyboard_led_state().raw;
     draw_lcd_icon(4, h, last_led_state.caps_lock, 2, HSV_PINK, HSV_BLACK);

diff --git a/keyboards/mlego/m66/qp/graphics.c b/keyboards/mlego/m66/qp/graphics.c
@@ -9,7 +9,7 @@ painter_font_handle_t qp_fonts[QUANTUM_PAINTER_NUM_FONTS] = {};
 painter_image_handle_t qp_images[QUANTUM_PAINTER_NUM_IMAGES] = {};
 
 // Fonts, in alphabetical order to easier checking
-#include "fira_code.qff.h"
+#include "myfont-14.qff.h"
 #include "thintel15.qff.h"
 
 // Images, in alphabetical order to easier checking
@@ -71,7 +71,7 @@ void _load_image(const uint8_t *img) {
 }
 
 void load_qp_resources(void) {
-    load_font(font_fira_code);
+    load_font(font_myfont_14);
     load_font(font_thintel15);
 
     load_image(gfx_qmk_icon_48);