From 519b63d8952da4a18c16b907615e46817cf74b1b Mon Sep 17 00:00:00 2001
From: Deepak Khajuria <9539519+dk307@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:56:22 -0700
Subject: [PATCH] Separate sdconfig for sensors (#40)

---
 .gitignore                                       |  3 ++-
 CMakeLists.txt                                   | 13 +++++++++++++
 main/util/async_web_server/http_event_source.cpp |  1 +
 main/wifi/wifi_sta.cpp                           |  2 ++
 sdkconfig => sdkconfig.defaults                  | 11 -----------
 sdkconfig.sensor1                                |  9 +++++++++
 sdkconfig.sensor2                                | 10 ++++++++++
 7 files changed, 37 insertions(+), 12 deletions(-)
 rename sdkconfig => sdkconfig.defaults (99%)
 create mode 100644 sdkconfig.sensor1
 create mode 100644 sdkconfig.sensor2

diff --git a/.gitignore b/.gitignore
index 44a6993..403c8c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 build/
-sdkconfig.old
+build_sensor1/
+build_sensor2/
 managed_components/
 
 .vscode/.browse.c_cpp.db*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c11b8..c4be865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,18 @@
 cmake_minimum_required(VERSION 3.5)
 
+set(SDKCONFIG "${CMAKE_BINARY_DIR}/sdkconfig")
+
+# Sensor 1
+#set(BUILD_DIR build-sensor1)
+set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.sensor1")
+
+# Sensor 2
+#set(BUILD_DIR build-sensor2)
+#set(CMAKE_BINARY_DIR build-sensor2)
+#set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.sensor2")
+
+#idf_build_set_property(BUILD_DIR "build-sensor2")
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 #LVGL custom config file setup
diff --git a/main/util/async_web_server/http_event_source.cpp b/main/util/async_web_server/http_event_source.cpp
index a70ad4a..944788f 100644
--- a/main/util/async_web_server/http_event_source.cpp
+++ b/main/util/async_web_server/http_event_source.cpp
@@ -4,6 +4,7 @@
 #include <esp_log.h>
 #include <mutex>
 #include <string>
+#include <sys/socket.h>
 
 namespace esp32
 {
diff --git a/main/wifi/wifi_sta.cpp b/main/wifi/wifi_sta.cpp
index 2f5e45b..b87beaa 100644
--- a/main/wifi/wifi_sta.cpp
+++ b/main/wifi/wifi_sta.cpp
@@ -40,6 +40,7 @@ void wifi_sta::connect_to_ap()
     copy_min_to_buffer(credentials_.get_password().begin(), credentials_.get_password().length(), config.sta.password);
     config.sta.threshold.authmode = credentials_.get_password().empty() ? WIFI_AUTH_OPEN : WIFI_AUTH_WPA2_PSK;
     config.sta.pmf_cfg.capable = true;
+    config.sta.pmf_cfg.required = false;
 
     CHECK_THROW_ESP(esp_wifi_set_storage(WIFI_STORAGE_RAM));
     CHECK_THROW_ESP(esp_wifi_set_config(WIFI_IF_STA, &config));
@@ -50,6 +51,7 @@ void wifi_sta::connect_to_ap()
 void wifi_sta::connect() const
 {
     CHECK_THROW_ESP(esp_wifi_start());
+    CHECK_THROW_ESP(esp_wifi_set_dynamic_cs(true));
     CHECK_THROW_ESP(esp_wifi_connect());
 }
 
diff --git a/sdkconfig b/sdkconfig.defaults
similarity index 99%
rename from sdkconfig
rename to sdkconfig.defaults
index 987e51a..ce20dba 100644
--- a/sdkconfig
+++ b/sdkconfig.defaults
@@ -1,5 +1,4 @@
 #
-# Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF)  Project Configuration
 #
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
@@ -1710,16 +1709,6 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
 
-#
-# Project
-#
-# CONFIG_SHT3X_SENSOR_ENABLE is not set
-CONFIG_SCD30_SENSOR_ENABLE=y
-CONFIG_SCD30_SENSOR_TEMPERATURE_OFFSET=90
-# CONFIG_SCD4x_SENSOR_ENABLE is not set
-# CONFIG_ENABLE_SD_CARD_SUPPORT is not set
-# end of Project
-
 #
 # I2C
 #
diff --git a/sdkconfig.sensor1 b/sdkconfig.sensor1
new file mode 100644
index 0000000..027c1d8
--- /dev/null
+++ b/sdkconfig.sensor1
@@ -0,0 +1,9 @@
+#
+# Project
+#
+# CONFIG_SHT3X_SENSOR_ENABLE is not set
+CONFIG_SCD30_SENSOR_ENABLE=y
+CONFIG_SCD30_SENSOR_TEMPERATURE_OFFSET=160
+# CONFIG_SCD4x_SENSOR_ENABLE is not set
+# CONFIG_ENABLE_SD_CARD_SUPPORT is not set
+# end of Project
diff --git a/sdkconfig.sensor2 b/sdkconfig.sensor2
new file mode 100644
index 0000000..5ea4870
--- /dev/null
+++ b/sdkconfig.sensor2
@@ -0,0 +1,10 @@
+#
+# Project
+#
+# CONFIG_SHT3X_SENSOR_ENABLE is not set
+# CONFIG_SCD30_SENSOR_ENABLE is not set
+# CONFIG_SCD30_SENSOR_TEMPERATURE_OFFSET
+CONFIG_SCD4x_SENSOR_ENABLE=y
+CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET=200
+# CONFIG_ENABLE_SD_CARD_SUPPORT is not set
+# end of Project