From 3ffc698550012e3466a1851fed4f6f6b508d5b7b Mon Sep 17 00:00:00 2001
From: windowsair <msdn_02@sina.com>
Date: Tue, 4 Feb 2020 20:58:16 +0800
Subject: [PATCH] fix: Fix duplicate definitions & Remove redundant build
 configurations

---
 components/DAP/include/DAP.h |  2 --
 main/Kconfig.projbuild       | 37 ------------------------------------
 sdkconfig                    |  5 -----
 3 files changed, 44 deletions(-)
 delete mode 100644 main/Kconfig.projbuild

diff --git a/components/DAP/include/DAP.h b/components/DAP/include/DAP.h
index b467714..65e0459 100644
--- a/components/DAP/include/DAP.h
+++ b/components/DAP/include/DAP.h
@@ -285,8 +285,6 @@ extern void     DAP_Setup (void);
 #define DELAY_SLOW_CYCLES       3U      // Number of cycles for one iteration
 #endif
 
-#define USE_ASSEMBLY 0
-
 #define USE_ASSEMBLY 1
 
 #if (USE_ASSEMBLY == 0)
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
deleted file mode 100644
index c1209ac..0000000
--- a/main/Kconfig.projbuild
+++ /dev/null
@@ -1,37 +0,0 @@
-menu "Example Configuration"
-
-config WIFI_SSID
-    string "WiFi SSID"
-	default "myssid"
-	help
-		SSID (network name) for the example to connect to.
-
-config WIFI_PASSWORD
-    string "WiFi Password"
-	default "mypassword"
-	help
-		WiFi password (WPA or WPA2) for the example to use.
-		Can be left blank if the network has no security set.
-
-choice EXAMPLE_IP_MODE
-    prompt "IP Version"
-    help
-       Example can use either IPV4 or IPV6.
-
-config EXAMPLE_IPV4
-    bool "IPV4"
-
-config EXAMPLE_IPV6
-   bool "IPV6"
-   select LWIP_IPV6
-
-endchoice
-
-config EXAMPLE_PORT
-    int "Port"
-    range 0 65535
-    default 3333
-    help
-        Local port the example server will listen on.
-
-endmenu
diff --git a/sdkconfig b/sdkconfig
index 4db752e..e20f324 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -69,11 +69,6 @@ CONFIG_PARTITION_TABLE_SINGLE_APP=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
-CONFIG_WIFI_SSID="myssid"
-CONFIG_WIFI_PASSWORD="mypassword"
-CONFIG_EXAMPLE_IPV4=y
-# CONFIG_EXAMPLE_IPV6 is not set
-CONFIG_EXAMPLE_PORT=3333
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set