move to upstream

keeb-it · Aug 28, 2024 · e8aaefe · e8aaefe
1 parent a0bd6da
commit e8aaefe
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 43 deletions.
diff --git a/build.yaml b/build.yaml
@@ -13,50 +13,51 @@
 #
 ---
 # board: [seeeduino_xiao, seeeduino_xiao_ble, seeeduino_xiao_rp2040]
-# board: [seeeduino_xiao_ble]
-# shield:
-#   - hammer40
-#   - hana_central_left
-#   - hana_peripheral_left
-#   - hana_peripheral_right
+board: [seeeduino_xiao_ble]
+shield:
+  - hammer40
+  - hana_central_left
+  - hana_peripheral_left
+  - hana_peripheral_right
 include:
-  # - board: seeeduino_xiao_ble
-  #   shield: settings_reset
-  # - board: nice_nano_v2
-  #   shield: settings_reset
-  # - board: nice_nano_v2
-  #   shield: hana_central_dongle
-  # - board: nice_nano_v2
-  #   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 
+    shield: settings_reset
+  - board: nice_nano_v2
+    shield: settings_reset
+  - board: nice_nano_v2
+    shield: hana_central_dongle
   - board: nice_nano_v2
     shield: acorn_central_left
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y
-    artifact-name: acorn_left_xiao_ble_studio 
   - board: nice_nano_v2
     shield: acorn_peripheral_right
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y
-    artifact-name: acorn_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
+  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
+  #   artifact-name: acorn_left_nn2_studio 
+  # - board: nice_nano_v2
+  #   shield: acorn_peripheral_right
+  #   snippet: studio-rpc-usb-uart
+  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
+  #   artifact-name: acorn_right_nn2_studio 
diff --git a/config/west.yml b/config/west.yml
@@ -6,8 +6,10 @@ manifest:
       url-base: https://github.com/petejohanson
   projects:
     - name: zmk
-      remote: petejohanson
-      revision: studio/keymap-subsystem
+      # remote: petejohanson
+      # revision: studio/keymap-subsystem
+      remote: zmkfirmware
+      revision: main
       import: app/west.yml
   self:
     path: config