move UHK 80 boards into a single directory to eliminate duplicate files

boards/ugl/uhk-80-right/Kconfig.board → boards/ugl/uhk-80/Kconfig.board

@@ -1,6 +1,14 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+config BOARD_UHK_80_LEFT
+    bool "UHK 80 left"
+    depends on SOC_NRF52840_QIAA
+
 config BOARD_UHK_80_RIGHT
     bool "UHK 80 right"
     depends on SOC_NRF52840_QIAA
+
+config BOARD_UHK_DONGLE
+    bool "UHK dongle"
+    depends on SOC_NRF52840_QIAA

boards/ugl/uhk-80/Kconfig.defconfig

@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: Apache-2.0
+# used for both zephyr and mcuboot -> no custom kconfig symbols here
+
+if SHELL_BACKEND_RTT
+if BOARD_UHK_80_LEFT
+config SHELL_PROMPT_RTT
+    default "uhk80:left$ "
+endif
+if BOARD_UHK_80_RIGHT
+config SHELL_PROMPT_RTT
+    default "uhk80:right$ "
+endif
+if BOARD_UHK_DONGLE
+config SHELL_PROMPT_RTT
+    default "uhk-dongle$ "
+endif
+endif # SHELL_BACKEND_RTT
+
+if SHELL_BACKEND_SERIAL
+if BOARD_UHK_80_LEFT
+config SHELL_PROMPT_UART
+    default "uhk80:left$ "
+endif
+if BOARD_UHK_80_RIGHT
+config SHELL_PROMPT_UART
+    default "uhk80:right$ "
+endif
+if BOARD_UHK_DONGLE
+config SHELL_PROMPT_UART
+    default "uhk-dongle$ "
+endif
+endif # SHELL_BACKEND_SERIAL
+
+if BOARD_UHK_80_LEFT
+config USB_DEVICE_PRODUCT
+    default "UHK 80 left half"
+config USB_DEVICE_PID
+    default 0x0007
+if BT_DIS && BT_DIS_PNP
+config BT_DIS_PNP_PID
+    default 0x8007
+endif # BT_DIS && BT_DIS_PNP
+endif
+
+if BOARD_UHK_80_RIGHT
+config USB_DEVICE_PRODUCT
+    default "UHK 80 right half"
+config USB_DEVICE_PID
+    default 0x0009
+if BT_DIS && BT_DIS_PNP
+config BT_DIS_PNP_PID
+    default 0x8009
+endif # BT_DIS && BT_DIS_PNP
+endif
+
+if BOARD_UHK_DONGLE
+config USB_DEVICE_PRODUCT
+    default "UHK dongle"
+config USB_DEVICE_PID
+    default 0x0005
+if BT_DIS && BT_DIS_PNP
+config BT_DIS_PNP_PID
+    default 0x8005
+endif # BT_DIS && BT_DIS_PNP
+endif
+
+config BT_CTLR
+    default BT

boards/ugl/uhk-80/board.yml

@@ -0,0 +1,13 @@
+boards:
+  - name: uhk-80-left
+    vendor: ugl
+    socs:
+      - name: nrf52840
+  - name: uhk-80-right
+    vendor: ugl
+    socs:
+      - name: nrf52840
+  - name: uhk-dongle
+    vendor: ugl
+    socs:
+      - name: nrf52840

boards/ugl/uhk-80-left/uhk-80-left.dts → boards/ugl/uhk-80/uhk-80-left.dts

@@ -1,6 +1,6 @@
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
-#include "../shared.dtsi"
+#include "shared.dtsi"
 
 &gpio1 {
     status = "okay";
@@ -53,7 +53,7 @@
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 0, 24)>,
-                <NRF_PSEL(UART_TX, 0, 25)>;
+                    <NRF_PSEL(UART_TX, 0, 25)>;
             low-power-enable;
         };
     };
@@ -71,7 +71,7 @@
     uart1_sleep: uart1_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 1, 8)>,
-                <NRF_PSEL(UART_TX, 0, 7)>;
+                    <NRF_PSEL(UART_TX, 0, 7)>;
             low-power-enable;
         };
     };
