espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-29 05:07:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/refactor_mqtt_folder' into 'master'

Browse Source 
feat(mqtt): Restructure mqtt folder as default paho structure

See merge request sdk/ESP8266_RTOS_SDK!168
This commit is contained in:
Wu Jian Gang
2018-05-21 15:19:56 +08:00
parent 88f6f0d62c 1d7f85809a
commit 74e972880c
24 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/mqtt/CMakeLists.txt
View File

@ -1,5 +1,12 @@
set(COMPONENT_SRCDIRS source/library source/platform) set(COMPONENT_ADD_INCLUDEDIRS
set(COMPONENT_ADD_INCLUDEDIRS include include/mqtt) paho/MQTTClient-C/src
paho/MQTTClient-C/src/FreeRTOS
paho/MQTTPacket/src)
set(COMPONENT_SRCDIRS
paho/MQTTClient-C/src
paho/MQTTClient-C/src/FreeRTOS
paho/MQTTPacket/src)
set(COMPONENT_REQUIRES freertos lwip ssl) set(COMPONENT_REQUIRES freertos lwip ssl)

8
components/mqtt/component.mk
View File

@ -1,8 +1,12 @@
# #
# Component Makefile # Component Makefile
# #
COMPONENT_ADD_INCLUDEDIRS += include/mqtt COMPONENT_ADD_INCLUDEDIRS += paho/MQTTClient-C/src \
paho/MQTTClient-C/src/FreeRTOS \
paho/MQTTPacket/src
COMPONENT_SRCDIRS += source/library source/platform COMPONENT_SRCDIRS += paho/MQTTClient-C/src \
paho/MQTTClient-C/src/FreeRTOS \
paho/MQTTPacket/src
CFLAGS += -DMQTT_TASK CFLAGS += -DMQTT_TASK

0
components/mqtt/source/platform/MQTTFreeRTOS.c → components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c Normal file → Executable file
View File

0
components/mqtt/include/mqtt/MQTTFreeRTOS.h → components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.h Normal file → Executable file
View File

0
components/mqtt/source/library/MQTTClient.c → components/mqtt/paho/MQTTClient-C/src/MQTTClient.c Normal file → Executable file
View File

0
components/mqtt/include/mqtt/MQTTClient.h → components/mqtt/paho/MQTTClient-C/src/MQTTClient.h Normal file → Executable file
View File

0
components/mqtt/include/mqtt/MQTTConnect.h → components/mqtt/paho/MQTTPacket/src/MQTTConnect.h
View File

0
components/mqtt/source/library/MQTTConnectClient.c → components/mqtt/paho/MQTTPacket/src/MQTTConnectClient.c
View File

0
components/mqtt/source/library/MQTTConnectServer.c → components/mqtt/paho/MQTTPacket/src/MQTTConnectServer.c
View File

0
components/mqtt/source/library/MQTTDeserializePublish.c → components/mqtt/paho/MQTTPacket/src/MQTTDeserializePublish.c
View File

0
components/mqtt/source/library/MQTTFormat.c → components/mqtt/paho/MQTTPacket/src/MQTTFormat.c
View File

0
components/mqtt/include/mqtt/MQTTFormat.h → components/mqtt/paho/MQTTPacket/src/MQTTFormat.h
View File

0
components/mqtt/source/library/MQTTPacket.c → components/mqtt/paho/MQTTPacket/src/MQTTPacket.c
View File

0
components/mqtt/include/mqtt/MQTTPacket.h → components/mqtt/paho/MQTTPacket/src/MQTTPacket.h
View File

0
components/mqtt/include/mqtt/MQTTPublish.h → components/mqtt/paho/MQTTPacket/src/MQTTPublish.h
View File

0
components/mqtt/source/library/MQTTSerializePublish.c → components/mqtt/paho/MQTTPacket/src/MQTTSerializePublish.c
View File

0
components/mqtt/include/mqtt/MQTTSubscribe.h → components/mqtt/paho/MQTTPacket/src/MQTTSubscribe.h
View File

0
components/mqtt/source/library/MQTTSubscribeClient.c → components/mqtt/paho/MQTTPacket/src/MQTTSubscribeClient.c
View File

0
components/mqtt/source/library/MQTTSubscribeServer.c → components/mqtt/paho/MQTTPacket/src/MQTTSubscribeServer.c
View File

0
components/mqtt/include/mqtt/MQTTUnsubscribe.h → components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribe.h
View File

0
components/mqtt/source/library/MQTTUnsubscribeClient.c → components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeClient.c
View File

0
components/mqtt/source/library/MQTTUnsubscribeServer.c → components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeServer.c
View File

0
components/mqtt/include/mqtt/StackTrace.h → components/mqtt/paho/MQTTPacket/src/StackTrace.h
View File

2
examples/protocols/mqtt/main/MQTTEcho.c
View File

@ -19,7 +19,7 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "mqtt/MQTTClient.h" #include "MQTTClient.h"
#include "user_config.h" #include "user_config.h"