diff --git a/config/boards/shields/mlego_m66_rev4/mlego_m66_rev4_rp2040.overlay b/config/boards/shields/mlego_m66_rev4/mlego_m66_rev4_rp2040.overlay index 27faa27..d78e26a 100644 --- a/config/boards/shields/mlego_m66_rev4/mlego_m66_rev4_rp2040.overlay +++ b/config/boards/shields/mlego_m66_rev4/mlego_m66_rev4_rp2040.overlay @@ -3,43 +3,25 @@ * SPDX-License-Identifier: MIT */ #include -#include +#include "mlego_m66_rev4_layout.dtsi" / { model = "mlego m66, rev4"; - chosen { - zmk,kscan = &kscan; - zmk,matrix_transform = &m66; -// zephyr,console = &cdc_acm_uart; + m66_layout: m66_layout { + compatible = "zmk,physical-layout"; + display-name = "m66 default layout"; + kscan = <&kscan_m66>; }; - m66: m66_0 { - compatible = "zmk,matrix-transform"; - columns = <14>; - rows = <5>; + chosen { + zmk,physical-layout = &m66_layout; /* -┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐ -│ 0A │ 0B │ 0C │ 0D │ 0E │ 0F │ 0G │ 0H │ 0I │ 0J │ 0K │ 0L │ 0M │ 0N │ -├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┘ -│ 1A │ 1B │ 1C │ 1D │ 1E │ 1F │ 1G │ 1H │ 1I │ 1J │ 1K │ 1L │ 1M │ -├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤ -│ 2A │ 2B │ 2C │ 2D │ 2E │ 2F │ 2G │ 2H │ 2I │ 2J │ 2K │ 2L │ 2M │ -├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤ -│ 3A │ 3B │ 3C │ 3D │ 3E │ 3F │ 3G │ 3H │ 3I │ 3J │ 3K │ 3L │ 3M │ -├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤ -│ 4A │ 4B │ 4C │ 4D │ 4E │ 4F │ 4G │ 4H │ 4I │ 4J │ 4K │ 4L │ 4M │ -└────┴────┴────┴────┴────┴────┴────┴────┴────┴────┴────┴────┴────┘ - + zephyr,console = &cdc_acm_uart; */ - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) -RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) -RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12) - >; - }; - kscan: kscan { + }; + + + kscan_m66: kscan_m66 { compatible = "zmk,kscan-gpio-matrix"; diode-direction = "col2row"; wakeup-source; diff --git a/firmware/mlego2x2_rev1-seeeduino_xiao_ble-zmk.uf2 b/firmware/mlego2x2_rev1-seeeduino_xiao_ble-zmk.uf2 index 2e04406..4c0e740 100644 Binary files a/firmware/mlego2x2_rev1-seeeduino_xiao_ble-zmk.uf2 and b/firmware/mlego2x2_rev1-seeeduino_xiao_ble-zmk.uf2 differ diff --git a/firmware/mlego2x2_rev2-seeeduino_xiao_rp2040-zmk.uf2 b/firmware/mlego2x2_rev2-seeeduino_xiao_rp2040-zmk.uf2 index 469ec7c..4f3ec36 100644 Binary files a/firmware/mlego2x2_rev2-seeeduino_xiao_rp2040-zmk.uf2 and b/firmware/mlego2x2_rev2-seeeduino_xiao_rp2040-zmk.uf2 differ diff --git a/firmware/mlego5x13_61_r8-seeeduino_xiao_ble-zmk.uf2 b/firmware/mlego5x13_61_r8-seeeduino_xiao_ble-zmk.uf2 index 52800ad..f101d5a 100644 Binary files a/firmware/mlego5x13_61_r8-seeeduino_xiao_ble-zmk.uf2 and b/firmware/mlego5x13_61_r8-seeeduino_xiao_ble-zmk.uf2 differ diff --git a/firmware/mlego5x13_rev4-blackpill_f401ce-zmk.uf2 b/firmware/mlego5x13_rev4-blackpill_f401ce-zmk.uf2 index fcb5cc9..f725a36 100644 Binary files a/firmware/mlego5x13_rev4-blackpill_f401ce-zmk.uf2 and b/firmware/mlego5x13_rev4-blackpill_f401ce-zmk.uf2 differ diff --git a/firmware/mlego5x13_rev5-rpi_pico-zmk.uf2 b/firmware/mlego5x13_rev5-rpi_pico-zmk.uf2 index fc89fa5..9b9aa94 100644 Binary files a/firmware/mlego5x13_rev5-rpi_pico-zmk.uf2 and b/firmware/mlego5x13_rev5-rpi_pico-zmk.uf2 differ diff --git a/firmware/mlego5x13_rev7-seeeduino_xiao_rp2040-zmk.uf2 b/firmware/mlego5x13_rev7-seeeduino_xiao_rp2040-zmk.uf2 index 09fc082..617da84 100644 Binary files a/firmware/mlego5x13_rev7-seeeduino_xiao_rp2040-zmk.uf2 and b/firmware/mlego5x13_rev7-seeeduino_xiao_rp2040-zmk.uf2 differ diff --git a/firmware/mlego5x13_rev8 rgbled_adapter-seeeduino_xiao_ble-zmk.uf2 b/firmware/mlego5x13_rev8 rgbled_adapter-seeeduino_xiao_ble-zmk.uf2 index 49a073f..0b07e2a 100644 Binary files a/firmware/mlego5x13_rev8 rgbled_adapter-seeeduino_xiao_ble-zmk.uf2 and b/firmware/mlego5x13_rev8 rgbled_adapter-seeeduino_xiao_ble-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4 ls011b7dh03-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4 ls011b7dh03-nice_nano_v2-zmk.uf2 index 9ba728b..0240ffc 100644 Binary files a/firmware/mlego_m66_rev4 ls011b7dh03-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4 ls011b7dh03-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4 ls013b7dh03_128x128-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4 ls013b7dh03_128x128-nice_nano_v2-zmk.uf2 index e60cf3c..ef00570 100644 Binary files a/firmware/mlego_m66_rev4 ls013b7dh03_128x128-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4 ls013b7dh03_128x128-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4 ls013b7dh05-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4 ls013b7dh05-nice_nano_v2-zmk.uf2 index 1b24d51..aa5aa7a 100644 Binary files a/firmware/mlego_m66_rev4 ls013b7dh05-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4 ls013b7dh05-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4 weact_eink_154-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4 weact_eink_154-nice_nano_v2-zmk.uf2 index 5af2f61..7fb26e6 100644 Binary files a/firmware/mlego_m66_rev4 weact_eink_154-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4 weact_eink_154-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4 weact_eink_213-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4 weact_eink_213-nice_nano_v2-zmk.uf2 index 49d48bd..3a818ac 100644 Binary files a/firmware/mlego_m66_rev4 weact_eink_213-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4 weact_eink_213-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4-nice_nano_v2-zmk.uf2 b/firmware/mlego_m66_rev4-nice_nano_v2-zmk.uf2 index 82b70d6..42ed604 100644 Binary files a/firmware/mlego_m66_rev4-nice_nano_v2-zmk.uf2 and b/firmware/mlego_m66_rev4-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/mlego_m66_rev4_rp2040-rpi_pico-zmk.uf2 b/firmware/mlego_m66_rev4_rp2040-rpi_pico-zmk.uf2 index 94c9208..6140577 100644 Binary files a/firmware/mlego_m66_rev4_rp2040-rpi_pico-zmk.uf2 and b/firmware/mlego_m66_rev4_rp2040-rpi_pico-zmk.uf2 differ diff --git a/firmware/onekey pro_micro-nice_nano_v2-zmk.uf2 b/firmware/onekey pro_micro-nice_nano_v2-zmk.uf2 index c0db432..19b30a4 100644 Binary files a/firmware/onekey pro_micro-nice_nano_v2-zmk.uf2 and b/firmware/onekey pro_micro-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/onekey rp2040-rpi_pico-zmk.uf2 b/firmware/onekey rp2040-rpi_pico-zmk.uf2 index 1418a90..6b5ec84 100644 Binary files a/firmware/onekey rp2040-rpi_pico-zmk.uf2 and b/firmware/onekey rp2040-rpi_pico-zmk.uf2 differ diff --git a/firmware/onekey seed-seeeduino_xiao_ble-zmk.uf2 b/firmware/onekey seed-seeeduino_xiao_ble-zmk.uf2 index c13533e..d0ee498 100644 Binary files a/firmware/onekey seed-seeeduino_xiao_ble-zmk.uf2 and b/firmware/onekey seed-seeeduino_xiao_ble-zmk.uf2 differ diff --git a/firmware/settings_reset-nice_nano_v2-zmk.uf2 b/firmware/settings_reset-nice_nano_v2-zmk.uf2 index 959e0ba..13d7f26 100644 Binary files a/firmware/settings_reset-nice_nano_v2-zmk.uf2 and b/firmware/settings_reset-nice_nano_v2-zmk.uf2 differ diff --git a/firmware/settings_reset-rpi_pico-zmk.uf2 b/firmware/settings_reset-rpi_pico-zmk.uf2 index 863cdf2..1081cca 100644 Binary files a/firmware/settings_reset-rpi_pico-zmk.uf2 and b/firmware/settings_reset-rpi_pico-zmk.uf2 differ diff --git a/firmware/settings_reset-seeeduino_xiao_ble-zmk.uf2 b/firmware/settings_reset-seeeduino_xiao_ble-zmk.uf2 index 6c416d8..686eaf2 100644 Binary files a/firmware/settings_reset-seeeduino_xiao_ble-zmk.uf2 and b/firmware/settings_reset-seeeduino_xiao_ble-zmk.uf2 differ