Change to chosen definition

ReFil · Aug 15, 2023 · b5bce10 · b5bce10
1 parent ad2b2cd
commit b5bce10
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/app/boards/arm/bt60/bt60.dts b/app/boards/arm/bt60/bt60.dts
@@ -22,6 +22,7 @@
         zephyr,flash = &flash0;
         zmk,kscan = &kscan0;
         zephyr,console = &cdc_acm_uart;
+        zmk,trackpad = &trackpad;
 
     };
 

diff --git a/app/boards/arm/bt60/bt60_defconfig b/app/boards/arm/bt60/bt60_defconfig
@@ -23,7 +23,7 @@ CONFIG_ZMK_TRACKPAD_LOGICAL_Y=1200
 CONFIG_I2C=y
 CONFIG_GEN4=y
 CONFIG_GEN4_TRIGGER_GLOBAL_THREAD=y
-#CONFIG_SENSOR_LOG_LEVEL_DBG=y
+CONFIG_SENSOR_LOG_LEVEL_DBG=y
 
 CONFIG_USE_DT_CODE_PARTITION=y
 

diff --git a/app/src/hog.c b/app/src/hog.c
@@ -56,6 +56,7 @@ static struct hids_report consumer_input = {
     .type = HIDS_INPUT,
 };
 
+#if IS_ENABLED(CONFIG_ZMK_TRACKPAD)
 static struct hids_report trackpad_report = {
     .id = ZMK_REPORT_ID_TRACKPAD,
     .type = HIDS_INPUT,
@@ -80,6 +81,7 @@ static struct hids_report trackpad_selective = {
     .id = ZMK_REPORT_ID_FEATURE_PTP_SELECTIVE,
     .type = HIDS_FEATURE,
 };
+#endif
 
 static bool host_requests_notification = false;
 static uint8_t ctrl_point;

diff --git a/app/src/trackpad.c b/app/src/trackpad.c
@@ -9,7 +9,10 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-const struct device *trackpad = DEVICE_DT_GET(DT_INST(0, cirque_gen4));
+BUILD_ASSERT(DT_HAS_CHOSEN(zmk_trackpad),
+             "CONFIG_ZMK_TRACKPAD is enabled but no zmk,trackpad chosen node found");
+
+const struct device *trackpad = DEVICE_DT_GET(DT_CHOSEN(zmk_trackpad));
 
 static zmk_trackpad_finger_contacts_t present_contacts = 0;
 static zmk_trackpad_finger_contacts_t contacts_to_send = 0;