From 2c22a77967c10fc0a61f8a4582327d28ab0f0135 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 3 Jun 2022 12:47:51 -0700 Subject: [PATCH] Updated GPIO to use pro_micro interconnect definitions --- app/boards/shields/ergos1_ose/ergos1_ose.dtsi | 12 ++++++------ app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml | 2 +- .../shields/ergos1_ose/ergos1_ose_left.overlay | 16 ++++++++-------- .../shields/ergos1_ose/ergos1_ose_right.overlay | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.dtsi b/app/boards/shields/ergos1_ose/ergos1_ose.dtsi index f73a23a6..e7d48292 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose.dtsi +++ b/app/boards/shields/ergos1_ose/ergos1_ose.dtsi @@ -37,12 +37,12 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3, diode-direction = "col2row"; row-gpios - = <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpio0 17 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 20 (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 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml b/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml index 926b71da..09cf4255 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml +++ b/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml @@ -3,7 +3,7 @@ id: ergos1_ose name: Ergo S-1 OSE type: shield url: https://github.com/wizarddata/Ergo-S-1 -requires: +requires: [pro_micro] features: - keys siblings: diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay b/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay index a3b793c0..01c80d99 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay +++ b/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay @@ -8,13 +8,13 @@ &kscan0 { col-gpios - = <&gpio1 11 GPIO_ACTIVE_HIGH> - , <&gpio0 10 GPIO_ACTIVE_HIGH> - , <&gpio1 4 GPIO_ACTIVE_HIGH> - , <&gpio0 11 GPIO_ACTIVE_HIGH> - , <&gpio1 0 GPIO_ACTIVE_HIGH> - , <&gpio0 24 GPIO_ACTIVE_HIGH> - , <&gpio0 22 GPIO_ACTIVE_HIGH> - , <&gpio0 20 GPIO_ACTIVE_HIGH> + = <&pro_micro 14 GPIO_ACTIVE_HIGH> + , <&pro_micro 16 GPIO_ACTIVE_HIGH> + , <&pro_micro 8 GPIO_ACTIVE_HIGH> + , <&pro_micro 7 GPIO_ACTIVE_HIGH> + , <&pro_micro 6 GPIO_ACTIVE_HIGH> + , <&pro_micro 5 GPIO_ACTIVE_HIGH> + , <&pro_micro 4 GPIO_ACTIVE_HIGH> + , <&pro_micro 3 GPIO_ACTIVE_HIGH> ; }; diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay b/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay index f8b2f149..e26e9856 100644 --- a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay +++ b/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay @@ -12,13 +12,13 @@ &kscan0 { col-gpios - = <&gpio0 20 GPIO_ACTIVE_HIGH> - , <&gpio0 22 GPIO_ACTIVE_HIGH> - , <&gpio0 24 GPIO_ACTIVE_HIGH> - , <&gpio1 0 GPIO_ACTIVE_HIGH> - , <&gpio0 11 GPIO_ACTIVE_HIGH> - , <&gpio1 4 GPIO_ACTIVE_HIGH> - , <&gpio0 10 GPIO_ACTIVE_HIGH> - , <&gpio1 11 GPIO_ACTIVE_HIGH> + = <&pro_micro 3 GPIO_ACTIVE_HIGH> + , <&pro_micro 4 GPIO_ACTIVE_HIGH> + , <&pro_micro 5 GPIO_ACTIVE_HIGH> + , <&pro_micro 6 GPIO_ACTIVE_HIGH> + , <&pro_micro 7 GPIO_ACTIVE_HIGH> + , <&pro_micro 8 GPIO_ACTIVE_HIGH> + , <&pro_micro 16 GPIO_ACTIVE_HIGH> + , <&pro_micro 14 GPIO_ACTIVE_HIGH> ; };