added oled to chosen

bullwinkle3000 · Dec 21, 2024 · 03b3319 · 03b3319
1 parent fd5fbb4
commit 03b3319
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 67 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/config/boards/shields/wyld_dm/wyld_dm_left.overlay b/config/boards/shields/wyld_dm/wyld_dm_left.overlay
@@ -8,13 +8,13 @@
 
 &kscan0 {
    row-gpios
-			= <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.07
+			= <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.07
 			, <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.02
 			, <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.03
 			, <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.04
 		    , <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.04
 		    , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.04
-			, <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 0.9
             ;
 
     col-gpios
@@ -28,31 +28,31 @@
 			;
 };
 
-&pinctrl {
-    spi0_default: spi0_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-			    <NRF_PSEL(SPIM_MISO, 0, 17)>;
-        };
-    };
-    spi0_sleep: spi0_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-			    <NRF_PSEL(SPIM_MISO, 0, 17)>;
-            low-power-enable;
-        };
-    };
-};
-
-nice_view_spi: &spi0 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi0_default>;
-    pinctrl-1 = <&spi0_sleep>;
-    pinctrl-names = "default", "sleep";
-    cs-gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
-};
+//&pinctrl {
+//    spi0_default: spi0_default {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+//                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+//			    <NRF_PSEL(SPIM_MISO, 0, 17)>;
+//        };
+//    };
+//    spi0_sleep: spi0_sleep {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+//                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+//			    <NRF_PSEL(SPIM_MISO, 0, 17)>;
+//            low-power-enable;
+//        };
+//    };
+//};
+//
+//nice_view_spi: &spi0 {
+//    compatible = "nordic,nrf-spim";
+//    pinctrl-0 = <&spi0_default>;
+//    pinctrl-1 = <&spi0_sleep>;
+//    pinctrl-names = "default", "sleep";
+//    cs-gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+//};
 
 &left_encoder {
 	status = "okay";

diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.overlay b/config/boards/shields/wyld_dm/wyld_dm_right.overlay
@@ -53,22 +53,22 @@
         };
     };
 
-	spi0_default: spi0_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 1, 00)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 25)>;
-//                <NRF_PSEL(SPIM_MISO, 0, 5)>;
-        };
-    };
-
-    spi0_sleep: spi0_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 1, 00)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 25)>;
-//                <NRF_PSEL(SPIM_MISO, 0, 5)>;
-            low-power-enable;
-        };
-    };
+//	spi0_default: spi0_default {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 1, 00)>,
+//                <NRF_PSEL(SPIM_MOSI, 0, 25)>;
+////                <NRF_PSEL(SPIM_MISO, 0, 5)>;
+//        };
+//    };
+//
+//    spi0_sleep: spi0_sleep {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 1, 00)>,
+//                <NRF_PSEL(SPIM_MOSI, 0, 25)>;
+////                <NRF_PSEL(SPIM_MISO, 0, 5)>;
+//            low-power-enable;
+//        };
+//    };
 };
 
 &blackpill_spi {
@@ -90,13 +90,13 @@
     };
 };
 
-nice_view_spi: &spi0 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi0_default>;
-    pinctrl-1 = <&spi0_sleep>;
-    pinctrl-names = "default", "sleep";
-    cs-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-};
+//nice_view_spi: &spi0 {
+//    compatible = "nordic,nrf-spim";
+//    pinctrl-0 = <&spi0_default>;
+//    pinctrl-1 = <&spi0_sleep>;
+//    pinctrl-names = "default", "sleep";
+//    cs-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+//};
 
 / {
   pmw3610_listener {