From b72e5099225370cd6f94f054594c05f3bd80d307 Mon Sep 17 00:00:00 2001
From: ReFil <31960031+ReFil@users.noreply.github.com>
Date: Sat, 10 Dec 2022 23:03:13 +0000
Subject: [PATCH] Address review items

---
 app/boards/arm/ckp/Kconfig           |  1 +
 app/boards/arm/ckp/Kconfig.defconfig | 36 +++++-----------------------
 app/boards/arm/ckp/bt60_v2_defconfig | 13 ++++------
 app/boards/arm/ckp/bt65_v1_defconfig | 13 ++++------
 app/boards/arm/ckp/bt75_v1_defconfig | 13 ++++------
 5 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/app/boards/arm/ckp/Kconfig b/app/boards/arm/ckp/Kconfig
index 6a9ecebc..511cf182 100644
--- a/app/boards/arm/ckp/Kconfig
+++ b/app/boards/arm/ckp/Kconfig
@@ -1,3 +1,4 @@
+# Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
diff --git a/app/boards/arm/ckp/Kconfig.defconfig b/app/boards/arm/ckp/Kconfig.defconfig
index ccce4d43..dc8471f9 100644
--- a/app/boards/arm/ckp/Kconfig.defconfig
+++ b/app/boards/arm/ckp/Kconfig.defconfig
@@ -1,36 +1,14 @@
 # Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-if BOARD_BT60_V2
-
 config BOARD
-	default "bt60_v2"
-
+	default "bt60_v2" if BOARD_BT60_V2
+	default "bt65_v1" if BOARD_BT65_V1
+	default "bt75_v1" if BOARD_BT75_V1
 config ZMK_KEYBOARD_NAME
-	default "BT60 V2"
-
-endif # BOARD_BT60_V2
-
-if BOARD_BT65_V1
-
-config BOARD
-	default "bt65_v1"
-
-config ZMK_KEYBOARD_NAME
-	default "BT65"
-
-endif # BOARD_BT65_V1
-
-if BOARD_BT75_V1
-
-config BOARD
-	default "bt75_v1"
-
-config ZMK_KEYBOARD_NAME
-	default "BT75"
-
-endif # BOARD_BT75_V1
-
+	default "BT60 V2" if BOARD_BT60_V2
+	default "BT65" if BOARD_BT65_V1
+	default "BT75" if BOARD_BT75_V1
 
 if BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1
 
@@ -53,6 +31,4 @@ config ZMK_BLE
 config ZMK_USB
 	default y
 
-
-
 endif # BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1
diff --git a/app/boards/arm/ckp/bt60_v2_defconfig b/app/boards/arm/ckp/bt60_v2_defconfig
index f3094d64..c1078182 100644
--- a/app/boards/arm/ckp/bt60_v2_defconfig
+++ b/app/boards/arm/ckp/bt60_v2_defconfig
@@ -15,9 +15,10 @@ CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 CONFIG_USE_DT_CODE_PARTITION=y
-
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
+CONFIG_PWM=y
+CONFIG_LED_PWM=y
+CONFIG_ZMK_BACKLIGHT=y
+CONFIG_BUILD_OUTPUT_UF2=y
 
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -30,10 +31,6 @@ CONFIG_ZMK_RGB_UNDERGLOW=y
 CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
 CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
 CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=262
-# Use the STRIP config specific to the LEDs you're using
 CONFIG_WS2812_STRIP=y
+
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_PWM=y
-CONFIG_LED_PWM=y
-CONFIG_ZMK_BACKLIGHT=y
-CONFIG_BUILD_OUTPUT_UF2=y
diff --git a/app/boards/arm/ckp/bt65_v1_defconfig b/app/boards/arm/ckp/bt65_v1_defconfig
index f6ba05d7..3f5ee0ae 100644
--- a/app/boards/arm/ckp/bt65_v1_defconfig
+++ b/app/boards/arm/ckp/bt65_v1_defconfig
@@ -15,9 +15,10 @@ CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 CONFIG_USE_DT_CODE_PARTITION=y
-
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
+CONFIG_PWM=y
+CONFIG_LED_PWM=y
+CONFIG_ZMK_BACKLIGHT=y
+CONFIG_BUILD_OUTPUT_UF2=y
 
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -30,10 +31,6 @@ CONFIG_ZMK_RGB_UNDERGLOW=y
 CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
 CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
 CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=262
-# Use the STRIP config specific to the LEDs you're using
 CONFIG_WS2812_STRIP=y
+
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_PWM=y
-CONFIG_LED_PWM=y
-CONFIG_ZMK_BACKLIGHT=y
-CONFIG_BUILD_OUTPUT_UF2=y
diff --git a/app/boards/arm/ckp/bt75_v1_defconfig b/app/boards/arm/ckp/bt75_v1_defconfig
index 445a720f..a7f38b24 100644
--- a/app/boards/arm/ckp/bt75_v1_defconfig
+++ b/app/boards/arm/ckp/bt75_v1_defconfig
@@ -15,9 +15,10 @@ CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 CONFIG_USE_DT_CODE_PARTITION=y
-
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
+CONFIG_PWM=y
+CONFIG_LED_PWM=y
+CONFIG_ZMK_BACKLIGHT=y
+CONFIG_BUILD_OUTPUT_UF2=y
 
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -30,10 +31,6 @@ CONFIG_ZMK_RGB_UNDERGLOW=y
 CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
 CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
 CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=262
-# Use the STRIP config specific to the LEDs you're using
 CONFIG_WS2812_STRIP=y
+
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_PWM=y
-CONFIG_LED_PWM=y
-CONFIG_ZMK_BACKLIGHT=y
-CONFIG_BUILD_OUTPUT_UF2=y