Z3 update push

6 files changed, 35 insertions, 78 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 652e963..7093b49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: zmkfirmware/zmk-build-arm:2.4
+      image: zmkfirmware/zmk-build-arm:stable
     name: Build
     steps:
       - name: Checkout
@@ -35,16 +35,10 @@ jobs:
         run: west zephyr-export
       - name: West Build (left)
         run: west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-      - name: Adv360 Left DTS File
-        if: ${{ always() }}
-        run: cat -n build/left/zephyr/adv360_left.dts.pre.tmp
       - name: Adv360 Left Kconfig file
         run: cat build/left/zephyr/.config | grep -v "^#" | grep -v "^$"
       - name: West Build (right)
         run: west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-      - name: Adv360 Right DTS File
-        if: ${{ always() }}
-        run: cat -n build/right/zephyr/adv360_right.dts.pre.tmp
       - name: Adv360 Right Kconfig file
         run: cat build/right/zephyr/.config | grep -v "^#" | grep -v "^$"
       - name: Rename zmk.uf2
diff --git a/config/boards/arm/adv360/CMakeLists.txt b/config/boards/arm/adv360/CMakeLists.txt
deleted file mode 100644
index 7b388db..0000000
--- a/config/boards/arm/adv360/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-  -c
-  -b 0x26000
-  -f 0xADA52840
-  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
-  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
-)
diff --git a/config/boards/arm/adv360/adv360.dtsi b/config/boards/arm/adv360/adv360.dtsi
index c25243b..c57764b 100644
--- a/config/boards/arm/adv360/adv360.dtsi
+++ b/config/boards/arm/adv360/adv360.dtsi
@@ -8,6 +8,7 @@
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
 
+#include <dt-bindings/led/led.h>
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
@@ -22,6 +23,8 @@
 		zmk,underglow = &led_strip;
 		zmk,backlight = &backlight;
 		zmk,matrix_transform = &default_transform;
+		zmk,battery = &vbatt;
+		zephyr,console = &cdc_acm_uart;
 	};
 
 	default_transform: keymap_transform_0 {
@@ -61,9 +64,9 @@
 		};
 	};
 
-	vbatt {
+	vbatt: vbatt {
 		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
+		label = "VBATT";
 		io-channels = <&adc 2>;
 		output-ohms = <100000>;
 		full-ohms = <(100000 + 100000)>;
@@ -93,6 +96,10 @@
 
 &usbd {
 	status = "okay";
+	cdc_acm_uart: cdc_acm_uart {
+    compatible = "zephyr,cdc-acm-uart";
+    label = "CDC_ACM_0";
+  };
 };
 
 &uart0 {
@@ -166,5 +173,9 @@
 		chain-length = <3>; /* number of LEDs */
 		spi-one-frame = <0x70>;
 		spi-zero-frame = <0x40>;
+
+		color-mapping = <LED_COLOR_ID_GREEN
+                   LED_COLOR_ID_RED
+                   LED_COLOR_ID_BLUE>;
 	};
 };
diff --git a/config/boards/arm/adv360/adv360_left_defconfig b/config/boards/arm/adv360/adv360_left_defconfig
index beac97a..2745b67 100644
--- a/config/boards/arm/adv360/adv360_left_defconfig
+++ b/config/boards/arm/adv360/adv360_left_defconfig
@@ -6,9 +6,10 @@
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
 CONFIG_BOARD_ADV360_LEFT=y
+CONFIG_ZMK_BLE=y
+
 CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
+CONFIG_ZMK_SPLIT_ROLE_CENTRAL=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
@@ -33,7 +34,7 @@ CONFIG_FLASH_MAP=y
 
 # Enable 32kHz crystal
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM=y
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y
 
 CONFIG_ZMK_RGB_UNDERGLOW=y
 CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
@@ -45,7 +46,7 @@ CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 CONFIG_WS2812_STRIP=y
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_PWM=y
-CONFIG_ZMK_LED_PWM=y
+CONFIG_LED_PWM=y
 CONFIG_ZMK_BACKLIGHT=y
 CONFIG_ZMK_BACKLIGHT_BRT_START=20
 CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
@@ -57,28 +58,7 @@ CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 # Turn on logging, and set ZMK logging to debug output
 CONFIG_LOG=y
 CONFIG_ZMK_USB_LOGGING=y
-CONFIG_ZMK_LOG_LEVEL_DBG=y
-CONFIG_LOG_BUFFER_SIZE=65536
-CONFIG_LOG_STRDUP_BUF_COUNT=160
-#CONFIG_I2C_LOG_LEVEL_DBG=y
-#CONFIG_SPI_LOG_LEVEL_DBG=y
-
-
-# Turn on USB CDC ACM device
-CONFIG_USB=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_CDC_ACM=y
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=1
-
-# Enable serial console
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_UART_LINE_CTRL=y
-
-# Enable USB UART, and set the console device
-CONFIG_UART_CONSOLE=y
-CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
+
+
+
+CONFIG_BUILD_OUTPUT_UF2=y
diff --git a/config/boards/arm/adv360/adv360_right_defconfig b/config/boards/arm/adv360/adv360_right_defconfig
index 93c94ca..e52cb3c 100644
--- a/config/boards/arm/adv360/adv360_right_defconfig
+++ b/config/boards/arm/adv360/adv360_right_defconfig
@@ -6,8 +6,9 @@
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
 CONFIG_BOARD_ADV360_RIGHT=y
-CONFIG_ZMK_SPLIT_BLE=y
-#CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
+CONFIG_ZMK_BLE=y
+CONFIG_ZMK_SPLIT=y
+
 
 # Enable MPU
 CONFIG_ARM_MPU=y
@@ -32,7 +33,7 @@ CONFIG_FLASH_MAP=y
 
 # Enable 32kHz crystal
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM=y
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y
 
 CONFIG_ZMK_RGB_UNDERGLOW=y
 CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
@@ -44,7 +45,7 @@ CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 CONFIG_WS2812_STRIP=y
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_PWM=y
-CONFIG_ZMK_LED_PWM=y
+CONFIG_LED_PWM=y
 CONFIG_ZMK_BACKLIGHT=y
 CONFIG_ZMK_BACKLIGHT_BRT_START=20
 CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
@@ -56,30 +57,9 @@ CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 # Turn on logging, and set ZMK logging to debug output
 CONFIG_LOG=y
 CONFIG_ZMK_USB_LOGGING=y
-CONFIG_ZMK_LOG_LEVEL_DBG=y
-CONFIG_LOG_BUFFER_SIZE=10000
-CONFIG_LOG_STRDUP_BUF_COUNT=60
-#CONFIG_I2C_LOG_LEVEL_DBG=y
-#CONFIG_SPI_LOG_LEVEL_DBG=y
-CONFIG_BT_DEBUG_LOG=y
-CONFIG_BT_DEBUG_CONN=y
-
-
-# Turn on USB CDC ACM device
-CONFIG_USB=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_CDC_ACM=y
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=1
-
-# Enable serial console
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_UART_LINE_CTRL=y
-
-# Enable USB UART, and set the console device
-CONFIG_UART_CONSOLE=y
-CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
+
+
+
+
+
+CONFIG_BUILD_OUTPUT_UF2=y
diff --git a/config/west.yml b/config/west.yml
index f2a49f7..bf3935a 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -7,7 +7,7 @@ manifest:
   projects:
     - name: zmk
       remote: refil
-      revision: adv360-beta
+      revision: adv360-z3
       import: app/west.yml
   self:
     path: config