From 4edb09eb778cbc8d8eaf1d089fbfbab2758681ce Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Sat, 22 May 2021 23:26:31 +0530 Subject: [PATCH 01/16] add pteron to list of shield --- app/boards/shields/pteron36/Kconfig.defconfig | 23 ++++++ app/boards/shields/pteron36/Kconfig.shield | 5 ++ app/boards/shields/pteron36/pteron36.dtsi | 80 +++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 app/boards/shields/pteron36/Kconfig.defconfig create mode 100644 app/boards/shields/pteron36/Kconfig.shield create mode 100644 app/boards/shields/pteron36/pteron36.dtsi diff --git a/app/boards/shields/pteron36/Kconfig.defconfig b/app/boards/shields/pteron36/Kconfig.defconfig new file mode 100644 index 00000000..142f2e26 --- /dev/null +++ b/app/boards/shields/pteron36/Kconfig.defconfig @@ -0,0 +1,23 @@ +if SHIELD_PTERON36_LEFT + +config ZMK_KEYBOARD_NAME + default "Pteron36 Left" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif + +if SHIELD_PTERON36_RIGHT + +config ZMK_KEYBOARD_NAME + default "Pteron36 Right" + +endif + +if SHIELD_PTERON36_LEFT || SHIELD_PTERON36_RIGHT + +config ZMK_SPLIT + default y + +endif \ No newline at end of file diff --git a/app/boards/shields/pteron36/Kconfig.shield b/app/boards/shields/pteron36/Kconfig.shield new file mode 100644 index 00000000..ef8419ef --- /dev/null +++ b/app/boards/shields/pteron36/Kconfig.shield @@ -0,0 +1,5 @@ +config SHIELD_PTERON36_LEFT + def_bool $(shields_list_contains,pteron36_left) + +config SHIELD_PTERON36_RIGHT + def_bool $(shields_list_contains,pteron36_right) \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi new file mode 100644 index 00000000..24c9f529 --- /dev/null +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <16>; + rows = <5>; +// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | +// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | +// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | +// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | +// | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | + 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(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,4) RC(3,5) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + }; + +/* left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&left_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>; + }; +}; From 8d94cf0c10ae598401bc65c3e980c7c18aac36fb Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sat, 22 May 2021 18:51:11 +0530 Subject: [PATCH 02/16] finizlise pteron config --- app/boards/shields/pteron36/pteron36.conf | 0 app/boards/shields/pteron36/pteron36.dtsi | 21 ++- app/boards/shields/pteron36/pteron36.keymap | 150 ++++++++++++++++++ .../shields/pteron36/pteron36_left.conf | 0 .../shields/pteron36/pteron36_left.overlay | 21 +++ .../shields/pteron36/pteron36_right.conf | 0 .../shields/pteron36/pteron36_right.overlay | 21 +++ 7 files changed, 202 insertions(+), 11 deletions(-) create mode 100644 app/boards/shields/pteron36/pteron36.conf create mode 100644 app/boards/shields/pteron36/pteron36.keymap create mode 100644 app/boards/shields/pteron36/pteron36_left.conf create mode 100644 app/boards/shields/pteron36/pteron36_left.overlay create mode 100644 app/boards/shields/pteron36/pteron36_right.conf create mode 100644 app/boards/shields/pteron36/pteron36_right.overlay diff --git a/app/boards/shields/pteron36/pteron36.conf b/app/boards/shields/pteron36/pteron36.conf new file mode 100644 index 00000000..e69de29b diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index 24c9f529..5dd3a301 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -14,18 +14,18 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <16>; - rows = <5>; -// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | -// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | -// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | -// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | -// | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | + columns = <10>; + rows = <4>; +// SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | + +// SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | +// SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | +// SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | 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(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,4) RC(3,5) + RC(3,0) RC(3,1) RC(3,2) RC(3,5) RC(3,6) RC(3,7) >; }; @@ -33,11 +33,10 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; - diode-direction = "col2row"; + diode-direction = "row2col"; row-gpios - = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; diff --git a/app/boards/shields/pteron36/pteron36.keymap b/app/boards/shields/pteron36/pteron36.keymap new file mode 100644 index 00000000..58540983 --- /dev/null +++ b/app/boards/shields/pteron36/pteron36.keymap @@ -0,0 +1,150 @@ +#include +#include +#include +#include +#include + +#define BASE 0 +#define NAVR 1 +#define MOUR 2 +#define MEDR 3 +#define NSL 4 +#define NSSL 5 +#define FUNL 6 + +/ { + behaviors { + hm: homerow_mods { + compatible = "zmk,behavior-hold-tap"; + label = "HOMEROW_MODS"; + #binding-cells = <2>; + tapping-term-ms = <200>; + quick_tap_ms = <0>; + flavor = "tap-preferred"; + bindings = <&kp>, <&kp>; + }; + }; + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------------------------ +// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | +// | TAB | Q | W | E | R | T | | Y | U | I | O | P | - | +// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | "[" | | "]" | N | M | , | . | / | SHIFT | +// | ALT | GUI | LOWER| SPACE | | ENTER | RAISE| BSPC | GUI | + bindings = < + + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &hm LGUI A &hm LALT S &hm LCTL D &hm LSHFT F &kp G &kp H &hm RSHFT J &hm LCTL K &hm RALT L &hm RGUI APOS + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH + < MEDR ESC < NAVR SPACE < MOUR TAB < NSSL RET < NSL BSPC < FUNL DEL + >; + + + }; + + navr_layer { +// ------------------------------------------------------------------------------------------------------------ +// | BTCLR | BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | +// | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | ~ | +// | | | | | | | | | | | _ | + | { | } | "|" | +// | | | | | | | | | | + bindings = < + + &trans &trans &trans &trans &trans &kp C_AC_REDO &kp C_AC_PASTE &kp C_AC_COPY &kp C_AC_CUT &kp C_AC_UNDO + &trans &trans &trans &trans &trans &kp CAPS &kp LEFT &kp DOWN &kp UP &kp RIGHT + &trans &trans &trans &trans &trans &kp INS &kp HOME &kp PGDN &kp PGUP &kp END + &trans &trans &trans &trans &trans &trans + >; + + + }; + + mour_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | | | + bindings = < + &kp F12 &kp F7 &kp F8 &kp F9 &kp PSCRN &trans &trans &trans &trans &trans + &kp F11 &kp F4 &kp F5 &kp F6 &kp SLCK &trans &trans &trans &trans &trans + &kp F10 &kp F1 &kp F2 &kp F3 &kp PAUSE_BREAK &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans + >; + + + }; + + medr_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | | | + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_NEXT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &kp C_STOP &kp C_PP &kp C_MUTE + >; + + + }; + + nsl_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | | | + bindings = < + &kp LBKT &kp N7 &kp N8 &kp N9 &kp RBKT &trans &trans &trans &trans &trans + &kp SEMICOLON &kp N4 &kp N5 &kp N6 &kp EQUAL &trans &trans &trans &trans &trans + &kp GRAVE &kp N1 &kp N2 &kp N3 &kp BSLH &trans &trans &trans &trans &trans + &kp DOT &kp N0 &kp MINUS &trans &trans &trans + >; + + + }; + + nssl_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | | | + bindings = < + &kp LS(LBKT) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(RBKT) &trans &trans &trans &trans &trans + &kp LS(SEMICOLON) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(EQUAL) &trans &trans &trans &trans &trans + &kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(BSLH) &trans &trans &trans &trans &trans + &kp LS(DOT) &kp LS(N0) &kp LS(MINUS) &trans &trans &trans &trans + >; + + + }; + + funl_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | | | + bindings = < + + &kp F12 &kp F7 &kp F8 &kp F9 &kp PSCRN &trans &trans &trans &trans &trans + &kp F11 &kp F4 &kp F5 &kp F6 &kp SLCK &trans &trans &trans &trans &trans + &kp F10 &kp F1 &kp F2 &kp F3 &kp PAUSE_BREAK &trans &trans &trans &trans &trans + &kp K_APP &kp SPACE &kp TAB &trans &trans &trans + >; + + + }; \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36_left.conf b/app/boards/shields/pteron36/pteron36_left.conf new file mode 100644 index 00000000..e69de29b diff --git a/app/boards/shields/pteron36/pteron36_left.overlay b/app/boards/shields/pteron36/pteron36_left.overlay new file mode 100644 index 00000000..eafbeef1 --- /dev/null +++ b/app/boards/shields/pteron36/pteron36_left.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "pteron36.dtsi" + +&kscan0 { + col-gpios + = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + ; +}; + +/*&left_encoder { + status = "okay"; +};*/ diff --git a/app/boards/shields/pteron36/pteron36_right.conf b/app/boards/shields/pteron36/pteron36_right.conf new file mode 100644 index 00000000..e69de29b diff --git a/app/boards/shields/pteron36/pteron36_right.overlay b/app/boards/shields/pteron36/pteron36_right.overlay new file mode 100644 index 00000000..3f1f158f --- /dev/null +++ b/app/boards/shields/pteron36/pteron36_right.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "pteron36.dtsi" + +&default_transform { + col-offset = <5>; +}; + +&kscan0 { + col-gpios + = <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + ; +}; From 7efbd5d63b0355fda2afd7207032ee81646767c5 Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Sun, 23 May 2021 00:55:26 +0530 Subject: [PATCH 03/16] fixed keymap filef' --- app/boards/shields/pteron36/pteron36.keymap | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.keymap b/app/boards/shields/pteron36/pteron36.keymap index 58540983..a934f4f7 100644 --- a/app/boards/shields/pteron36/pteron36.keymap +++ b/app/boards/shields/pteron36/pteron36.keymap @@ -125,7 +125,7 @@ &kp LS(LBKT) &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp LS(RBKT) &trans &trans &trans &trans &trans &kp LS(SEMICOLON) &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp LS(EQUAL) &trans &trans &trans &trans &trans &kp LS(GRAVE) &kp LS(N1) &kp LS(N2) &kp LS(N3) &kp LS(BSLH) &trans &trans &trans &trans &trans - &kp LS(DOT) &kp LS(N0) &kp LS(MINUS) &trans &trans &trans &trans + &kp LS(DOT) &kp LS(N0) &kp LS(MINUS) &trans &trans &trans >; @@ -147,4 +147,8 @@ >; - }; \ No newline at end of file + }; + + }; + +}; \ No newline at end of file From 3064bfabb8c99933480806753b1d279c029434c1 Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 23 May 2021 19:18:15 +0530 Subject: [PATCH 04/16] change col direction --- app/boards/shields/pteron36/pteron36.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index 5dd3a301..c4bd8acc 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -33,7 +33,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; - diode-direction = "row2col"; + diode-direction = "col2row"; row-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> From 5c348467e93ebeec8858445b077a22875985143c Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Sun, 23 May 2021 20:00:06 +0530 Subject: [PATCH 05/16] fix pull down setting for row and cols --- app/boards/shields/pteron36/pteron36.dtsi | 8 ++++---- app/boards/shields/pteron36/pteron36_left.overlay | 10 +++++----- app/boards/shields/pteron36/pteron36_right.overlay | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index 5dd3a301..e528944c 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -35,10 +35,10 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) diode-direction = "row2col"; row-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH )> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH )> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH )> ; }; diff --git a/app/boards/shields/pteron36/pteron36_left.overlay b/app/boards/shields/pteron36/pteron36_left.overlay index eafbeef1..0442bec4 100644 --- a/app/boards/shields/pteron36/pteron36_left.overlay +++ b/app/boards/shields/pteron36/pteron36_left.overlay @@ -8,11 +8,11 @@ &kscan0 { col-gpios - = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; diff --git a/app/boards/shields/pteron36/pteron36_right.overlay b/app/boards/shields/pteron36/pteron36_right.overlay index 3f1f158f..ae573512 100644 --- a/app/boards/shields/pteron36/pteron36_right.overlay +++ b/app/boards/shields/pteron36/pteron36_right.overlay @@ -12,10 +12,10 @@ &kscan0 { col-gpios - = <&pro_micro_d 16 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + = <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; From 61e1cec4b725bb347eaf251afdb8777d8c6a2f8d Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Sun, 23 May 2021 20:03:47 +0530 Subject: [PATCH 06/16] fix firmware --- app/boards/shields/pteron36/pteron36.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index a987997d..e528944c 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -33,7 +33,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; - diode-direction = "col2row"; + diode-direction = "row2col"; row-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH)> , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH )> From 4e1e2ba8d2f738b81f47f7c89767b5c328477cd2 Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Sun, 30 May 2021 18:25:41 +0530 Subject: [PATCH 07/16] update keymap transform for left --- app/boards/shields/pteron36/pteron36.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index e528944c..840ce29d 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -25,7 +25,7 @@ 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(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,5) RC(3,6) RC(3,7) + RC(3,0) RC(3,1) RC(3,2) RC(3,7) RC(3,8) RC(3,9) >; }; From 22fc96a14f08c210dfa2994e6fb4fed4869dfd95 Mon Sep 17 00:00:00 2001 From: Minty Harshit Date: Mon, 5 Jul 2021 10:26:14 +0530 Subject: [PATCH 08/16] pteron36 update --- app/boards/shields/pteron36/Kconfig.defconfig | 36 +++++++++++++++++++ app/boards/shields/pteron36/pteron36.conf | 1 + 2 files changed, 37 insertions(+) diff --git a/app/boards/shields/pteron36/Kconfig.defconfig b/app/boards/shields/pteron36/Kconfig.defconfig index 142f2e26..9be3bdbf 100644 --- a/app/boards/shields/pteron36/Kconfig.defconfig +++ b/app/boards/shields/pteron36/Kconfig.defconfig @@ -20,4 +20,40 @@ if SHIELD_PTERON36_LEFT || SHIELD_PTERON36_RIGHT 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 LVGL_HOR_RES_MAX + default 128 + +config LVGL_VER_RES_MAX + default 32 + +config LVGL_VDB_SIZE + default 64 + +config LVGL_DPI + default 148 + +config LVGL_BITS_PER_PIXEL + default 1 + +choice LVGL_COLOR_DEPTH + default LVGL_COLOR_DEPTH_1 +endchoice + +endif # LVGL + endif \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36.conf b/app/boards/shields/pteron36/pteron36.conf index e69de29b..e5700d94 100644 --- a/app/boards/shields/pteron36/pteron36.conf +++ b/app/boards/shields/pteron36/pteron36.conf @@ -0,0 +1 @@ +CONFIG_ZMK_DISPLAY=y \ No newline at end of file From 7085eb875c835fb83614a3828792506253a11e51 Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 12:01:11 +0530 Subject: [PATCH 09/16] cleanup --- app/boards/shields/pteron36/pteron36.conf | 2 +- app/boards/shields/pteron36/pteron36.dtsi | 35 ----------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.conf b/app/boards/shields/pteron36/pteron36.conf index e5700d94..09edbc3d 100644 --- a/app/boards/shields/pteron36/pteron36.conf +++ b/app/boards/shields/pteron36/pteron36.conf @@ -1 +1 @@ -CONFIG_ZMK_DISPLAY=y \ No newline at end of file +#CONFIG_ZMK_DISPLAY=y \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index 840ce29d..c0023532 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -42,38 +42,3 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) ; }; - -/* left_encoder: encoder_left { - compatible = "alps,ec11"; - label = "LEFT_ENCODER"; - a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <4>; - }; - - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&left_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>; - }; -}; From e4ad7abeba32bbae9b7677c5ac763abc13d7460d Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 12:06:21 +0530 Subject: [PATCH 10/16] cleanup --- app/boards/shields/pteron36/Kconfig.defconfig | 36 ------------------- app/boards/shields/pteron36/pteron36.zmk.yml | 10 ++++++ .../shields/pteron36/pteron36_left.conf | 0 .../shields/pteron36/pteron36_right.conf | 0 4 files changed, 10 insertions(+), 36 deletions(-) create mode 100644 app/boards/shields/pteron36/pteron36.zmk.yml delete mode 100644 app/boards/shields/pteron36/pteron36_left.conf delete mode 100644 app/boards/shields/pteron36/pteron36_right.conf diff --git a/app/boards/shields/pteron36/Kconfig.defconfig b/app/boards/shields/pteron36/Kconfig.defconfig index 9be3bdbf..142f2e26 100644 --- a/app/boards/shields/pteron36/Kconfig.defconfig +++ b/app/boards/shields/pteron36/Kconfig.defconfig @@ -20,40 +20,4 @@ if SHIELD_PTERON36_LEFT || SHIELD_PTERON36_RIGHT 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 LVGL_HOR_RES_MAX - default 128 - -config LVGL_VER_RES_MAX - default 32 - -config LVGL_VDB_SIZE - default 64 - -config LVGL_DPI - default 148 - -config LVGL_BITS_PER_PIXEL - default 1 - -choice LVGL_COLOR_DEPTH - default LVGL_COLOR_DEPTH_1 -endchoice - -endif # LVGL - endif \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36.zmk.yml b/app/boards/shields/pteron36/pteron36.zmk.yml new file mode 100644 index 00000000..a24af0f9 --- /dev/null +++ b/app/boards/shields/pteron36/pteron36.zmk.yml @@ -0,0 +1,10 @@ +file_format: "1" +id: pteron36 +name: pteron36 +type: shield +requires: [pro_micro] +features: + - keys +siblings: + - pteron36_left + - pteron36_right \ No newline at end of file diff --git a/app/boards/shields/pteron36/pteron36_left.conf b/app/boards/shields/pteron36/pteron36_left.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/app/boards/shields/pteron36/pteron36_right.conf b/app/boards/shields/pteron36/pteron36_right.conf deleted file mode 100644 index e69de29b..00000000 From e4f210affe884a950efe436cf3d2cdd48cbbc899 Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 12:15:33 +0530 Subject: [PATCH 11/16] cleanup --- app/boards/shields/pteron36/pteron36.zmk.yml | 2 +- app/boards/shields/pteron36/pteron36_left.overlay | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.zmk.yml b/app/boards/shields/pteron36/pteron36.zmk.yml index a24af0f9..2a5b24e7 100644 --- a/app/boards/shields/pteron36/pteron36.zmk.yml +++ b/app/boards/shields/pteron36/pteron36.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" id: pteron36 -name: pteron36 +name: Pteron36 type: shield requires: [pro_micro] features: diff --git a/app/boards/shields/pteron36/pteron36_left.overlay b/app/boards/shields/pteron36/pteron36_left.overlay index 0442bec4..b9929775 100644 --- a/app/boards/shields/pteron36/pteron36_left.overlay +++ b/app/boards/shields/pteron36/pteron36_left.overlay @@ -15,7 +15,3 @@ , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; - -/*&left_encoder { - status = "okay"; -};*/ From 966934f239b2d49fb1abf127e62f13649a17939b Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 12:23:34 +0530 Subject: [PATCH 12/16] node correction --- app/boards/shields/pteron36/pteron36.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index c0023532..d040f39d 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -42,3 +42,4 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) ; }; +}; From f4ccb76692e7eb2d88e274465c0b9486c468f4db Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 13:19:28 +0530 Subject: [PATCH 13/16] update adv name, restore conf file --- app/boards/shields/pteron36/Kconfig.defconfig | 9 +-------- app/boards/shields/pteron36/pteron36.conf | 11 ++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/boards/shields/pteron36/Kconfig.defconfig b/app/boards/shields/pteron36/Kconfig.defconfig index 142f2e26..9ffb42b4 100644 --- a/app/boards/shields/pteron36/Kconfig.defconfig +++ b/app/boards/shields/pteron36/Kconfig.defconfig @@ -1,20 +1,13 @@ if SHIELD_PTERON36_LEFT config ZMK_KEYBOARD_NAME - default "Pteron36 Left" + default "Pteron36" config ZMK_SPLIT_BLE_ROLE_CENTRAL default y endif -if SHIELD_PTERON36_RIGHT - -config ZMK_KEYBOARD_NAME - default "Pteron36 Right" - -endif - if SHIELD_PTERON36_LEFT || SHIELD_PTERON36_RIGHT config ZMK_SPLIT diff --git a/app/boards/shields/pteron36/pteron36.conf b/app/boards/shields/pteron36/pteron36.conf index 09edbc3d..f730efeb 100644 --- a/app/boards/shields/pteron36/pteron36.conf +++ b/app/boards/shields/pteron36/pteron36.conf @@ -1 +1,10 @@ -#CONFIG_ZMK_DISPLAY=y \ No newline at end of file + +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +# Uncomment the following line to enable the Lotus58 OLED Display +# CONFIG_ZMK_DISPLAY=y + +# Uncomment these two lines to add support for encoders +# CONFIG_EC11=y +# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y \ No newline at end of file From 23b2cd014875ce4134b2b50019ca2bedb1574d1a Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 15:26:34 +0530 Subject: [PATCH 14/16] keycode update --- app/boards/shields/pteron36/pteron36.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.keymap b/app/boards/shields/pteron36/pteron36.keymap index a934f4f7..e8656dec 100644 --- a/app/boards/shields/pteron36/pteron36.keymap +++ b/app/boards/shields/pteron36/pteron36.keymap @@ -37,7 +37,7 @@ bindings = < &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - &hm LGUI A &hm LALT S &hm LCTL D &hm LSHFT F &kp G &kp H &hm RSHFT J &hm LCTL K &hm RALT L &hm RGUI APOS + &hm LGUI A &hm LALT S &hm LCTRL D &hm LSHFT F &kp G &kp H &hm RSHFT J &hm LCTRL K &hm RALT L &hm RGUI APOS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH < MEDR ESC < NAVR SPACE < MOUR TAB < NSSL RET < NSL BSPC < FUNL DEL >; @@ -56,7 +56,7 @@ &trans &trans &trans &trans &trans &kp C_AC_REDO &kp C_AC_PASTE &kp C_AC_COPY &kp C_AC_CUT &kp C_AC_UNDO &trans &trans &trans &trans &trans &kp CAPS &kp LEFT &kp DOWN &kp UP &kp RIGHT - &trans &trans &trans &trans &trans &kp INS &kp HOME &kp PGDN &kp PGUP &kp END + &trans &trans &trans &trans &trans &kp INS &kp HOME &kp PG_DN &kp PG_UP &kp END &trans &trans &trans &trans &trans &trans >; From a27c9862e73965c195dff08f83fd20fde0a51644 Mon Sep 17 00:00:00 2001 From: Harshit Goel--HOME Date: Sun, 26 Jun 2022 19:32:51 +0530 Subject: [PATCH 15/16] align pin config for PR --- app/boards/shields/pteron36/pteron36.dtsi | 8 ++++---- app/boards/shields/pteron36/pteron36_left.overlay | 10 +++++----- app/boards/shields/pteron36/pteron36_right.overlay | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36.dtsi b/app/boards/shields/pteron36/pteron36.dtsi index d040f39d..0a895e95 100644 --- a/app/boards/shields/pteron36/pteron36.dtsi +++ b/app/boards/shields/pteron36/pteron36.dtsi @@ -35,10 +35,10 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) diode-direction = "row2col"; row-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_HIGH)> - , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH )> - , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH )> - , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH )> + = <&pro_micro 7 (GPIO_ACTIVE_HIGH)> + , <&pro_micro 6 (GPIO_ACTIVE_HIGH )> + , <&pro_micro 8 (GPIO_ACTIVE_HIGH )> + , <&pro_micro 9 (GPIO_ACTIVE_HIGH )> ; }; diff --git a/app/boards/shields/pteron36/pteron36_left.overlay b/app/boards/shields/pteron36/pteron36_left.overlay index b9929775..7ac6fe7a 100644 --- a/app/boards/shields/pteron36/pteron36_left.overlay +++ b/app/boards/shields/pteron36/pteron36_left.overlay @@ -8,10 +8,10 @@ &kscan0 { col-gpios - = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; diff --git a/app/boards/shields/pteron36/pteron36_right.overlay b/app/boards/shields/pteron36/pteron36_right.overlay index ae573512..c2a6b9f5 100644 --- a/app/boards/shields/pteron36/pteron36_right.overlay +++ b/app/boards/shields/pteron36/pteron36_right.overlay @@ -12,10 +12,10 @@ &kscan0 { col-gpios - = <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; From fda1828f944433a3f65bf007d0e93bc0200dc601 Mon Sep 17 00:00:00 2001 From: Harshit Goel Date: Wed, 13 Jul 2022 14:53:19 +0530 Subject: [PATCH 16/16] fix pin config --- app/boards/shields/pteron36/pteron36_left.overlay | 4 ++-- app/boards/shields/pteron36/pteron36_right.overlay | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/boards/shields/pteron36/pteron36_left.overlay b/app/boards/shields/pteron36/pteron36_left.overlay index 7ac6fe7a..52bd4530 100644 --- a/app/boards/shields/pteron36/pteron36_left.overlay +++ b/app/boards/shields/pteron36/pteron36_left.overlay @@ -8,8 +8,8 @@ &kscan0 { col-gpios - = <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> diff --git a/app/boards/shields/pteron36/pteron36_right.overlay b/app/boards/shields/pteron36/pteron36_right.overlay index c2a6b9f5..e79c429b 100644 --- a/app/boards/shields/pteron36/pteron36_right.overlay +++ b/app/boards/shields/pteron36/pteron36_right.overlay @@ -15,7 +15,7 @@ = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; };