feat(boards): Leeloo v2 and V2 Zephyr 3.2 fixes

* Add Leeloo v2 * Leeloo-Micro v1 updates to support Zephyr 3.2 * Refactored for new Encoder Configuration Co-authored-by: Cem Aksoylar <caksoylar@users.noreply.github.com>
2023-07-17 15:26:27 -06:00 · 2023-07-17 15:26:27 -06:00 · aaf9958d86
commit aaf9958d86
parent bbb27ac027
26 changed files with 1027 additions and 128 deletions
--- a/app/boards/shields/leeloo/Kconfig.defconfig
+++ b/app/boards/shields/leeloo/Kconfig.defconfig
@ -1,6 +1,16 @@
-# Copyright (c) 2022 The ZMK Contributors
+# Copyright (c) 2023 The ZMK Contributors
 # SPDX-License-Identifier: MIT

+if SHIELD_LEELOO_REV2_LEFT
+
+config ZMK_KEYBOARD_NAME
+    default "Leeloo v2"
+
+config ZMK_SPLIT_ROLE_CENTRAL
+    default y
+
+endif
+
 if SHIELD_LEELOO_LEFT

 config ZMK_KEYBOARD_NAME
@ -11,7 +21,7 @@ config ZMK_SPLIT_ROLE_CENTRAL

 endif

-if SHIELD_LEELOO_LEFT || SHIELD_LEELOO_RIGHT
+if SHIELD_LEELOO

 config ZMK_SPLIT
    default y
@ -31,7 +41,6 @@ endif # ZMK_DISPLAY

 if LVGL

-
 config LV_Z_VDB_SIZE
    default 64

--- a/app/boards/shields/leeloo/Kconfig.shield
+++ b/app/boards/shields/leeloo/Kconfig.shield
@ -1,8 +1,21 @@
-# Copyright (c) 2022 The ZMK Contributors
+# Copyright (c) 2023 The ZMK Contributors
 # SPDX-License-Identifier: MIT

+config SHIELD_LEELOO
+    bool
+
 config SHIELD_LEELOO_LEFT
    def_bool $(shields_list_contains,leeloo_left)
+    select SHIELD_LEELOO

 config SHIELD_LEELOO_RIGHT
    def_bool $(shields_list_contains,leeloo_right)
+    select SHIELD_LEELOO
+
+config SHIELD_LEELOO_REV2_LEFT
+    def_bool $(shields_list_contains,leeloo_rev2_left)
+    select SHIELD_LEELOO
+
+config SHIELD_LEELOO_REV2_RIGHT
+    def_bool $(shields_list_contains,leeloo_rev2_right)
+    select SHIELD_LEELOO
--- a/app/boards/shields/leeloo/README.md
+++ b/app/boards/shields/leeloo/README.md
@ -1,41 +1,123 @@
-# Clickety Split | Leeloo
+# Clickety Split | Leeloo v2

