Updates to mlego m65 (#20220)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

3 files changed, 125 insertions, 211 deletions

diff --git a/keyboards/mlego/m65/keymaps/uk/config.h b/keyboards/mlego/m65/keymaps/uk/config.h
index b0c6cfd639..c1f9816c99 100644
--- a/keyboards/mlego/m65/keymaps/uk/config.h
+++ b/keyboards/mlego/m65/keymaps/uk/config.h
@@ -1,29 +1,14 @@
-/*
-Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2020-2023 alin m elena (@alinelena)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #define TAPPING_TOGGLE 2
 
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-//#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
 
 #ifdef WPM_ENABLE
-#define WPM_SAMPLE_SECONDS 10
-#define WPM_SAMPLE_PERIODS 100
-#define WPM_ALLOW_COUNT_REGRESSION
+#    define WPM_SAMPLE_SECONDS 10
+#    define WPM_SAMPLE_PERIODS 100
+#    define WPM_ALLOW_COUNT_REGRESSION
 #endif
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index ee48872433..e021756cdd 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -1,106 +1,101 @@
-/*
-Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2020-2023 alin m elena (@alinelena)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 #include "keymap_uk.h"
 
-#ifdef CONSOLE_ENABLE
-
-#include "print.h"
-
-#endif
-
 const uint32_t unicode_map[] PROGMEM = {
-    [la]  = 0x03B1 , // α
-    [lA]  = 0x0391 , // Α
-    [lb]  = 0x03B2 , // β
-    [lB]  = 0x0392 , // Β
-    [lc]  = 0x03C7 , // χ
-    [lC]  = 0x0307 , //
-    [ld]  = 0x03B4 , // δ
-    [lD]  = 0x2202 , // ∂
-    [le]  = 0x03B5 , // ε
-    [lE]  = 0x2107 , // ℇ
-    [lf]  = 0x03C6 , // φ
-    [lF]  = 0x03C8 , // ψ
-    [lg]  = 0x03B3 , // γ
-    [lG]  = 0x0393 , // Γ
-    [lh]  = 0x210F , // ℏ
-    [lH]  = 0x1D4D7, // 𝓗
-    [li]  = 0x222B , // ∫
-    [lI]  = 0x222E , // ∮
-    [lj]  = 0x2208 , // ∈
-    [lJ]  = 0x2209 , // ∉
-    [lk]  = 0x03F0 , // ϰ
-    [lK]  = 0x2206 , // ∆
-    [ll]  = 0x03BB , // λ
-    [lL]  = 0x039B , // Λ
-    [lm]  = 0x03BC , // μ
-    [lM]  = 0x2218 , // ∘
-    [ln]  = 0x03B7 , // η
-    [lN]  = 0x222A , // ∪
-    [lo]  = 0x221E , // ∞
-    [lO]  = 0x2297 , // ⊗
-    [lp]  = 0x03C0 , // π
-    [lP]  = 0x220F , // ∏
-    [lq]  = 0x03C3 , // σ
-    [lQ]  = 0x03D5 , // ϕ
-    [lr]  = 0x03C1 , // ρ
-    [lR]  = 0x2207 , // ∇
-    [ls]  = 0x2211 , // ∑
-    [lS]  = 0x2A0B , // ⨋
-    [lt]  = 0x03D1 , // ϑ
-    [lT]  = 0x03B8 , // θ
-    [lu]  = 0x03C4 , // τ
-    [lU]  = 0x2102 , // ℂ
-    [lv]  = 0x03BD , // χ
-    [lV]  = 0x039D , // Ν
-    [lw]  = 0x03C9 , // ω
-    [lW]  = 0x03A9 , // Ω
-    [lx]  = 0x03BE , // ξ
-    [lX]  = 0x039E , // Ξ
-    [ly]  = 0x211d , // ℝ
-    [lY]  = 0x2124 , // ℤ
-    [lz]  = 0x03B6 , // ζ
-    [lZ]  = 0x2221 , // ∡
-    [lc1] = 0x224A , // ≊
-    [lC1] = 0x2248 , // ≈
-    [lp1] = 0x00B1 , // ±
-    [lP1] = 0x2213 , // ∓
-    [lq1] = 0x00D7 , // ×
-    [lQ1] = 0x22C5 , // ⋅
-    [ll1] = 0x1D53C, // 𝔼
-    [lL1] = 0x212b , // Å
-    [lk1] = 0x221D , // ∝
-    [lK1] = 0x2112 , // ℒ
-    [ra]  = 0x0103 , // ă
-    [rA]  = 0x0102 , // Ă
-    [ra1] = 0x00E2 , // â
-    [rA1] = 0x00C2 , // Â
-    [rc]  = 0x00E7 , // ç
-    [rC]  = 0x00C7 , // Ç
-    [ri]  = 0x00EE , // î
-    [rI]  = 0x00CE , // Î
-    [rs]  = 0x0219 , // ș
-    [rS]  = 0x0218 , // Ș
-    [rt]  = 0x021B , // ț
-    [rT]  = 0x021A , // Ț
+    [la]   = 0x03B1,  // α
+    [lA]   = 0x0307,  //
+    [lb]   = 0x03B2,  // β
+    [lB]   = 0x2229,  // ∩
+    [lc]   = 0x03C7,  // χ
+    [lC]   = 0x2282,  // ⊂
+    [ld]   = 0x03B4,  // δ
+    [lD]   = 0x2202,  // ∂
+    [le]   = 0x03B5,  // ε
+    [lE]   = 0x2107,  // ℇ
+    [lf]   = 0x03C6,  // φ
+    [lF]   = 0x03C8,  // ψ
+    [lg]   = 0x03B3,  // γ
+    [lG]   = 0x0393,  // Γ
+    [lh]   = 0x210F,  // ℏ
+    [lH]   = 0x1D4D7, // 𝓗
+    [li]   = 0x222B,  // ∫
+    [lI]   = 0x222E,  // ∮
+    [lj]   = 0x2208,  // ∈
+    [lJ]   = 0x2209,  // ∉
+    [lk]   = 0x03F0,  // ϰ
+    [lK]   = 0x2206,  // ∆
+    [ll]   = 0x03BB,  // λ
+    [lL]   = 0x039B,  // Λ
+    [lm]   = 0x03BC,  // μ
+    [lM]   = 0x2218,  // ∘
+    [ln]   = 0x03B7,  // η
+    [lN]   = 0x222A,  // ∪
+    [lo]   = 0x221E,  // ∞
+    [lO]   = 0x2297,  // ⊗
+    [lp]   = 0x03C0,  // π
+    [lP]   = 0x220F,  // ∏
+    [lq]   = 0x03C3,  // σ
+    [lQ]   = 0x03D5,  // ϕ
+    [lr]   = 0x03C1,  // ρ
+    [lR]   = 0x2207,  // ∇
+    [ls]   = 0x2211,  // ∑
+    [lS]   = 0x2A0B,  // ⨋
+    [lt]   = 0x03D1,  // ϑ
+    [lT]   = 0x03B8,  // θ
+    [lu]   = 0x03C4,  // τ
+    [lU]   = 0x2102,  // ℂ
+    [lv]   = 0x03BD,  // χ
+    [lV]   = 0x2283,  // ⊃
+    [lw]   = 0x03C9,  // ω
+    [lW]   = 0x03A9,  // Ω
+    [lx]   = 0x03BE,  // ξ
+    [lX]   = 0x039E,  // Ξ
+    [ly]   = 0x211d,  // ℝ
+    [lY]   = 0x2124,  // ℤ
+    [lz]   = 0x03B6,  // ζ
+    [lZ]   = 0x2221,  // ∡
+    [lc1]  = 0x2248,  // ≈
+    [lC1]  = 0x2249,  // ≉
+    [lp1]  = 0x00B1,  // ±
+    [lP1]  = 0x2213,  // ∓
+    [lq1]  = 0x00D7,  // ×
+    [lQ1]  = 0x22C5,  // ⋅
+    [ll1]  = 0x1D53C, // 𝔼
+    [lL1]  = 0x212b,  // Å
+    [lk1]  = 0x221D,  // ∝
+    [lK1]  = 0x2112,  // ℒ
+    [lbo1] = 0x22DC,  // ⋜
+    [lbo2] = 0x2260,  // ≠
+    [lbc1] = 0x22DD,  // ⋝
+    [lbc2] = 0x2245,  // ≅
+    [ls1]  = 0x2261,  // ≡
+    [ls2]  = 0x2262,  // ≢
+    [ra]   = 0x0103,  // ă
+    [rA]   = 0x0102,  // Ă
+    [ra1]  = 0x00E2,  // â
+    [rA1]  = 0x00C2,  // Â
+    [rx]   = 0x00E7,  // ç
+    [rX]   = 0x00C7,  // Ç
+    [ri]   = 0x00EE,  // î
+    [rI]   = 0x00CE,  // Î
+    [rs]   = 0x0219,  // ș⊄
+    [rS]   = 0x0218,  // Ș
+    [rt]   = 0x021B,  // ț
+    [rT]   = 0x021A,  // Ț
+    [rc]   = 0x2284,  // ⊄
+    [rC]   = 0x2286,  // ⊆
+    [rv]   = 0x2285,  // ⊅
+    [rV]   = 0x2287,  // ⊇
+    [rb]   = 0x2227,  // ∧
+    [rB]   = 0x22BC,  // ⊼
+    [rn]   = 0x2228,  // ∨
+    [rN]   = 0x22BB,  // ⊻
 };
 
+
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
@@ -161,29 +156,29 @@ altgr shift symbols
       KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
 /*
-lower layer
+raise layer
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │ ` │MUT│Vup│Vdn│prv│ply│nxt│EXT│SLP│WAK│PSC│ ⌫ │ = │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │   │ σ │ ω │ ε │ ρ │ ϑ │ ℝ │ τ │ ∫ │ ∞ │ π │ [ │ ] │
+ * │   │ σ │ ω │ ε │ ρ │ ϑ │ ℝ │ τ │ ∫ │ ∞ │ π │ ⋜ │ ⋝ │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
  * │   │ α │ ∑ │ δ │ φ │ γ │ ℏ │ ∈ │ ϰ │ λ │ 𝔼 │ ∝ │ ⏎ │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ⇧(│   │ ζ │ ξ │ χ │ ν │ β │ η │ μ │ ≊ │ ± │   │ × │
+ * │ ⇧(│ ≡ │ ζ │ ξ │ χ │ ν │ β │ η │ μ │ ≈ │ ± │   │ × │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ⎈ │   │lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│   │   │   │
+ * │   │   │lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│   │   │   │
  * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
-lower layer shifted
+raise layer shifted
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ ¬ │   │   │   │   │   │   │   │   │   │   │ ⌫ │ = │
+ * │ ¬ │   │   │   │   │   │   │   │   │   │   │ ⌫ │ + │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │MB3│ ϕ │ Ω │ ℇ │ ∇ │ θ │ ℤ │ ℂ │ ∮ │ ⊗ │ ∏ │ { │ } │
+ * │MB3│ ϕ │ Ω │ ℇ │ ∇ │ θ │ ℤ │ ℂ │ ∮ │ ⊗ │ ∏ │ ≠ │ ≅ │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │MB2│ Α │ ⨋ │ ∂ │ ψ │ Γ │ 𝓗 │ ∉ │ ∆ │ Λ │ Å │ ℒ │ ⏎ │
+ * │MB2│  ̇ │ ⨋ │ ∂ │ ψ │ Γ │ 𝓗 │ ∉ │ ∆ │ Λ │ Å │ ℒ │ ⏎ │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ⇧(│MB1│ ∡ │ Ξ │ ̇  │ Ν │ Β │ ∪ │ ∘ │ ≈ │ ∓ │MSU│ ⋅ │
+ * │ ⇧(│ ≢ │ ∡ │ Ξ │ ⊂ │ ⊃ │ ∩ │ ∪ │ ∘ │ ≉ │ ∓ │MSU│ ⋅ │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ⎈ │MB4│lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│MSL│MSD│MSR│
+ * │MB1│MB4│lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│MSL│MSD│MSR│
  * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
 MB - mouse buttons
 MS - mouse directions
@@ -196,7 +191,7 @@ MS - mouse directions
      _______,  KC_BTN4,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    KC_MS_L,     KC_MS_D,    KC_MS_R),
 
 /*
-raise layer
+lower layer
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │ ⎋ │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
@@ -204,7 +199,7 @@ raise layer
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
  * │ ⇪ │ ă │ ș │   │   │   │   │   │   │   │   │   │   │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │   │   │   │   │ ç │   │   │   │   │   │   │MWU│   │
+ * │   │   │   │ ç │ ⊄ │ ⊅ │ ∧ │ ∨ │   │   │   │MWU│   │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
  * │   │   │   │   │   │   │   │   │   │   │MWL│MWD│MWR│
  * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
@@ -217,7 +212,7 @@ raise layer shifted
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
  * │   │ Ă │ Ș │   │   │   │   │   │   │   │   │   │   │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │   │   │   │   │ Ç │   │   │   │   │   │   │   │   │
+ * │   │   │   │ Ç │ ⊆ │ ⊇ │ ⊼ │ ⊻ │   │   │   │   │   │
  * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
  * │   │   │   │   │   │   │   │   │   │   │   │   │   │
  * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
@@ -245,90 +240,23 @@ adj layer
   [_ADJ] = LAYOUT_ortho_5x13(
       RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
       RGB_HUI, RGB_HUD , RGB_M_P , _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
-      RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
-      RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
+      RGB_SAI, RGB_SAD , RGB_M_B , _______, UC_NEXT, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
+      RGB_VAI, RGB_VAD , RGB_M_R , _______, UC_PREV, UC_LINX,  UC_WIN, UC_WINC,  UC_MAC, UC_EMAC, _______, _______ , RGB_M_X ,
       RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
 };
 // clang-format on
 
-bool led_update_user(led_t led_state) {
-    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
-    return false;
-}
-
-void matrix_scan_user(void) {
-
-    toggle_leds();
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-
-#ifdef CONSOLE_ENABLE
-
-    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-
-#endif
-
-    switch (keycode) {
-        case (TT(_LWR)):
-            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                set_led_toggle(_LWR, !layer_state_is(_LWR));
-            }
-            return true;
-            break;
-        case (TT(_RSE)):
-            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                set_led_toggle(_RSE, !layer_state_is(_RSE));
-            }
-            return true;
-            break;
-        default:
-            return true;
-    }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-#ifdef RGBLIGHT_ENABLE
-
-   set_rgb_layers(state);
-
-#endif
-
-    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
-}
-
-#ifdef RGBLIGHT_ENABLE
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-
-    set_default_rgb_layers(state);
-    return state;
-}
-
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_QW]  = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+#if defined(RGBLIGHT_ENABLE)
+    [_LWR] = {ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [_RSE] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [_ADJ] = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+#else
+    [_LWR] = {ENCODER_CCW_CW(KC_MNXT, KC_MPRV)},
+    [_RSE] = {ENCODER_CCW_CW(KC_MFFD, KC_MRWD)},
+    [_ADJ] = {ENCODER_CCW_CW(KC_PGDN, KC_PGUP)},
 #endif
-
-void keyboard_post_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-
-  // Enable the LED layers
-    rgblight_layers = my_rgb();
-
-#endif
-
-#ifdef OLED_ENABLE
-
-    init_timer();
-
-#endif
-
-#ifdef CONSOLE_ENABLE
-
-    debug_enable   = true;
-    debug_matrix   = true;
-    debug_keyboard = true;
-
+};
 #endif
-}
diff --git a/keyboards/mlego/m65/keymaps/uk/rules.mk b/keyboards/mlego/m65/keymaps/uk/rules.mk
index 502b2def76..846f3443f6 100644
--- a/keyboards/mlego/m65/keymaps/uk/rules.mk
+++ b/keyboards/mlego/m65/keymaps/uk/rules.mk
@@ -1 +1,2 @@
 UNICODEMAP_ENABLE = yes
+ENCODER_MAP_ENABLE = yes