acorn: zmk + rp2040

keeb-it · Sep 10, 2024 · 06b5d82 · 06b5d82
1 parent ba9a7ff
commit 06b5d82
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/boards/shields/acorn/acorn_central_left.conf b/boards/shields/acorn/acorn_central_left.conf
@@ -7,4 +7,4 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
 
 # Enable the OLED Display
-CONFIG_ZMK_DISPLAY=y
+# CONFIG_ZMK_DISPLAY=y
diff --git a/boards/shields/acorn/acorn_central_left.overlay b/boards/shields/acorn/acorn_central_left.overlay
@@ -6,26 +6,26 @@
     b-gpios = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 };
 
-&pro_micro_i2c {
-    oled: ssd1306@3c {
-        compatible = "solomon,ssd1306fb";
-        reg = <0x3c>;
-        width = <128>;
-        height = <32>;
-        segment-offset = <0>;
-        page-offset = <0>;
-        display-offset = <0>;
-        multiplex-ratio = <31>;
-        segment-remap;
-        com-invdir;
-        com-sequential;
-        inversion-on;
-        prechargep = <0x22>;
-    };
-};
-
-/ {
-    chosen {
-        zephyr,display = &oled;
-    };
-};
+// &pro_micro_i2c {
+//     oled: ssd1306@3c {
+//         compatible = "solomon,ssd1306fb";
+//         reg = <0x3c>;
+//         width = <128>;
+//         height = <32>;
+//         segment-offset = <0>;
+//         page-offset = <0>;
+//         display-offset = <0>;
+//         multiplex-ratio = <31>;
+//         segment-remap;
+//         com-invdir;
+//         com-sequential;
+//         inversion-on;
+//         prechargep = <0x22>;
+//     };
+// };
+// 
+// / {
+//     chosen {
+//         zephyr,display = &oled;
+//     };
+// };
diff --git a/build.yaml b/build.yaml
@@ -34,29 +34,34 @@ include:
   #   shield: hammer40
   #   snippet: studio-rpc-usb-uart
   #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hammer40_xiao_ble_studio 
+  #   artifact-name: hammer40_xiao_ble_studio
   # - board: seeeduino_xiao_rp2040
   #   shield: hammer40
   #   snippet: studio-rpc-usb-uart
   #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hammer40_xiao_rp2040_studio 
+  #   artifact-name: hammer40_xiao_rp2040_studio
   # - board: seeeduino_xiao_ble
   #   shield: hana_central_left
   #   snippet: studio-rpc-usb-uart
   #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hana_left_xiao_ble_studio 
+  #   artifact-name: hana_left_xiao_ble_studio
   # - board: seeeduino_xiao_ble
   #   shield: hana_peripheral_right
   #   snippet: studio-rpc-usb-uart
   #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hana_right_xiao_ble_studio 
-  - board: nice_nano_v2
+  #   artifact-name: hana_right_xiao_ble_studio
+  # - board: nice_nano_v2
+  #   shield: acorn_central_left
+  #   snippet: studio-rpc-usb-uart
+  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
+  #   artifact-name: acorn_left_nice_nano_studio
+  # - board: nice_nano_v2
+  #   shield: acorn_peripheral_right
+  #   snippet: studio-rpc-usb-uart
+  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
+  #   artifact-name: acorn_right_nice_nano_studio
+  - board: sparkfun_pro_micro_rp2040
     shield: acorn_central_left
     snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y
-    artifact-name: acorn_left_nice_nano_studio 
-  - board: nice_nano_v2
-    shield: acorn_peripheral_right
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y
-    artifact-name: acorn_right_nice_nano_studio 
+    cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_STUDIO_LOCKING=n
+    artifact-name: acorn_left_rp2040_studio