From af599d613ee491759fa7a1059e289870070df8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bondis?= Date: Sat, 9 Oct 2021 17:33:28 -0400 Subject: [PATCH] rename promicro pins to match with https://github.com/zmkfirmware/zmk/pull/876 --- .../arduino_pro_micro_pins.dtsi | 4 ++-- .../shields/microdox_mod/microdox_mod.dtsi | 16 ++++++++-------- .../microdox_mod/microdox_mod_left.overlay | 10 +++++----- .../microdox_mod/microdox_mod_right.overlay | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/boards/arm/sparkfun_nrf52840_mini/arduino_pro_micro_pins.dtsi b/config/boards/arm/sparkfun_nrf52840_mini/arduino_pro_micro_pins.dtsi index 43e8be8..1ca5e1c 100644 --- a/config/boards/arm/sparkfun_nrf52840_mini/arduino_pro_micro_pins.dtsi +++ b/config/boards/arm/sparkfun_nrf52840_mini/arduino_pro_micro_pins.dtsi @@ -5,7 +5,7 @@ */ / { - pro_micro_d: connector_d { + pro_micro: connector_d { compatible = "arduino-pro-micro"; #gpio-cells = <2>; gpio-map-mask = <0xffffffff 0xffffffc0>; @@ -28,7 +28,7 @@ ; }; - pro_micro_a: connector_a { + pro_micro: connector_a { compatible = "arduino-pro-micro"; #gpio-cells = <2>; gpio-map-mask = <0xffffffff 0xffffffc0>; diff --git a/config/boards/shields/microdox_mod/microdox_mod.dtsi b/config/boards/shields/microdox_mod/microdox_mod.dtsi index da7dd93..0a055fe 100644 --- a/config/boards/shields/microdox_mod/microdox_mod.dtsi +++ b/config/boards/shields/microdox_mod/microdox_mod.dtsi @@ -34,15 +34,15 @@ 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) diode-direction = "col2row"; row-gpios - = <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 10 (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 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // testing other pins to make sure rows work (invert top and bottom rows) -// = <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> -// , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> -// , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> -// , <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> +// = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> +// , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> +// , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> +// , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; diff --git a/config/boards/shields/microdox_mod/microdox_mod_left.overlay b/config/boards/shields/microdox_mod/microdox_mod_left.overlay index 52decc9..fdaa7a4 100644 --- a/config/boards/shields/microdox_mod/microdox_mod_left.overlay +++ b/config/boards/shields/microdox_mod/microdox_mod_left.overlay @@ -8,11 +8,11 @@ &kscan0 { col-gpios - = <&pro_micro_a 3 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 2 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + = <&pro_micro 3 GPIO_ACTIVE_HIGH> + , <&pro_micro 2 GPIO_ACTIVE_HIGH> + , <&pro_micro 1 GPIO_ACTIVE_HIGH> + , <&pro_micro 0 GPIO_ACTIVE_HIGH> + , <&pro_micro 15 GPIO_ACTIVE_HIGH> ; debounce-period = <20>; }; diff --git a/config/boards/shields/microdox_mod/microdox_mod_right.overlay b/config/boards/shields/microdox_mod/microdox_mod_right.overlay index 71b923e..572c242 100644 --- a/config/boards/shields/microdox_mod/microdox_mod_right.overlay +++ b/config/boards/shields/microdox_mod/microdox_mod_right.overlay @@ -17,11 +17,11 @@ &kscan0 { col-gpios - = <&pro_micro_d 15 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 2 GPIO_ACTIVE_HIGH> - , <&pro_micro_a 3 GPIO_ACTIVE_HIGH> + = <&pro_micro 15 GPIO_ACTIVE_HIGH> + , <&pro_micro 0 GPIO_ACTIVE_HIGH> + , <&pro_micro 1 GPIO_ACTIVE_HIGH> + , <&pro_micro 2 GPIO_ACTIVE_HIGH> + , <&pro_micro 3 GPIO_ACTIVE_HIGH> ; debounce-period = <20>; };