From 286812fc84f73dbd4fea256180e47194a0af0f2b Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Wed, 4 Dec 2019 22:10:56 +0800
Subject: [PATCH] mqtt_server/

---
 TC1/TC1.mk                               | 4 ++--
 TC1/main.c                               | 4 ++--
 TC1/{ => mqtt_server}/user_function.c    | 0
 TC1/{ => mqtt_server}/user_function.h    | 0
 TC1/{ => mqtt_server}/user_mqtt_client.c | 0
 TC1/{ => mqtt_server}/user_mqtt_client.h | 0
 TC1/user_gpio.c                          | 2 +-
 TC1/user_ota.c                           | 4 ++--
 TC1/user_power.c                         | 4 ++--
 TC1/user_rtc.c                           | 4 ++--
 TC1/user_udp.c                           | 2 +-
 TC1/user_wifi.c                          | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename TC1/{ => mqtt_server}/user_function.c (100%)
 rename TC1/{ => mqtt_server}/user_function.h (100%)
 rename TC1/{ => mqtt_server}/user_mqtt_client.c (100%)
 rename TC1/{ => mqtt_server}/user_mqtt_client.h (100%)

diff --git a/TC1/TC1.mk b/TC1/TC1.mk
index 2c7e95f..9209ffb 100644
--- a/TC1/TC1.mk
+++ b/TC1/TC1.mk
@@ -32,10 +32,10 @@ $(NAME)_SOURCES := main.c\
 				   user_udp.c\
 				   user_sntp.c\
 				   user_rtc.c\
-				   user_mqtt_client.c\
+				   mqtt_server/user_mqtt_client.c\
 				   user_ota.c\
 				   user_power.c\
-				   user_function.c\
+				   mqtt_server/user_function.c\
 				   http_server/app_httpd.c
 				   
 $(NAME)_COMPONENTS := protocols/SNTP\
diff --git a/TC1/main.c b/TC1/main.c
index 9a59b45..e069cb7 100644
--- a/TC1/main.c
+++ b/TC1/main.c
@@ -5,8 +5,8 @@
 #include "user_rtc.h"
 #include "user_udp.h"
 #include "user_power.h"
-#include "user_mqtt_client.h"
-#include "user_function.h"
+#include "mqtt_server/user_mqtt_client.h"
+#include "mqtt_server/user_function.h"
 #include "http_server/app_httpd.h"
 
 #define os_log(format, ...)  custom_log("TC1", format, ##__VA_ARGS__)
diff --git a/TC1/user_function.c b/TC1/mqtt_server/user_function.c
similarity index 100%
rename from TC1/user_function.c
rename to TC1/mqtt_server/user_function.c
diff --git a/TC1/user_function.h b/TC1/mqtt_server/user_function.h
similarity index 100%
rename from TC1/user_function.h
rename to TC1/mqtt_server/user_function.h
diff --git a/TC1/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c
similarity index 100%
rename from TC1/user_mqtt_client.c
rename to TC1/mqtt_server/user_mqtt_client.c
diff --git a/TC1/user_mqtt_client.h b/TC1/mqtt_server/user_mqtt_client.h
similarity index 100%
rename from TC1/user_mqtt_client.h
rename to TC1/mqtt_server/user_mqtt_client.h
diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c
index ca95ae9..5ddd9cf 100644
--- a/TC1/user_gpio.c
+++ b/TC1/user_gpio.c
@@ -2,7 +2,7 @@
 
 #include "main.h"
 #include "user_gpio.h"
-#include "user_mqtt_client.h"
+#include "mqtt_server/user_mqtt_client.h"
 #include "user_udp.h"
 #include "cJSON/cJSON.h"
 
diff --git a/TC1/user_ota.c b/TC1/user_ota.c
index 860c843..1cd1dd9 100644
--- a/TC1/user_ota.c
+++ b/TC1/user_ota.c
@@ -4,8 +4,8 @@
 #include "ota_server/ota_server.h"
 #include "main.h"
 #include "user_udp.h"
-#include "user_mqtt_client.h"
-#include "user_function.h"
+#include "mqtt_server/user_mqtt_client.h"
+#include "mqtt_server/user_function.h"
 
 static void ota_server_status_handler(OTA_STATE_E state, float progress)
 {
diff --git a/TC1/user_power.c b/TC1/user_power.c
index e882cf9..8ca732f 100644
--- a/TC1/user_power.c
+++ b/TC1/user_power.c
@@ -4,8 +4,8 @@
 #include "mico.h"
 #include "main.h"
 #include "user_udp.h"
-#include "user_mqtt_client.h"
-#include "user_function.h"
+#include "mqtt_server/user_mqtt_client.h"
+#include "mqtt_server/user_function.h"
 #include "user_power.h"
 
 /*
diff --git a/TC1/user_rtc.c b/TC1/user_rtc.c
index ab4fa16..c7c1c7f 100644
--- a/TC1/user_rtc.c
+++ b/TC1/user_rtc.c
@@ -5,8 +5,8 @@
 #include "sntp.h"
 #include "user_sntp.h"
 #include "cJSON/cJSON.h"
-#include "user_mqtt_client.h"
-#include "user_function.h"
+#include "mqtt_server/user_mqtt_client.h"
+#include "mqtt_server/user_function.h"
 
 void rtc_thread(mico_thread_arg_t arg);
 
diff --git a/TC1/user_udp.c b/TC1/user_udp.c
index 72bcdd1..bf7ea21 100644
--- a/TC1/user_udp.c
+++ b/TC1/user_udp.c
@@ -1,7 +1,7 @@
 #define os_log(format, ...)  custom_log("UDP", format, ##__VA_ARGS__)
 
 #include "main.h"
-#include "user_function.h"
+#include "mqtt_server/user_function.h"
 
 #define LOCAL_UDP_PORT 10182
 #define REMOTE_UDP_PORT 10181
diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c
index 5506904..272707b 100644
--- a/TC1/user_wifi.c
+++ b/TC1/user_wifi.c
@@ -4,7 +4,7 @@
 #include "mico_socket.h"
 #include "user_gpio.h"
 #include "user_sntp.h"
-#include "user_function.h"
+#include "mqtt_server/user_function.h"
 
 #define os_log(format, ...)  custom_log("WIFI", format, ##__VA_ARGS__)