-![Leeloo](https://cdn.shopify.com/s/files/1/0599/3460/5491/files/Leeloo-rev1.0-w.jpg?v=1646798726)
+![Leeloo v2](https://github.com/ClicketySplit/build-guides/blob/main/leeloo/images/gallery/Leeloo-v2-ZMK.jpg)

 Keyboard Designer: [clicketysplit.ca](https://clicketysplit.ca)
 GitHub: [ClicketySplit](https://github.com/ClicketySplit)
-Hardware Supported: Pro Micro, Elite-C, nice!nano v2
+Hardware Supported: Pro Micro, Elite-C, and nice!nano v2

-Albeit, there is no doubt where Leeloo's heritage is derived from—Lily58, and Corne. It is not a copy-paste-modify implementation.
+Leeloo v2 has been designed from scratch—again. Everything from the wiring schematic to its case. Leeloo v2 still keeps the column stagger that it's known for, along with its low profile design.

-Leeloo has been designed from scratch; everything from the schematic to its PCB footprints, and column stagger. There are some subtle differences that may not be apparent; however, its subtle changes enable an interesting future.
+## Features/Differences from Leeloo v1

-Features:
+- Support for Kailh Low Profile Choc switches with 18mm x 18mm spacing.
+  - A version for Kailh Box/MX switches with 19.05mm x 19.05mm spacing will be available in the future.
+- All switch locations are socketed.
+- Rotary encoder locations are socketed.
+  - One of two locations on each side can be used for a rotary encoder.
+- OLED Displays and nice!view Displays are natively supported, socketed, and no extra wiring is required.
+- Support for per-switch RGB underglow.
+- Better location for 110mAh or 700mAh batteries.
+  - Different location for soldering battery leads.
+- Support for Alps Alpine Micro On/off switches.
+
+# Leeloo v1
+
+![Leeloo](https://github.com/ClicketySplit/build-guides/blob/main/leeloo/images/gallery/Leeloo-v1.jpg)
+
+## Features

 - 4x6x5m Split Keyboard
- Support for MX/Box or Low Profile Choc switches.
- 90% of the switches are socketed; with the exception to the rotary encoder positions—6 positions require soldering.
- Support for 128x32 OLED Displays.
- The option to select one of three positions for an EC11 rotary encoder on each half.
- Support for Alps Alpine Micro Switch
- Support for 3.7v 301230 LiPo Battery
+- Support for both Low Profile Choc switches, and Box/MX switches; 19.05mm x 19.05mm spacing.
+- 90% of the switches are socketed; with the exception to the rotary encoder positions.
+- Support for Alps Alpine EC11 Rotary Encoders—one on each side, in one of three locations.
+- Support for OLED Displays or nice!view Displays.
+  - nice!view displays require a wire to be soldered from the CS Pin on nice!view display to P0.22 or D4 on the nice!nano.
+- Support for both 110mAh or 700mAh batteries.
+- Solder pads for battery leads.
+- Support for Alps Alpine Micro On/off switches.

-# Building Your Firmware
+# Building Leeloo's ZMK Firmware

 ZMK Firmware: [Introduction to ZMK](https://zmk.dev/docs/)
 Installation: [Installing ZMK](https://zmk.dev/docs/user-setup)
 Customization: [Customizing ZMK](https://zmk.dev/docs/customization)
 Development Environment: [Basic Setup](https://zmk.dev/docs/development/setup)

-Build command for the default keymap of Leeloo:
+Build commands for the default keymap of Leeloo v1:

-    west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_left
-    west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_right
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_left
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_right
+```

-Build command for your custom keymap of Leeloo:
+Build commands for the default keymap of Leeloo v2:

-    west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_right -DZMK_CONFIG="C:/dev/zmk/[yourNmae]/leeloo/config"
-    west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_left -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo/config"
+```
+west build -d build/left_v2 -p -b nice_nano_v2 -- -DSHIELD=leeloo_rev2_left
+west build -d build/right_v2 -p -b nice_nano_v2 -- -DSHIELD=leeloo_rev2_right
+```
+
+Build commands for your custom keymap of Leeloo v1:
+
+```
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_right -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo/config"
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_left -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo/config"
+```
+
+Build commands for your custom keymap of Leeloo v2:
+
+```
+west build -d build/right_v2 -p -b nice_nano_v2 -- -DSHIELD=leeloo_rev2_right -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo_v2/config"
+west build -d build/left_v2 -p -b nice_nano_v2 -- -DSHIELD=leeloo_rev2_left -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo_v2/config"
+```
+
+## Building Leeloo's ZMK Firmware with nice!view Displays
+
+There are a couple of files that need to be adjusted before the build commands can be run.
+
+### Edit the leeloo[_rev2].keymap File
+
+Near the top 3rd of the leeloo[_rev2].keymap file, locate the following code block:
+
+```
+//nice_view_spi: &spi0 {
+//  cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+//};
+```
+
+Remove the forward slashes to resemble the following:
+
+```
+nice_view_spi: &spi0 {
+    cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+};
+```
+
+Save your changes and close the file.
+
+### Sample Build Commands for nice!view Displays
+
+Build commands for the default keymap of Leeloo v1:
+
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD="leeloo_left nice_view_adapter nice_view"
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD="leeloo_right nice_view_adapter nice_view"
+```
+
+Build commands for the default keymap of Leeloo v2:
+
+```
+west build -d build/left_v2 -p -b nice_nano_v2 -- -DSHIELD="leeloo_rev2_left nice_view_adapter nice_view"
+west build -d build/right_v2 -p -b nice_nano_v2 -- -DSHIELD="leeloo_rev2_right nice_view_adapter nice_view"
+```
+
+Build commands for your custom keymap of Leeloo v2:
+
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD="leeloo_rev2_left nice_view_adapter nice_view" -DZMK_CONFIG="/workspaces/zmk-config/[yourName]/leeloo_v2/config"
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD="leeloo_rev2_right nice_view_adapter nice_view" -DZMK_CONFIG="/workspaces/zmk-config/[yourName]/leeloo_v2/config"
+```

 # Support

--- a/app/boards/shields/leeloo/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/leeloo/boards/nice_nano_v2.overlay
@ -0,0 +1,47 @@
+#include <dt-bindings/led/led.h>
+
+&pinctrl {
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
+
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
+};
+
+&spi3 {
+    compatible = "nordic,nrf-spim";
+    status = "okay";
+
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
+
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
+
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
+
+        /* WS2812 */
+        chain-length = <37>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
+};
+
+/ {
+    chosen {
+        zmk,underglow = &led_strip;
+    };
+};
--- a/app/boards/shields/leeloo/leeloo.conf
+++ b/app/boards/shields/leeloo/leeloo.conf
@ -1,9 +1,16 @@
-# Copyright (c) 2022 The ZMK Contributors
+# Copyright (c) 2023 The ZMK Contributors
 # SPDX-License-Identifier: MIT

 # Uncomment the following line to enable the OLED Display
 # CONFIG_ZMK_DISPLAY=y

+# Uncomment to turn off WPM Status.
+# CONFIG_ZMK_WIDGET_WPM_STATUS=n
+
+# Uncomment to invert colour when using nice!view Displays
+# CONFIG_ZMK_DISPLAY_INVERT=y
+
+
 # Uncomment these two lines to add support for encoders
 # CONFIG_EC11=y
 # CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
--- a/app/boards/shields/leeloo/leeloo.dtsi
+++ b/app/boards/shields/leeloo/leeloo.dtsi
@ -1,87 +1,6 @@
 /*
- * Copyright (c) 2022 The ZMK Contributors
- *
+ * Copyright (c) 2023 The ZMK Contributors
 * SPDX-License-Identifier: MIT
 */
-#include <dt-bindings/zmk/matrix_transform.h>

-/ {
-    chosen {
-        zephyr,display = &oled;
-        zmk,kscan = &kscan0;
-        zmk,matrix_transform = &default_transform;
-    };
-
-    default_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <12>;
-        rows = <5>;
-// | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |                 | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
-// | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |                 | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
-// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |                 | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
-// | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | SW29 |   | SW29 | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |
-//                      | SW25 | SW26 | SW27 | SW28 |   | SW28 | SW27 | SW26 | SW25 |
-        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(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(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(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(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)
-        >;
-    };
-
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN";
-
-        diode-direction = "col2row";
-        row-gpios
-            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-    };
-
-    left_encoder: encoder_left {
-        compatible = "alps,ec11";
-        label = "LEFT_ENCODER";
-        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        resolution = <4>;
-    };
-
-    right_encoder: encoder_right {
-        compatible = "alps,ec11";
-        label = "RIGHT_ENCODER";
-        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        resolution = <4>;
-    };
-
-    sensors {
-        compatible = "zmk,keymap-sensors";
-        sensors = <&left_encoder &right_encoder>;
-    };
-};
-
-&pro_micro_i2c {
-    status = "okay";
-
-    oled: ssd1306@3c {
-        compatible = "solomon,ssd1306fb";
-        reg = <0x3c>;
-        label = "DISPLAY";
-        width = <128>;
-        height = <32>;
-        segment-offset = <0>;
-        page-offset = <0>;
-        display-offset = <0>;
-        multiplex-ratio = <31>;
-        segment-remap;
-        com-invdir;
-        com-sequential;
-        prechargep = <0x22>;
-    };
-};
+#include "leeloo_common.dtsi"
--- a/app/boards/shields/leeloo/leeloo.keymap
+++ b/app/boards/shields/leeloo/leeloo.keymap
@ -1,17 +1,23 @@
 /*
- * Copyright (c) 2022 The ZMK Contributors
- *
+ * Copyright (c) 2023 The ZMK Contributors
 * SPDX-License-Identifier: MIT
 */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>

-// Layers
-#define DEFAULT    0       // default_layer
-#define LOWER      1       // lower_layer
-#define RAISE      2       // raise_layer
+/*
+ * Assign the cs-gpios pin to 4.
+ * Uncomment these next few lines if implementing nice!view Displays
+ * A wire from the nice!view CS display needs to be connected to the
+ * High Frequency P0.22, also known as D4 if you choose to refer to
+ * the pins with Arduino Labels.
+ */
+//nice_view_spi: &spi0 {
+//  cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+//};

 / {

@ -19,36 +25,39 @@
        compatible = "zmk,keymap";

        default_layer {
+            label = " QWERTY";
            bindings = <
 &kp ESC    &kp N1     &kp N2     &kp N3     &kp N4     &kp N5                           &kp N6     &kp N7     &kp N8     &kp N9     &kp N0     &kp BSLH
 &kp TAB    &kp Q      &kp W      &kp E      &kp R      &kp T                            &kp Y      &kp U      &kp I      &kp O      &kp P      &kp GRAV
 &kp CAPS   &kp A      &kp S      &kp D      &kp F      &kp G                            &kp H      &kp J      &kp K      &kp L      &kp SEMI   &kp SQT
-&kp LSHFT  &kp Z      &kp X      &kp C      &kp V      &kp B                            &kp N      &kp M      &kp COMMA  &kp DOT    &kp FSLH   &kp RSHFT
-                   &kp LALT   &kp LCTRL  &lt 1 RET  &lt 2 MINUS   &kp LGUI   &kp LGUI   &lt 2 EQUAL  &lt 1 SPACE  &kp BSPC   &kp DEL
+&kp LSHFT  &kp Z      &kp X      &kp C      &kp V      &kp B     &kp LGUI    &kp LGUI   &kp N      &kp M      &kp COMMA  &kp DOT    &kp FSLH   &kp RSHFT
+                             &kp LALT   &kp LCTRL  &lt 1 RET  &lt 2 MINUS    &lt 2 EQUAL  &lt 1 SPACE  &kp BSPC   &kp DEL
            >;

            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
        };

        lower_layer {
+            label = " Lower";
            bindings = <
 &trans     &kp F1     &kp F2     &kp F3     &kp F4     &kp F5                           &kp F6     &kp F7     &kp F8     &kp F9     &kp F10    &kp F11
 &trans     &trans     &trans     &trans     &trans     &trans                           &kp PG_UP  &kp HOME   &kp UP     &kp END    &trans     &kp F12
 &trans     &trans     &trans     &trans     &trans     &trans                           &kp PG_DN  &kp LEFT   &kp DOWN   &kp RIGHT  &trans     &trans
-&trans     &trans     &trans     &trans     &trans     &trans                           &trans     &trans     &trans     &trans     &trans     &trans
-                      &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+&trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+                                 &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
            >;

            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
        };

        raise_layer {
+            label = " Raise";
            bindings = <
 &trans     &trans     &trans     &trans     &trans     &trans                           &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4  &trans
 &trans     &trans     &trans     &trans     &trans     &trans                           &trans        &trans        &trans        &trans        &sys_reset    &bootloader
 &trans     &trans     &trans     &trans     &trans     &trans                           &trans        &trans        &trans        &trans        &trans        &trans
-&trans     &trans     &trans     &trans     &trans     &trans                           &trans        &trans        &trans        &trans        &trans        &trans
-                      &trans     &trans     &trans     &trans     &trans     &trans     &trans        &trans        &bt BT_CLR    &trans
+&trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans        &trans        &trans        &trans        &trans        &trans
+                                 &trans     &trans     &trans     &trans     &trans     &trans        &bt BT_CLR    &trans
            >;

            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
--- a/app/boards/shields/leeloo/leeloo_common.dtsi
+++ b/app/boards/shields/leeloo/leeloo_common.dtsi
@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
+
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <12>;
+        rows = <5>;
+// | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |                 | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
+// | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |                 | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
+// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |                 | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
+// | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | SW29 |   | SW29 | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |
+//                      | SW25 | SW26 | SW27 | SW28 |   | SW28 | SW27 | SW26 | SW25 |
+        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(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(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(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
+                        RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10)
+        >;
+    };
+
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+
+        diode-direction = "col2row";
+
+        row-gpios
+            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
+
+    left_encoder: left_encoder {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        steps = <120>;
+    };
+
+    right_encoder: right_encoder {
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        steps = <120>;
+    };
+
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+        triggers-per-rotation = <30>;
+    };
+
+};
+
+&pro_micro_i2c {
+    status = "okay";
+
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
+};
--- a/app/boards/shields/leeloo/leeloo_left.overlay
+++ b/app/boards/shields/leeloo/leeloo_left.overlay
@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2022 The ZMK Contributors
- *
+ * Copyright (c) 2023 The ZMK Contributors
 * SPDX-License-Identifier: MIT
 */
+
 #include "leeloo.dtsi"

 &kscan0 {
--- a/app/boards/shields/leeloo/leeloo_rev2.conf
+++ b/app/boards/shields/leeloo/leeloo_rev2.conf
@ -0,0 +1,43 @@
+# Copyright (c) 2023 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+# Uncomment the following line to enable the OLED Display
+# CONFIG_ZMK_DISPLAY=y
+
+# Uncomment to turn off WPM Status.
+# CONFIG_ZMK_WIDGET_WPM_STATUS=n
+
+# Uncomment to invert colour when using nice!view Displays
+# CONFIG_ZMK_DISPLAY_INVERT=y
+
+
+# Uncomment the following line to enable per-key lighting
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+
+# Use the STRIP config specific to the LEDs you're using
+# CONFIG_WS2812_STRIP=y
+
+# Keep OLED or nice!view Displays on even when toggling off LEDs
+# Change to y if you wish to toggle Displays on and off with LEDs
+# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
+
+# Turn off LEDs when idle.
+# Change to n if you wish to keep LEDs on even when idle.
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
+
+# When USB is disconnected, turn off LEDs
+# Change to n if you wish to keep LEDs on even when USB is unpluged.
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB=y
+
+# Start LEDs off at 75%
+# CONFIG_ZMK_RGB_UNDERGLOW_BRT_START=75
+
+
+# Uncomment these two lines to add support for encoders
+# CONFIG_EC11=y
+# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+
+
+# Uncomment if you are experiencing connectivity issues; this
+# configuration item boosts the BLE transmit power.
+# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
--- a/app/boards/shields/leeloo/leeloo_rev2.dtsi
+++ b/app/boards/shields/leeloo/leeloo_rev2.dtsi
@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "leeloo_common.dtsi"
--- a/app/boards/shields/leeloo/leeloo_rev2.keymap
+++ b/app/boards/shields/leeloo/leeloo_rev2.keymap
@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/outputs.h>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/rgb.h>
+
+// Short versions
+#define RGBON   &rgb_ug RGB_ON
+#define RGBOFF  &rgb_ug RGB_OFF
+#define RGBTOG  &rgb_ug RGB_TOG
+#define RGBHUI  &rgb_ug RGB_HUI
+#define RGBHUD  &rgb_ug RGB_HUD
+#define RGBSAI  &rgb_ug RGB_SAI
+#define RGBSAD  &rgb_ug RGB_SAD
+#define RGBBRI  &rgb_ug RGB_BRI
+#define RGBBRD  &rgb_ug RGB_BRD
+#define RGBEFF  &rgb_ug RGB_EFF
+
+
+/*
+ * Assign the cs-gpios pin to 4.
+ * Uncomment these next few lines if implementing nice!view Displays
+ */
+//nice_view_spi: &spi0 {
+//  cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+//};
+
+
+/ {
+
+    keymap {
+        compatible = "zmk,keymap";
+
+        default_layer {
+            label = " QWERTY";
+            bindings = <
+&kp ESC    &kp N1     &kp N2     &kp N3     &kp N4     &kp N5                           &kp N6     &kp N7     &kp N8     &kp N9     &kp N0     &kp BSLH
+&kp TAB    &kp Q      &kp W      &kp E      &kp R      &kp T                            &kp Y      &kp U      &kp I      &kp O      &kp P      &kp GRAV
+&kp CAPS   &kp A      &kp S      &kp D      &kp F      &kp G                            &kp H      &kp J      &kp K      &kp L      &kp SEMI   &kp SQT
+&kp LSHFT  &kp Z      &kp X      &kp C      &kp V      &kp B     &kp LGUI    &kp RGUI   &kp N      &kp M      &kp COMMA  &kp DOT    &kp FSLH   &kp RSHFT
+                             &kp LALT   &kp LCTRL  &lt 1 RET  &lt 2 MINUS    &lt 2 EQUAL  &lt 1 SPACE  &kp BSPC   &kp DEL
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+
+        lower_layer {
+            label = " Lower";
+            bindings = <
+&trans     &kp F1     &kp F2     &kp F3     &kp F4     &kp F5                           &kp F6     &kp F7     &kp F8     &kp F9     &kp F10    &kp F11
+&trans     &trans     &trans     &trans     &trans     &trans                           &kp PG_UP  &kp HOME   &kp UP     &kp END    &trans     &kp F12
+&trans     &trans     &trans     &trans     &trans     &trans                           &kp PG_DN  &kp LEFT   &kp DOWN   &kp RIGHT  &trans     &trans
+&trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+                                 &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+
+        raise_layer {
+            label = " Raise";
+            bindings = <
+&trans     &trans     &trans     &trans     &trans     &trans                           &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4  &trans
+&trans     &trans     &trans     &trans     &trans     &trans                           &trans        &trans        &trans        &trans        &sys_reset    &bootloader
+RGBON      RGBTOG     RGBHUI     RGBSAI     RGBBRI     &trans                           &trans        &trans        &trans        &trans        &trans        &trans
+RGBOFF     RGBEFF     RGBHUD     RGBSAD     RGBBRD     &trans     &trans     &trans     &trans        &trans        &trans        &trans        &trans        &trans
+                                 &trans     &trans     &trans     &trans     &trans     &trans        &bt BT_CLR    &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+        };
+
+    };
+};
--- a/app/boards/shields/leeloo/leeloo_rev2.zmk.yml
+++ b/app/boards/shields/leeloo/leeloo_rev2.zmk.yml
@ -0,0 +1,15 @@
+file_format: "1"
+id: leeloo_rev2
+name: Leeloo v2
+type: shield
+url: https://clicketysplit.ca/pages/leeloo
+requires: [pro_micro]
+exposes: [i2c_oled]
+features:
+  - keys
+  - display
+  - encoder
+  - underglow
+siblings:
+  - leeloo_rev2_left
+  - leeloo_rev2_right
--- a/app/boards/shields/leeloo/leeloo_rev2_left.overlay
+++ b/app/boards/shields/leeloo/leeloo_rev2_left.overlay
@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "leeloo_rev2.dtsi"
+
+&kscan0 {
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        ;
+};
+
+&left_encoder {
+    status = "okay";
+};
--- a/app/boards/shields/leeloo/leeloo_rev2_right.overlay
+++ b/app/boards/shields/leeloo/leeloo_rev2_right.overlay
@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "leeloo_rev2.dtsi"
+
+&default_transform {
+    col-offset = <6>;
+};
+
+&kscan0 {
+    col-gpios
+        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
+};
+
+&right_encoder {
+    status = "okay";
+};
--- a/app/boards/shields/leeloo/leeloo_right.overlay
+++ b/app/boards/shields/leeloo/leeloo_right.overlay
@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2022 The ZMK Contributors
- *
+ * Copyright (c) 2023 The ZMK Contributors
 * SPDX-License-Identifier: MIT
 */
+
 #include "leeloo.dtsi"

 &default_transform {
--- a/app/boards/shields/leeloo_micro/Kconfig.defconfig
+++ b/app/boards/shields/leeloo_micro/Kconfig.defconfig
@ -0,0 +1,49 @@
+# Copyright (c) 2023 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_LEELOO_MICRO_LEFT
+
+config ZMK_KEYBOARD_NAME
+    default "Leeloo-Micro"
+
+config ZMK_SPLIT_ROLE_CENTRAL
+    default y
+
+endif
+
+if SHIELD_LEELOO_MICRO
+
+config ZMK_SPLIT
+    default y
+
+if ZMK_DISPLAY
+
+config I2C
+    default y
+
+config SSD1306
+    default y
+
+config SSD1306_REVERSE_MODE
+    default y
+
+endif # ZMK_DISPLAY
+
+if LVGL
+
+config LV_Z_VDB_SIZE
+    default 64
+
+config LV_Z_DPI
+    default 148
+
+config LV_Z_BITS_PER_PIXEL
+    default 1
+
+choice LV_COLOR_DEPTH
+    default LV_COLOR_DEPTH_1
+endchoice
+
+endif # LVGL
+
+endif
--- a/app/boards/shields/leeloo_micro/Kconfig.shield
+++ b/app/boards/shields/leeloo_micro/Kconfig.shield
@ -0,0 +1,13 @@
+# Copyright (c) 2023 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_LEELOO_MICRO
+    bool
+
+config SHIELD_LEELOO_MICRO_LEFT
+    def_bool $(shields_list_contains,leeloo_micro_left)
+    select SHIELD_LEELOO_MICRO
+
+config SHIELD_LEELOO_MICRO_RIGHT
+    def_bool $(shields_list_contains,leeloo_micro_right)
+    select SHIELD_LEELOO_MICRO
--- a/app/boards/shields/leeloo_micro/README.md
+++ b/app/boards/shields/leeloo_micro/README.md
@ -0,0 +1,89 @@
+# Clickety Split | Leeloo-Micro
+
+![Leeloo-Micro v1 Wireless](https://github.com/ClicketySplit/build-guides/blob/main/leeloo/images/gallery/Leeloo-Micro-v1-ZMK.jpg)
+
+Keyboard Designer: [clicketysplit.ca](https://clicketysplit.ca)
+GitHub: [ClicketySplit](https://github.com/ClicketySplit)
+Hardware Supported: nice!nano v2, nice!view v1
+
+Leeloo-Micro is a 3x5x5m derivative of Leeloo v2; inheriting the column stagger and modifiers row, yet, reducing the number of switches by removing the top row and outside columns. With Leeloo-Micro's inaugural release being wireless, it leverages nice!nanos and nice!views for its microcontrollers and displays.
+
+## Features
+
+- 3x5x5m Split Keyboard
+- Support for Kailh Low Profile Choc switches with 18mm x 18mm spacing.
+- All switch locations are socketed.
+- Support for Alps Alpine EC11 Rotary Encoders—one on each side, in one of two locations.
+  - Rotary encoder locations are socketed.
+- nice!view Displays are inherently supported, socketed, and no extra wiring is required.
+- Support for per-switch RGB underglow.
+- Support for both 110mAh or 700mAh batteries.
+- Support for Alps Alpine Micro On/off switches.
+
+# Building Leeloo-Micro ZMK Firmware
+
+ZMK Firmware: [Introduction to ZMK](https://zmk.dev/docs/)
+Installation: [Installing ZMK](https://zmk.dev/docs/user-setup)
+Customization: [Customizing ZMK](https://zmk.dev/docs/customization)
+Development Environment: [Basic Setup](https://zmk.dev/docs/development/setup)
+
+Build commands for the default keymap of Leeloo-Micro:
+
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_micro_left
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_micro_right
+```
+
+Build commands for your custom keymap of Leeloo-Micro:
+
+```
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=leeloo_micro_right -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo_micro/config"
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=leeloo_micro_left -DZMK_CONFIG="C:/dev/zmk/[yourName]/leeloo_micro/config"
+```
+
+## Building Leeloo-Micro's ZMK Firmware with nice!view Displays
+
+There are a couple of files that need to be adjusted before the build commands can be run.
+
+### Edit the leeloo_micro.keymap File
+
+Near the top 3rd of the leeloo_micro.keymap file, locate the following code block:
+
+```
+//nice_view_spi: &spi0 {
+//  cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+//};
+```
+
+Remove the forward slashes to resemble the following:
+
+```
+nice_view_spi: &spi0 {
+    cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+};
+```
+
+Save your changes and close the file.
+
+### Sample Build Commands for nice!view Displays
+
+Build commands for the default keymap of Leeloo-Micro:
+
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD="leeloo_micro_left nice_view_adapter nice_view"
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD="leeloo_micro_right nice_view_adapter nice_view"
+```
+
+Build commands for your custom keymap of Leeloo-Micro:
+
+```
+west build -d build/left -p -b nice_nano_v2 -- -DSHIELD="leeloo_micro_left nice_view_adapter nice_view" -DZMK_CONFIG="/workspaces/zmk-config/[yourName]/leeloo_micro/config"
+west build -d build/right -p -b nice_nano_v2 -- -DSHIELD="leeloo_micro_right nice_view_adapter nice_view" -DZMK_CONFIG="/workspaces/zmk-config/[yourName]/leeloo_micro/config"
+```
+
+# Support
+
+If you have any questions with regards to Leeloo-Micro, please [Contact Us](https://clicketysplit.ca/pages/contact-us).
+
+Clickety Split
+For the love of split keyboards.
--- a/app/boards/shields/leeloo_micro/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/leeloo_micro/boards/nice_nano_v2.overlay
@ -0,0 +1,47 @@
+#include <dt-bindings/led/led.h>
+
+&pinctrl {
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+        };
+    };
+
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+            low-power-enable;
+        };
+    };
+};
+
+&spi3 {
+    compatible = "nordic,nrf-spim";
+    status = "okay";
+
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
+
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";
+
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <4000000>;
+
+        /* WS2812 */
+        chain-length = <20>; /* arbitrary; change at will */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
+    };
+};
+
+/ {
+    chosen {
+        zmk,underglow = &led_strip;
+    };
+};
--- a/app/boards/shields/leeloo_micro/leeloo_micro.conf
+++ b/app/boards/shields/leeloo_micro/leeloo_micro.conf
@ -0,0 +1,38 @@
+# Copyright (c) 2023 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+# Uncomment the following line to enable the OLED Display
+# CONFIG_ZMK_DISPLAY=y
+
+# Uncomment to turn off WPM Status.
+# CONFIG_ZMK_WIDGET_WPM_STATUS=n
+
+# Uncomment to invert colour, if using nice!view Displays
+# CONFIG_ZMK_DISPLAY_INVERT=y
+
+
+# Uncomment the following line to enable per-key lighting
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+
+# Use the STRIP config specific to the LEDs you're using
+# CONFIG_WS2812_STRIP=y
+
+# Keep OLED or nice!view Displays on even when toggling off LEDs
+# Change to y if you wish to toggle Displays on and off with LEDs
+# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
+
+# Turn off LEDs when idle.
+# Change to n if you wish to keep LEDs on even when idle.
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
+
+# When USB is disconnected, turn off LEDs
+# Change to n if you wish to keep LEDs on even when USB is unpluged.
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB=y
+
+# Start LEDs off at 75%
+# CONFIG_ZMK_RGB_UNDERGLOW_BRT_START=75
+
+
+# Uncomment these two lines to add support for encoders
+# CONFIG_EC11=y
+# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
--- a/app/boards/shields/leeloo_micro/leeloo_micro.dtsi
+++ b/app/boards/shields/leeloo_micro/leeloo_micro.dtsi
@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
+
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
+//
+// | SW1  | SW2  | SW3  | SW4  | SW5  |                 | SW15 | SW4  | SW3  | SW2  | SW1  |
+// | SW6  | SW7  | SW8  | SW9  | SW10 |                 | SW10 | SW9  | SW8  | SW7  | SW6  |
+// | SW11 | SW12 | SW13 | SW14 | SW15 | SW20 |   | SW20 | SW15 | SW14 | SW13 | SW12 | SW11 |
+//               | SW16 | SW17 | SW18 | SW19 |   | SW19 | SW18 | SW17 | SW16 |
+        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(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(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(3,4) RC(3,5) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+                RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
+        >;
+    };
+
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+
+        diode-direction = "col2row";
+
+        row-gpios
+            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
+
+    left_encoder: left_encoder {
+        compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        steps = <120>;
+    };
+
+    right_encoder: right_encoder {
+        compatible = "alps,ec11";
+        label = "RIGHT_ENCODER";
+        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        steps = <120>;
+    };
+
+    sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&left_encoder &right_encoder>;
+        triggers-per-rotation = <30>;
+    };
+
+};
+
+&pro_micro_i2c {
+    status = "okay";
+
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        segment-remap;
+        com-invdir;
+        com-sequential;
+        prechargep = <0x22>;
+    };
+};
--- a/app/boards/shields/leeloo_micro/leeloo_micro.keymap
+++ b/app/boards/shields/leeloo_micro/leeloo_micro.keymap
@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/outputs.h>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/rgb.h>
+
+// Layers
+#define QW_M    0       // Main
+#define QW_L    1       // Lower
+#define QW_R    2       // Raise
+#define QW_A    3       // Adjust
+
+#define QC_N    4       // Number Pad
+#define QC_B    5       // Firmware
+
+
+// Short versions
+#define BT0         BT_SEL 0
+#define BT1         BT_SEL 1
+#define BT2         BT_SEL 2
+#define BT3         BT_SEL 3
+#define BT4         BT_SEL 4
+
+#define BOOTLDR     &bootloader
+
+#define RGBON   &rgb_ug RGB_ON
+#define RGBOFF  &rgb_ug RGB_OFF
+#define RGBTOG  &rgb_ug RGB_TOG
+#define RGBHUI  &rgb_ug RGB_HUI
+#define RGBHUD  &rgb_ug RGB_HUD
+#define RGBSAI  &rgb_ug RGB_SAI
+#define RGBSAD  &rgb_ug RGB_SAD
+#define RGBBRI  &rgb_ug RGB_BRI
+#define RGBBRD  &rgb_ug RGB_BRD
+#define RGBEFF  &rgb_ug RGB_EFF
+
+
+/*
+ * Assign the cs-gpios pin to 4.
+ * Uncomment these next few lines if implementing nice!view Displays.
+ */
+//nice_view_spi: &spi0 {
+//  cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>;
+//};
+
+
+/ {
+    conditional_layers {
+        compatible = "zmk,conditional-layers";
+        adjust_layer {
+            if-layers = <QW_L QW_R>;
+            then-layer = <QW_A>;
+        };
+    };
+
+    combos {
+        compatible = "zmk,combos";
+
+        combo_esc {
+            timeout-ms = <50>;
+            key-positions = <0 1>;
+            layers = <QW_M>;
+            bindings = <&kp ESC>;
+        };
+    };
+
+    keymap {
+        compatible = "zmk,keymap";
+
+        default_layer {
+            label = " QWERTY";
+            bindings = <
+&kp Q      &kp W      &kp E      &kp R      &kp T                            &kp Y      &kp U      &kp I      &kp O      &kp P
+&kp A      &kp S      &kp D      &kp F      &kp G                            &kp H      &kp J      &kp K      &kp L      &kp SEMI
+&mt LSFT Z &kp X      &kp C      &kp V      &kp B     &mo QC_N    &kp RGUI   &kp N      &kp M      &kp COMMA  &kp DOT    &mt RSFT FSLH
+                  &kp LALT   &kp LCTRL  &lt 1 RET  &lt 2 MINUS    &lt 2 EQUAL  &lt 1 SPACE  &kp BSPC   &mo QC_B
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+        lower_layer {
+            label = " Lower";
+            bindings = <
+&kp N1     &kp N2     &kp N3     &kp N4     &kp N5                           &kp N6     &kp N7     &kp N8     &kp N9     &kp N0
+&trans     &trans     &trans     &trans     &trans                           &trans     &trans     &trans     &trans     &kp QUOT
+&kp LSHFT  &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &kp RSHFT
+                      &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+        raise_layer {
+            label = " Raise";
+            bindings = <
+&kp TAB    &trans     &trans     &trans     &trans                           &kp PG_UP  &kp HOME   &kp UP     &kp END    &kp BSLH
+&kp CAPS   &trans     &trans     &trans     &trans                           &kp PG_DN  &kp LEFT   &kp DOWN   &kp RIGHT  &kp GRAVE
+&trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &mt RSFT TILDE
+                      &trans     &trans     &trans     &trans     &trans     &trans     &kp DEL    &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+        adjust_layer {
+            label = " Adjust";
+            bindings = <
+
+&kp F1     &kp F2     &kp F3     &kp F4     &kp F5                           &trans     &trans     &trans     &trans     &trans
+&kp F6     &kp F7     &kp F8     &kp F9     &kp F10                          &trans     &trans     &trans     &trans     &trans
+&kp F11    &kp F12    &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+                      &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+        numpad_layer {
+            label = " NumPad";
+            bindings = <
+
+&trans     &none      &none      &none      &none                            &kp SLASH  &kp N7     &kp N8     &kp N9     &kp MINUS
+RGBON      RGBTOG     RGBHUI     RGBSAI     RGBBRI                           &kp ASTRK  &kp N4     &kp N5     &kp N6     &kp PLUS
+RGBOFF     RGBEFF     RGBHUD     RGBSAD     RGBBRD     &trans     &trans     &none      &kp N1     &kp N2     &kp N3     &kp EQUAL
+                      &trans     &trans     &trans     &trans     &trans     &kp N0     &kp DOT    &none
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+        ble_layer {
+            label = " BLE";
+            bindings = <
+
+&bt BT0    &bt BT1    &bt BT2    &bt BT3    &bt BT4                          &bt BT0    &bt BT1    &bt BT2    &bt BT3    &bt BT4
+BOOTLDR    &sys_reset &trans     &trans     &trans                           &trans     &trans     &trans     &sys_reset BOOTLDR
+&trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans     &trans
+                      &trans     &bt BT_CLR &trans     &trans     &trans     &trans     &bt BT_CLR &trans
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP>;
+        };
+
+    };
+};
--- a/app/boards/shields/leeloo_micro/leeloo_micro.zmk.yml
+++ b/app/boards/shields/leeloo_micro/leeloo_micro.zmk.yml
@ -0,0 +1,15 @@
+file_format: "1"
+id: leeloo_micro
+name: Leeloo-Micro
+type: shield
+url: https://clicketysplit.ca/pages/leeloo-micro
+requires: [pro_micro]
+exposes: [i2c_oled]
+features:
+  - keys
+  - display
+  - encoder
+  - underglow
+siblings:
+  - leeloo_micro_left
+  - leeloo_micro_right
--- a/app/boards/shields/leeloo_micro/leeloo_micro_left.overlay
+++ b/app/boards/shields/leeloo_micro/leeloo_micro_left.overlay
@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "leeloo_micro.dtsi"
+
+&kscan0 {
+    col-gpios
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        ;
+};
+
+&left_encoder {
+    status = "okay";
+};
--- a/app/boards/shields/leeloo_micro/leeloo_micro_right.overlay
+++ b/app/boards/shields/leeloo_micro/leeloo_micro_right.overlay
@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "leeloo_micro.dtsi"
+
+&default_transform {
+    col-offset = <5>;
+};
+
+&kscan0 {
+    col-gpios
+        = <&pro_micro 16 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        ;
+};
+
+&right_encoder {
+    status = "okay";
+};