From 011b7e8ec7d09b0640f1822d56656f8c5622eb8d Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Wed, 4 Dec 2019 22:25:24 +0800 Subject: [PATCH] c_json/ --- TC1/TC1.mk | 2 +- TC1/{cJSON/cJSON.c => c_json/c_json.c} | 2 +- TC1/{cJSON/cJSON.h => c_json/c_json.h} | 0 TC1/mqtt_server/user_function.c | 2 +- TC1/mqtt_server/user_mqtt_client.c | 2 +- TC1/time_server/user_rtc.c | 2 +- TC1/user_gpio.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename TC1/{cJSON/cJSON.c => c_json/c_json.c} (99%) rename TC1/{cJSON/cJSON.h => c_json/c_json.h} (100%) diff --git a/TC1/TC1.mk b/TC1/TC1.mk index 40e5d3a..f375f86 100644 --- a/TC1/TC1.mk +++ b/TC1/TC1.mk @@ -25,7 +25,7 @@ NAME := App_TC1 $(NAME)_SOURCES := main.c\ - cJSON/cJSON.c\ + c_json/c_json.c\ ota_server/ota_server.c\ user_wifi.c\ user_gpio.c\ diff --git a/TC1/cJSON/cJSON.c b/TC1/c_json/c_json.c similarity index 99% rename from TC1/cJSON/cJSON.c rename to TC1/c_json/c_json.c index fad99cb..39281f5 100644 --- a/TC1/cJSON/cJSON.c +++ b/TC1/c_json/c_json.c @@ -30,7 +30,7 @@ #include #include #include -#include "cJSON.h" +#include "c_json.h" #include "mico.h" static const char *ep; diff --git a/TC1/cJSON/cJSON.h b/TC1/c_json/c_json.h similarity index 100% rename from TC1/cJSON/cJSON.h rename to TC1/c_json/c_json.h diff --git a/TC1/mqtt_server/user_function.c b/TC1/mqtt_server/user_function.c index 1c531c9..642cb72 100644 --- a/TC1/mqtt_server/user_function.c +++ b/TC1/mqtt_server/user_function.c @@ -4,7 +4,7 @@ #include "main.h" #include "user_gpio.h" -#include "cJSON/cJSON.h" +#include "c_json/c_json.h" #include "ota_server/user_ota.h" #include "user_mqtt_client.h" #include "user_udp.h" diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c index b0d5ecf..8294fc9 100644 --- a/TC1/mqtt_server/user_mqtt_client.c +++ b/TC1/mqtt_server/user_mqtt_client.c @@ -27,7 +27,7 @@ #include "user_function.h" #include "user_gpio.h" #include "user_mqtt_client.h" -#include "cJSON/cJSON.h" +#include "c_json/c_json.h" //#define MQTT_CLIENT_SSL_ENABLE // ssl diff --git a/TC1/time_server/user_rtc.c b/TC1/time_server/user_rtc.c index 76b72fa..fc2b0aa 100644 --- a/TC1/time_server/user_rtc.c +++ b/TC1/time_server/user_rtc.c @@ -4,7 +4,7 @@ #include "user_gpio.h" #include "sntp.h" #include "time_server/user_sntp.h" -#include "cJSON/cJSON.h" +#include "c_json/c_json.h" #include "mqtt_server/user_mqtt_client.h" #include "mqtt_server/user_function.h" diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c index 5ddd9cf..5484db6 100644 --- a/TC1/user_gpio.c +++ b/TC1/user_gpio.c @@ -4,7 +4,7 @@ #include "user_gpio.h" #include "mqtt_server/user_mqtt_client.h" #include "user_udp.h" -#include "cJSON/cJSON.h" +#include "c_json/c_json.h" mico_gpio_t relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5 };