@@ -93,18 +93,18 @@
 
     i2c2_default: i2c2_default {
         group1 {
-           psels = <NRF_PSEL(TWIM_SDA, 0, 26)>,
-              <NRF_PSEL(TWIM_SCL, 0, 27)>;
-              bias-pull-up;
+            psels = <NRF_PSEL(TWIM_SDA, 0, 26)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 27)>;
+            bias-pull-up;
         };
-     };
-     i2c2_sleep: i2c2_sleep {
+    };
+    i2c2_sleep: i2c2_sleep {
         group1 {
-           psels = <NRF_PSEL(TWIM_SDA, 0, 26)>,
-              <NRF_PSEL(TWIM_SCL, 0, 27)>;
-                   low-power-enable;
+            psels = <NRF_PSEL(TWIM_SDA, 0, 26)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 27)>;
+            low-power-enable;
         };
-     };
+    };
 };
 
 &spi1 {
@@ -171,8 +171,8 @@
         };
 
         col1: col1 {
-           gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-           label = "col1";
+            gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
+            label = "col1";
         };
         col2: col2 {
             gpios = <&gpio0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;

boards/ugl/uhk-80-right/uhk-80-right.dts → boards/ugl/uhk-80/uhk-80-right.dts

@@ -1,6 +1,6 @@
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
-#include "../shared.dtsi"
+#include "shared.dtsi"
 
 &gpio1 {
     status = "okay";
@@ -53,7 +53,7 @@
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 0, 23)>,
-                <NRF_PSEL(UART_TX, 0, 21)>;
+                    <NRF_PSEL(UART_TX, 0, 21)>;
             low-power-enable;
         };
     };
@@ -71,7 +71,7 @@
     uart1_sleep: uart1_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 0, 11)>,
-                <NRF_PSEL(UART_TX, 0, 12)>;
+                    <NRF_PSEL(UART_TX, 0, 12)>;
             low-power-enable;
         };
     };
@@ -92,16 +92,16 @@
     };
     i2c2_default: i2c2_default {
         group1 {
-           psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
-              <NRF_PSEL(TWIM_SCL, 0, 25)>;
-              bias-pull-up;
+            psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 25)>;
+            bias-pull-up;
         };
-     };
-     i2c2_sleep: i2c2_sleep {
+    };
+    i2c2_sleep: i2c2_sleep {
         group1 {
-           psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
-              <NRF_PSEL(TWIM_SCL, 0, 25)>;
-                   low-power-enable;
+            psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 25)>;
+            low-power-enable;
         };
     };
 };

boards/ugl/uhk-dongle/uhk-dongle.dts → boards/ugl/uhk-80/uhk-dongle.dts

@@ -1,6 +1,6 @@
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
-#include "../shared.dtsi"
+#include "shared.dtsi"
 
 &pwm0 {
     status = "okay";
@@ -23,25 +23,25 @@
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 0, 29)>,
-                <NRF_PSEL(UART_TX, 0, 22)>;
+                    <NRF_PSEL(UART_TX, 0, 22)>;
             low-power-enable;
         };
     };
 
     pwm0_default: pwm0_default {
         group1 {
             psels = <NRF_PSEL(PWM_OUT0, 0, 8)>,
-                <NRF_PSEL(PWM_OUT1, 1, 9)>,
-                <NRF_PSEL(PWM_OUT2, 0, 12)>;
+                    <NRF_PSEL(PWM_OUT1, 1, 9)>,
+                    <NRF_PSEL(PWM_OUT2, 0, 12)>;
             nordic,invert;
         };
     };
 
     pwm0_sleep: pwm0_sleep {
         group1 {
             psels = <NRF_PSEL(PWM_OUT0, 0, 8)>,
-                <NRF_PSEL(PWM_OUT1, 1, 9)>,
-                <NRF_PSEL(PWM_OUT2, 0, 12)>;
+                    <NRF_PSEL(PWM_OUT1, 1, 9)>,
+                    <NRF_PSEL(PWM_OUT2, 0, 12)>;
             low-power-enable;
         };
     };