From 154e397333207695f65f878312a0a9a2ef071227 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Sun, 1 May 2022 14:09:47 -0400 Subject: [PATCH] apply oled update from zmk zephyr 3.0 announcement --- .../shields/artboard/artboard_left.overlay | 41 ++++++++-------- .../shields/artboard/artboard_right.overlay | 47 +++++++++--------- .../corne_left/corne_5_col_ardux_left.overlay | 41 ++++++++-------- .../corne_5_col_ardux_left_big.overlay | 41 ++++++++-------- .../corne_left/corne_ardux_left.overlay | 41 ++++++++-------- .../corne_5_col_ardux_right.overlay | 41 ++++++++-------- .../corne_5_col_ardux_right_big.overlay | 41 ++++++++-------- .../corne_right/corne_ardux_right.overlay | 41 ++++++++-------- .../the_paintbrush_left.overlay | 47 +++++++++--------- .../the_paintbrush_right.overlay | 49 ++++++++++--------- .../tidbit_ardux_left.overlay | 41 ++++++++-------- .../tidbit_ardux_right.overlay | 41 ++++++++-------- 12 files changed, 262 insertions(+), 250 deletions(-) diff --git a/config/boards/shields/artboard/artboard_left.overlay b/config/boards/shields/artboard/artboard_left.overlay index 6628660..5dcd9ef 100644 --- a/config/boards/shields/artboard/artboard_left.overlay +++ b/config/boards/shields/artboard/artboard_left.overlay @@ -6,9 +6,30 @@ #include + &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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; + zephyr,display = &oled; }; kscan0: kscan_0 { @@ -28,23 +49,3 @@ ; }; }; - -&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>; - }; -}; \ No newline at end of file diff --git a/config/boards/shields/artboard/artboard_right.overlay b/config/boards/shields/artboard/artboard_right.overlay index d02903d..7352025 100644 --- a/config/boards/shields/artboard/artboard_right.overlay +++ b/config/boards/shields/artboard/artboard_right.overlay @@ -6,29 +6,6 @@ #include -/ { - chosen { - zmk,kscan = &kscan0; - }; - - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-direct"; - - label = "KSCAN"; - - input-gpios - = <&pro_micro_d 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; - }; -}; - &pro_micro_i2c { status = "okay"; @@ -48,3 +25,27 @@ prechargep = <0x22>; }; }; + +/ { + chosen { + zmk,kscan = &kscan0; + zephyr,display = &oled; + }; + + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-direct"; + + label = "KSCAN"; + + input-gpios + = <&pro_micro_d 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; + }; +}; diff --git a/config/boards/shields/corne_left/corne_5_col_ardux_left.overlay b/config/boards/shields/corne_left/corne_5_col_ardux_left.overlay index 4ded30b..f85cfbd 100644 --- a/config/boards/shields/corne_left/corne_5_col_ardux_left.overlay +++ b/config/boards/shields/corne_left/corne_5_col_ardux_left.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/corne_left/corne_5_col_ardux_left_big.overlay b/config/boards/shields/corne_left/corne_5_col_ardux_left_big.overlay index 4ded30b..f85cfbd 100644 --- a/config/boards/shields/corne_left/corne_5_col_ardux_left_big.overlay +++ b/config/boards/shields/corne_left/corne_5_col_ardux_left_big.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/corne_left/corne_ardux_left.overlay b/config/boards/shields/corne_left/corne_ardux_left.overlay index dcff8a7..58cff20 100644 --- a/config/boards/shields/corne_left/corne_ardux_left.overlay +++ b/config/boards/shields/corne_left/corne_ardux_left.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/corne_right/corne_5_col_ardux_right.overlay b/config/boards/shields/corne_right/corne_5_col_ardux_right.overlay index 7d12d32..84febb3 100644 --- a/config/boards/shields/corne_right/corne_5_col_ardux_right.overlay +++ b/config/boards/shields/corne_right/corne_5_col_ardux_right.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(3,0) RC(3,1) RC(3,2) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/corne_right/corne_5_col_ardux_right_big.overlay b/config/boards/shields/corne_right/corne_5_col_ardux_right_big.overlay index 7d12d32..84febb3 100644 --- a/config/boards/shields/corne_right/corne_5_col_ardux_right_big.overlay +++ b/config/boards/shields/corne_right/corne_5_col_ardux_right_big.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(3,0) RC(3,1) RC(3,2) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/corne_right/corne_ardux_right.overlay b/config/boards/shields/corne_right/corne_ardux_right.overlay index 046135d..8a561d8 100644 --- a/config/boards/shields/corne_right/corne_ardux_right.overlay +++ b/config/boards/shields/corne_right/corne_ardux_right.overlay @@ -6,10 +6,31 @@ #include +&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>; + }; +}; + / { chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zephyr,display = &oled; }; default_transform: keymap_transform_0 { @@ -52,23 +73,3 @@ RC(3,0) RC(3,1) RC(3,2) // TODO: per-key RGB node(s)? }; - -&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>; - }; -}; diff --git a/config/boards/shields/the_paintbrush/the_paintbrush_left.overlay b/config/boards/shields/the_paintbrush/the_paintbrush_left.overlay index 53dce07..d63743d 100644 --- a/config/boards/shields/the_paintbrush/the_paintbrush_left.overlay +++ b/config/boards/shields/the_paintbrush/the_paintbrush_left.overlay @@ -6,29 +6,6 @@ #include -/ { - chosen { - zmk,kscan = &kscan0; - }; - - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-direct"; - - label = "KSCAN"; - - input-gpios - = <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; - }; -}; - &pro_micro_i2c { status = "okay"; @@ -48,3 +25,27 @@ prechargep = <0x22>; }; }; + +/ { + chosen { + zmk,kscan = &kscan0; + zephyr,display = &oled; + }; + + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-direct"; + + label = "KSCAN"; + + input-gpios + = <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; + }; +}; diff --git a/config/boards/shields/the_paintbrush/the_paintbrush_right.overlay b/config/boards/shields/the_paintbrush/the_paintbrush_right.overlay index 12294a9..b706e95 100644 --- a/config/boards/shields/the_paintbrush/the_paintbrush_right.overlay +++ b/config/boards/shields/the_paintbrush/the_paintbrush_right.overlay @@ -6,30 +6,6 @@ #include -/ { - chosen { - zmk,kscan = &kscan0; - }; - - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-direct"; - - label = "KSCAN"; - - input-gpios - = <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; - - }; -}; - &pro_micro_i2c { status = "okay"; @@ -49,3 +25,28 @@ prechargep = <0x22>; }; }; + +/ { + chosen { + zmk,kscan = &kscan0; + zephyr,display = &oled; + }; + + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-direct"; + + label = "KSCAN"; + + input-gpios + = <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; + + }; +}; diff --git a/config/boards/shields/tidbit_ardux_left/tidbit_ardux_left.overlay b/config/boards/shields/tidbit_ardux_left/tidbit_ardux_left.overlay index ce1e00a..f65147e 100644 --- a/config/boards/shields/tidbit_ardux_left/tidbit_ardux_left.overlay +++ b/config/boards/shields/tidbit_ardux_left/tidbit_ardux_left.overlay @@ -6,6 +6,26 @@ #include +&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>; + }; +}; + / { kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; @@ -46,25 +66,6 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; - }; -}; - -&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>; + zephyr,display = &oled; }; }; diff --git a/config/boards/shields/tidbit_ardux_right/tidbit_ardux_right.overlay b/config/boards/shields/tidbit_ardux_right/tidbit_ardux_right.overlay index 8e53f07..19963a9 100644 --- a/config/boards/shields/tidbit_ardux_right/tidbit_ardux_right.overlay +++ b/config/boards/shields/tidbit_ardux_right/tidbit_ardux_right.overlay @@ -6,6 +6,26 @@ #include +&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>; + }; +}; + / { kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; @@ -46,25 +66,6 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; - }; -}; - -&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>; + zephyr,display = &oled; }; };