From 854a4616aa72c586c1d23026d1d784701ef1c199 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Thu, 15 Jan 2026 00:11:38 -0700 Subject: [PATCH] refactor(boards): Move Polarity Works boards to ZMK variants Make the standard Polarity Works board IDs be `zmk` variants. --- app/boards/polarityworks/bt60/board.yml | 4 ++++ app/boards/polarityworks/bt60/bt60.zmk.yml | 2 +- app/boards/polarityworks/bt60/bt60_hs.zmk.yml | 2 +- .../bt60/{bt60_hs.dts => bt60_hs_nrf52840_zmk.dts} | 2 +- .../{bt60_1_0_0_defconfig => bt60_hs_nrf52840_zmk_defconfig} | 0 .../polarityworks/bt60/{bt60.dts => bt60_nrf52840_zmk.dts} | 0 .../{bt60_1_0_0.overlay => bt60_nrf52840_zmk_1_0_0.overlay} | 0 .../{bt60_hs_defconfig => bt60_nrf52840_zmk_1_0_0_defconfig} | 0 .../{bt60_2_0_0.overlay => bt60_nrf52840_zmk_2_0_0.overlay} | 0 ...bt60_2_0_0_defconfig => bt60_nrf52840_zmk_2_0_0_defconfig} | 0 app/boards/polarityworks/bt65/board.yml | 2 ++ app/boards/polarityworks/bt65/bt65.zmk.yml | 2 +- .../polarityworks/bt65/{bt65.dts => bt65_nrf52840_zmk.dts} | 0 .../bt65/{bt65_defconfig => bt65_nrf52840_zmk_defconfig} | 0 app/boards/polarityworks/bt75/board.yml | 2 ++ app/boards/polarityworks/bt75/bt75.zmk.yml | 2 +- .../polarityworks/bt75/{bt75.dts => bt75_nrf52840_zmk.dts} | 0 .../bt75/{bt75_defconfig => bt75_nrf52840_zmk_defconfig} | 0 18 files changed, 13 insertions(+), 5 deletions(-) rename app/boards/polarityworks/bt60/{bt60_hs.dts => bt60_hs_nrf52840_zmk.dts} (98%) rename app/boards/polarityworks/bt60/{bt60_1_0_0_defconfig => bt60_hs_nrf52840_zmk_defconfig} (100%) rename app/boards/polarityworks/bt60/{bt60.dts => bt60_nrf52840_zmk.dts} (100%) rename app/boards/polarityworks/bt60/{bt60_1_0_0.overlay => bt60_nrf52840_zmk_1_0_0.overlay} (100%) rename app/boards/polarityworks/bt60/{bt60_hs_defconfig => bt60_nrf52840_zmk_1_0_0_defconfig} (100%) rename app/boards/polarityworks/bt60/{bt60_2_0_0.overlay => bt60_nrf52840_zmk_2_0_0.overlay} (100%) rename app/boards/polarityworks/bt60/{bt60_2_0_0_defconfig => bt60_nrf52840_zmk_2_0_0_defconfig} (100%) rename app/boards/polarityworks/bt65/{bt65.dts => bt65_nrf52840_zmk.dts} (100%) rename app/boards/polarityworks/bt65/{bt65_defconfig => bt65_nrf52840_zmk_defconfig} (100%) rename app/boards/polarityworks/bt75/{bt75.dts => bt75_nrf52840_zmk.dts} (100%) rename app/boards/polarityworks/bt75/{bt75_defconfig => bt75_nrf52840_zmk_defconfig} (100%) diff --git a/app/boards/polarityworks/bt60/board.yml b/app/boards/polarityworks/bt60/board.yml index 2db078f6b..2f9a8b804 100644 --- a/app/boards/polarityworks/bt60/board.yml +++ b/app/boards/polarityworks/bt60/board.yml @@ -3,10 +3,14 @@ boards: vendor: polarityworks socs: - name: nrf52840 + variants: + - name: zmk - name: bt60 vendor: polarityworks socs: - name: nrf52840 + variants: + - name: zmk revision: format: major.minor.patch default: 2.0.0 diff --git a/app/boards/polarityworks/bt60/bt60.zmk.yml b/app/boards/polarityworks/bt60/bt60.zmk.yml index bec416a97..98bb85fc6 100644 --- a/app/boards/polarityworks/bt60/bt60.zmk.yml +++ b/app/boards/polarityworks/bt60/bt60.zmk.yml @@ -1,5 +1,5 @@ file_format: "1" -id: bt60 +id: bt60//zmk name: BT60 V2 type: board arch: arm diff --git a/app/boards/polarityworks/bt60/bt60_hs.zmk.yml b/app/boards/polarityworks/bt60/bt60_hs.zmk.yml index 2d156370f..cc9d8ed7b 100644 --- a/app/boards/polarityworks/bt60/bt60_hs.zmk.yml +++ b/app/boards/polarityworks/bt60/bt60_hs.zmk.yml @@ -1,5 +1,5 @@ file_format: "1" -id: bt60_hs +id: bt60_hs//zmk name: BT60 V1 Hotswap type: board arch: arm diff --git a/app/boards/polarityworks/bt60/bt60_hs.dts b/app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk.dts similarity index 98% rename from app/boards/polarityworks/bt60/bt60_hs.dts rename to app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk.dts index c152a62a0..55f905256 100644 --- a/app/boards/polarityworks/bt60/bt60_hs.dts +++ b/app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk.dts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "bt60.dts" +#include "bt60_nrf52840_zmk.dts" #include "bt60_1_0_0.dtsi" #include diff --git a/app/boards/polarityworks/bt60/bt60_1_0_0_defconfig b/app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk_defconfig similarity index 100% rename from app/boards/polarityworks/bt60/bt60_1_0_0_defconfig rename to app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk_defconfig diff --git a/app/boards/polarityworks/bt60/bt60.dts b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk.dts similarity index 100% rename from app/boards/polarityworks/bt60/bt60.dts rename to app/boards/polarityworks/bt60/bt60_nrf52840_zmk.dts diff --git a/app/boards/polarityworks/bt60/bt60_1_0_0.overlay b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0.overlay similarity index 100% rename from app/boards/polarityworks/bt60/bt60_1_0_0.overlay rename to app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0.overlay diff --git a/app/boards/polarityworks/bt60/bt60_hs_defconfig b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0_defconfig similarity index 100% rename from app/boards/polarityworks/bt60/bt60_hs_defconfig rename to app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0_defconfig diff --git a/app/boards/polarityworks/bt60/bt60_2_0_0.overlay b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_2_0_0.overlay similarity index 100% rename from app/boards/polarityworks/bt60/bt60_2_0_0.overlay rename to app/boards/polarityworks/bt60/bt60_nrf52840_zmk_2_0_0.overlay diff --git a/app/boards/polarityworks/bt60/bt60_2_0_0_defconfig b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_2_0_0_defconfig similarity index 100% rename from app/boards/polarityworks/bt60/bt60_2_0_0_defconfig rename to app/boards/polarityworks/bt60/bt60_nrf52840_zmk_2_0_0_defconfig diff --git a/app/boards/polarityworks/bt65/board.yml b/app/boards/polarityworks/bt65/board.yml index 97f443cfd..7392a4057 100644 --- a/app/boards/polarityworks/bt65/board.yml +++ b/app/boards/polarityworks/bt65/board.yml @@ -3,3 +3,5 @@ board: vendor: polarityworks socs: - name: nrf52840 + variants: + - name: zmk diff --git a/app/boards/polarityworks/bt65/bt65.zmk.yml b/app/boards/polarityworks/bt65/bt65.zmk.yml index 136ace23c..aaeb1835f 100644 --- a/app/boards/polarityworks/bt65/bt65.zmk.yml +++ b/app/boards/polarityworks/bt65/bt65.zmk.yml @@ -1,5 +1,5 @@ file_format: "1" -id: bt65 +id: bt65//zmk name: BT65 type: board arch: arm diff --git a/app/boards/polarityworks/bt65/bt65.dts b/app/boards/polarityworks/bt65/bt65_nrf52840_zmk.dts similarity index 100% rename from app/boards/polarityworks/bt65/bt65.dts rename to app/boards/polarityworks/bt65/bt65_nrf52840_zmk.dts diff --git a/app/boards/polarityworks/bt65/bt65_defconfig b/app/boards/polarityworks/bt65/bt65_nrf52840_zmk_defconfig similarity index 100% rename from app/boards/polarityworks/bt65/bt65_defconfig rename to app/boards/polarityworks/bt65/bt65_nrf52840_zmk_defconfig diff --git a/app/boards/polarityworks/bt75/board.yml b/app/boards/polarityworks/bt75/board.yml index d12dcb3a1..5a8057c8f 100644 --- a/app/boards/polarityworks/bt75/board.yml +++ b/app/boards/polarityworks/bt75/board.yml @@ -3,3 +3,5 @@ board: vendor: polarityworks socs: - name: nrf52840 + variants: + - name: zmk diff --git a/app/boards/polarityworks/bt75/bt75.zmk.yml b/app/boards/polarityworks/bt75/bt75.zmk.yml index d4424a4bb..fb909c525 100644 --- a/app/boards/polarityworks/bt75/bt75.zmk.yml +++ b/app/boards/polarityworks/bt75/bt75.zmk.yml @@ -1,5 +1,5 @@ file_format: "1" -id: bt75 +id: bt75//zmk name: BT75 V1 type: board arch: arm diff --git a/app/boards/polarityworks/bt75/bt75.dts b/app/boards/polarityworks/bt75/bt75_nrf52840_zmk.dts similarity index 100% rename from app/boards/polarityworks/bt75/bt75.dts rename to app/boards/polarityworks/bt75/bt75_nrf52840_zmk.dts diff --git a/app/boards/polarityworks/bt75/bt75_defconfig b/app/boards/polarityworks/bt75/bt75_nrf52840_zmk_defconfig similarity index 100% rename from app/boards/polarityworks/bt75/bt75_defconfig rename to app/boards/polarityworks/bt75/bt75_nrf52840_zmk_defconfig