Base ZMK update (#326)

2024-01-14 19:12:15 +00:00
parent 1728a660ce
commit 4a5003a0d4
6 changed files with 41 additions and 15 deletions
@@ -35,12 +35,6 @@ config SPI
 config BT_CTLR
    default BT

-config ZMK_BLE
-    default y
-
-config ZMK_USB
-    default y
-
 if USB

 config USB_NRFX
@@ -21,6 +21,7 @@
        zephyr,code-partition = &code_partition;
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
        zmk,kscan = &kscan0;
        zmk,backlight = &backlight;
        zmk,battery = &vbatt;
@@ -43,9 +44,8 @@

        >;
    };
-    ext-power {
+    EXT_POWER {
            compatible = "zmk,ext-power-generic";
-            label = "EXT_POWER";
            control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
        };

@@ -90,6 +90,9 @@

 &usbd {
    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+    };
 };


@@ -65,3 +65,10 @@ CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
 CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT=n #Set this to y for F13-F24 and intl keys with NKRO
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 CONFIG_BUILD_OUTPUT_UF2=y
+
+CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+CONFIG_ZMK_BLE_PASSKEY_ENTRY=n
+
+CONFIG_ZMK_BLE=y
+CONFIG_ZMK_USB=y
+CONFIG_ZMK_HID_INDICATORS=y
@@ -54,3 +54,8 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 CONFIG_BUILD_OUTPUT_UF2=y
+
+CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+
+CONFIG_ZMK_BLE=y
+CONFIG_ZMK_USB=y
@@ -7,7 +7,7 @@ manifest:
  projects:
    - name: zmk
      remote: refil
-      revision: adv360-z3.2-2
+      revision: adv360-z3.2-3
      import: app/west.yml
  self:
    path: config