Update to latest

ReFil · Oct 16, 2023 · d0966a7 · d0966a7
1 parent beebc40
commit d0966a7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/app/boards/arm/bt60/bt60_defconfig b/app/boards/arm/bt60/bt60_defconfig
@@ -21,6 +21,7 @@ CONFIG_ZMK_TRACKPAD_PHYSICAL_Y=1065
 CONFIG_ZMK_TRACKPAD_LOGICAL_X=700
 CONFIG_ZMK_TRACKPAD_LOGICAL_Y=1200
 CONFIG_I2C=y
+CONFIG_SENSOR=y
 CONFIG_GEN4=y
 CONFIG_GEN4_TRIGGER_GLOBAL_THREAD=y
 #CONFIG_SENSOR_LOG_LEVEL_DBG=y

diff --git a/app/drivers/sensor/gen4/CMakeLists.txt → ...module/drivers/sensor/gen4/CMakeLists.txt b/app/drivers/sensor/gen4/CMakeLists.txt → ...module/drivers/sensor/gen4/CMakeLists.txt
@@ -6,4 +6,4 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 
 zephyr_library()
 
-zephyr_library_sources(gen4.c)
+zephyr_library_sources_ifdef(CONFIG_GEN4 gen4.c)
diff --git a/app/drivers/sensor/gen4/Kconfig → app/module/drivers/sensor/gen4/Kconfig b/app/drivers/sensor/gen4/Kconfig → app/module/drivers/sensor/gen4/Kconfig
diff --git a/app/drivers/sensor/gen4/gen4.c → app/module/drivers/sensor/gen4/gen4.c b/app/drivers/sensor/gen4/gen4.c → app/module/drivers/sensor/gen4/gen4.c
diff --git a/app/drivers/sensor/gen4/gen4.h → app/module/drivers/sensor/gen4/gen4.h b/app/drivers/sensor/gen4/gen4.h → app/module/drivers/sensor/gen4/gen4.h
diff --git a/app/src/trackpad.c b/app/src/trackpad.c
@@ -2,9 +2,9 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/kernel.h>
 
-#include "zmk/trackpad.h"
-#include "zmk/hid.h"
-#include "zmk/endpoints.h"
+#include <zmk/trackpad.h>
+#include <zmk/hid.h>
+#include <zmk/endpoints.h>
 #include "drivers/sensor/gen4.h"
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@@ -102,4 +102,4 @@ static int trackpad_init() {
     return 0;
 }
 
-SYS_INIT(trackpad_init, APPLICATION, CONFIG_ZMK_KSCAN_INIT_PRIORITY);
+SYS_INIT(trackpad_init, APPLICATION, CONFIG_KSCAN_INIT_PRIORITY);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ include_directories(${CMAKE_SOURCE_DIR}/include)

		zephyr_library()

		zephyr_library_sources(gen4.c)
		zephyr_library_sources_ifdef(CONFIG_GEN4 gen4.c)