fix build error

Co-Authored-By: egokb <[email protected]>
egokb · Jul 24, 2024 · bb2be0c · bb2be0c
1 parent 965685b
commit bb2be0c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 84 deletions.
diff --git a/config/boards/arm/egokb_control/Kconfig.defconfig b/config/boards/arm/egokb_control/Kconfig.defconfig
@@ -4,34 +4,16 @@
 # SPDX-License-Identifier: MIT
 
 if BOARD_EGOKB_CONTROL
-    config ZMK_KEYBOARD_NAME
-        default "egokb"
-
     config BOARD
-        default "egokb_control"
-
-    config ZMK_SPLIT
-        default y
+    default "egokb_control"
 
-    config BT_CTLR
-    	default BT
-
-    config ZMK_BLE
-    	default y
-
-    config ZMK_USB
-    	default y
+    if USB_DEVICE_STACK
 
-    if USB
-
         config USB_NRFX
-        	default y
-
-        config USB_DEVICE_STACK
-        	default y
-
-    endif # USB
+            default y
 
-    config ZMK_BATTERY_VOLTAGE_DIVIDER
-    	default y
+    endif # USB_DEVICE_STACK
+
+    config BT_CTLR
+        default BT
 endif
diff --git a/config/boards/arm/egokb_control/egokb_control.dts b/config/boards/arm/egokb_control/egokb_control.dts
@@ -7,8 +7,6 @@
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
 #include "egokb_control_pinctrl.dtsi"
-#include <dt-bindings/led/led.h>
-#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
     model = "egokb_control";
@@ -18,27 +16,9 @@
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
-        zephyr,console = &cdc_acm_uart;
         zmk,battery = &vbatt;
-        zmk,kscan = &kscan0;
     };
 
-    default_transform: keymap_transform_0 {
-		compatible = "zmk,matrix-transform";
-		columns = <1>;
-		rows = <1>;
-		map = <RC(0,0)>;
-	};
-
-    kscan0: kscan {
-		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
-
-		diode-direction = "row2col";
-        row-gpios = <&gpio1 6  GPIO_ACTIVE_HIGH>;
-        col-gpios = <&gpio1 0  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-	};
-
     leds {
         compatible = "gpio-leds";
         blue_led: led_0 {
@@ -93,14 +73,6 @@
     pinctrl-names = "default", "sleep";
 };
 
-&usbd {
-    status = "okay";
-    cdc_acm_uart: cdc_acm_uart {
-        compatible = "zephyr,cdc-acm-uart";
-        label = "CDC_ACM_0";
-    };
-};
-
 
 &flash0 {
     /*

diff --git a/config/boards/arm/egokb_control/egokb_control.yaml b/config/boards/arm/egokb_control/egokb_control.yaml
@@ -1,19 +1,15 @@
 identifier: egokb_control
 name: egokb_control
-type: keyboard
+type: mcu
 arch: arm
 toolchain:
   - zephyr
   - gnuarmemb
   - xtools
 supported:
-  - gpio
-  - i2c
-  - counter
-  - spi
+  - adc
   - usb_device
-  - nvs
-  - can
-  - kscan
   - ble
+  - ieee802154
   - pwm
+  - watchdog
diff --git a/config/boards/arm/egokb_control/egokb_control.zmk.yml b/config/boards/arm/egokb_control/egokb_control.zmk.yml
@@ -0,0 +1,10 @@
+file_format: "1"
+id: egokb_control
+name: egokb_control
+type: board
+arch: arm
+outputs:
+  - usb
+  - ble
+url: https://egokb.com
+exposes: [pro_micro]
diff --git a/config/boards/arm/egokb_control/egokb_control_defconfig b/config/boards/arm/egokb_control/egokb_control_defconfig
@@ -6,22 +6,15 @@
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
 CONFIG_BOARD_EGOKB_CONTROL=y
-CONFIG_ZMK_BLE=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
 
 # enable GPIO
 CONFIG_GPIO=y
 
-# LED_Indicators
-# CONFIG_LED_GPIO=y
-# CONFIG_ZMK_LED_INDICATORS=y
-# CONFIG_ZMK_LED_INDICATORS_BRT=80
-
-# Enable SPI
-# CONFIG_SPI=y
-# CONFIG_SPI_NRFX=y
+# Use pinctrl
+CONFIG_PINCTRL=y
 
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
@@ -31,24 +24,12 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
+CONFIG_BUILD_OUTPUT_UF2=y
 
 # Enable 32kHz crystal
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y
 
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
-# CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
-# CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=4
-# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
-
-# Use the STRIP config specific to the LEDs you're using
-# CONFIG_WS2812_STRIP=y
-# CONFIG_PWM=y
-# CONFIG_LED_PWM=y
-# CONFIG_ZMK_BACKLIGHT=y
-# CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
-
 #BT configuration
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_BT_DIS_MANUF="egokb Corporation"
@@ -66,7 +47,9 @@ CONFIG_USB_DEVICE_PID=0x0362
 CONFIG_USB_DEVICE_MANUFACTURER="egokb Corporation"
 CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
-CONFIG_BUILD_OUTPUT_UF2=y
 
 CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=8
 CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=8
+
+CONFIG_ZMK_USB=y
+CONFIG_ZMK_BLE=y