enable oled on left

keeb-it · Sep 9, 2024 · 52b842e · 52b842e
1 parent fe23431
commit 52b842e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 22 deletions.
diff --git a/boards/shields/acorn/acorn_central_left.conf b/boards/shields/acorn/acorn_central_left.conf
@@ -5,3 +5,6 @@ CONFIG_BT_MAX_PAIRED=4
 # battery reporting
 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
diff --git a/boards/shields/acorn/acorn_central_left.overlay b/boards/shields/acorn/acorn_central_left.overlay
@@ -5,3 +5,27 @@
     a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
     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;
+    };
+};
diff --git a/build.yaml b/build.yaml
@@ -30,26 +30,26 @@ include:
   #   shield: acorn_central_left
   # - board: nice_nano_v2
   #   shield: acorn_peripheral_right
-  - board: seeeduino_xiao_ble
-    shield: hammer40
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y
-    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 
-  - 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 
-  - 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: seeeduino_xiao_ble
+  #   shield: hammer40
+  #   snippet: studio-rpc-usb-uart
+  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
+  #   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 
+  # - 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 
+  # - 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
     shield: acorn_central_left
     snippet: studio-rpc-usb-uart

diff --git a/config/west.yml b/config/west.yml
@@ -1,10 +1,10 @@
 manifest:
   remotes:
-    - name: zmkfirmware
+    - name: upstream
       url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
-      remote: petejohanson
+      remote: upstream
       revision: main
       import: app/west.yml
   self: