From e53d85e1a78bf7c8faf905a77a073c875641c580 Mon Sep 17 00:00:00 2001 From: Brian Romanko Date: Fri, 25 Feb 2022 12:53:29 -0800 Subject: [PATCH] Correct pinouts and map --- app/boards/arm/tornblue/tornblue.dtsi | 17 +++++++++-------- app/boards/arm/tornblue/tornblue_right.dts | 10 +++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/boards/arm/tornblue/tornblue.dtsi b/app/boards/arm/tornblue/tornblue.dtsi index 4426289d..d924bacf 100644 --- a/app/boards/arm/tornblue/tornblue.dtsi +++ b/app/boards/arm/tornblue/tornblue.dtsi @@ -25,15 +25,16 @@ compatible = "zmk,matrix-transform"; columns = <12>; rows = <4>; -// | 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 | | SW22 | SW21 | SW20 | SW19 | +// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW23 | SW24 | SW25 | SW26 | SW27 | SW28 | +// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW29 | SW30 | SW31 | SW32 | SW33 | SW34 | +// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW35 | SW36 | SW37 | SW38 | SW39 | SW40 | +// | SW19 | SW20 | SW21 | SW22 | | SW41 | SW42 | SW43 | SW44 | +// Yes, this map is correct. The switches are out of order to produce cleaner traces on the PCB 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,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(3,5) RC(3,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(3,3) RC(3,4) RC(0,5) RC(0,6) RC(3,7) RC(3,8) RC(1,9) RC(1,10) RC(1,11) +RC(2,0) RC(2,1) RC(3,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(3,9) RC(2,10) RC(2,11) + RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) >; }; diff --git a/app/boards/arm/tornblue/tornblue_right.dts b/app/boards/arm/tornblue/tornblue_right.dts index 521e0036..8c857654 100644 --- a/app/boards/arm/tornblue/tornblue_right.dts +++ b/app/boards/arm/tornblue/tornblue_right.dts @@ -19,12 +19,12 @@ ; col-gpios - = <&gpio0 19 GPIO_ACTIVE_HIGH> - , <&gpio0 21 GPIO_ACTIVE_HIGH> - , <&gpio0 23 GPIO_ACTIVE_HIGH> - , <&gpio0 12 GPIO_ACTIVE_HIGH> + = <&gpio0 7 GPIO_ACTIVE_HIGH> , <&gpio1 9 GPIO_ACTIVE_HIGH> - , <&gpio0 7 GPIO_ACTIVE_HIGH> + , <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio0 23 GPIO_ACTIVE_HIGH> + , <&gpio0 21 GPIO_ACTIVE_HIGH> + , <&gpio0 19 GPIO_ACTIVE_HIGH> ; };