From 9ae36e05f6ef4f12c2f04d1082f3ae396e63687e Mon Sep 17 00:00:00 2001
From: nopnop2002 <hau26280@tree.odn.ne.jp>
Date: Mon, 9 Sep 2024 16:32:24 +0900
Subject: [PATCH] Changed config variable determination to macro variable
 determination

---
 DeviceAddDemo/main/CMakeLists.txt | 19 ++++++++++++++++---
 DeviceAddDemo/main/main.c         |  6 ++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/DeviceAddDemo/main/CMakeLists.txt b/DeviceAddDemo/main/CMakeLists.txt
index 647a294..5ed3c55 100644
--- a/DeviceAddDemo/main/CMakeLists.txt
+++ b/DeviceAddDemo/main/CMakeLists.txt
@@ -1,4 +1,17 @@
-set(COMPONENT_SRCS "main.c")
-set(COMPONENT_ADD_INCLUDEDIRS "")
+set(srcs "main.c")
+
+# get IDF version for comparison
+set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
+
+if(idf_version VERSION_GREATER_EQUAL "5.2")
+	if(CONFIG_LEGACY_DRIVER)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D LEGACY_DRIVER")
+	else()
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D NEW_DRIVER")
+	endif()
+else()
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D LEGACY_DRIVER")
+endif()
+
+idf_component_register(SRCS "${srcs}" INCLUDE_DIRS ".")
 
-register_component()
diff --git a/DeviceAddDemo/main/main.c b/DeviceAddDemo/main/main.c
index 1a28c39..c8436b8 100644
--- a/DeviceAddDemo/main/main.c
+++ b/DeviceAddDemo/main/main.c
@@ -49,7 +49,7 @@ void app_main(void)
 	i2c_port_t i2c_num = I2C_NUM_1;
 #endif
 
-#if CONFIG_LEGACY_DRIVER
+#ifdef LEGACY_DRIVER
 	ESP_LOGI(tag, "I2C_LEGACY_DRIVER");
 	// install i2c master driver
 	i2c_config_t i2c_config = {
@@ -65,7 +65,9 @@ void app_main(void)
 
 	// add new device to i2c bus
 	i2c_device_add(&dev, i2c_num, CONFIG_RESET_GPIO);
-#else
+#endif
+
+#ifdef NEW_DRIVER
 	ESP_LOGI(tag, "I2C_NEW_DRIVER");
 	// install i2c master driver
 	i2c_master_bus_config_t i2c_mst_config = {