Skip to content

Commit

Permalink
rm espressif and mxchip support, merge issue-connectlayerrefact
Browse files Browse the repository at this point in the history
  • Loading branch information
itolfh committed Mar 27, 2017
2 parents 05c8d95 + 3f8fca5 commit b567634
Show file tree
Hide file tree
Showing 90 changed files with 4,361 additions and 21,608 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2.0.0 2017.03.27
新增:
Auth 接口升级到 Auth 2.0 版本(不再支持 Auth 1.0 )。

优化:
优化连接层逻辑。

删除:
去除对 espressif 和 mxchip 平台的支持,如果确实需要,请使用 stable-1.x 版本。

1.1.3 2017.02.28
修复:
大端模式下订阅事件超过256后拒绝接收的bug。
Expand Down
81 changes: 0 additions & 81 deletions docs/Wilddog-Porting-Espressif-User-Manual.md

This file was deleted.

36 changes: 0 additions & 36 deletions docs/Wilddog-Porting-Mxchip-User-Manual.md

This file was deleted.

7 changes: 7 additions & 0 deletions docs/Wilddog-SDK-Test-User-Manual.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#测试使用指南

测试的源文件位于tests文件夹中,根据平台分成几个子目录,具体步骤参看对应目录下的README。

#测试方法

1. 订阅节点,连接上后断网,修改host,指向其他服务器ip。1分钟后重新连接网络,观察是否能收到订阅,至少修改2次数据。
2. 订阅节点,连接上后断网,修改host,指向当前服务器ip。4分钟后重新连接网络,观察是否能收到订阅,至少修改2次数据。
3. 订阅节点,连接上后断网,修改host,指向其他服务器ip。4分钟后重新连接网络,观察是否能收到订阅,至少修改2次数据。
4. 运行tools下面的自动化测试脚本。
25 changes: 18 additions & 7 deletions include/wilddog.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ extern "C"
/* if do not need debug log, undefine it to cost down ROM space. */
#define WILDDOG_DEBUG

#define WD_DEBUG_ALL 0
#define WD_DEBUG_LOG 1
#define WD_DEBUG_WARN 2
#define WD_DEBUG_ERROR 3
#define WD_DEBUG_NODBG 4
#define WD_DEBUG_ALL (0)
#define WD_DEBUG_LOG (1)
#define WD_DEBUG_WARN (2)
#define WD_DEBUG_ERROR (3)
#define WD_DEBUG_DEBUG (4)

#ifdef WILDDOG_PORT_TYPE_ESP
#include "wilddog_espressif.h"
Expand Down Expand Up @@ -76,13 +76,22 @@ typedef signed long s32 ;
#endif

#ifdef WILDDOG_DEBUG
#ifndef DEBUG_LEVEL
#define DEBUG_LEVEL WD_DEBUG_ERROR
#endif
STATIC const char *s_debug[] = {
"[ ALL ]",
"[ LOG ]",
"[WARN ]",
"[ERROR]",
"[DEBUG]"
};

#define wilddog_debug_level(level, format,...) do{if(level >= DEBUG_LEVEL){ \
printf("func:%s LINE: %d: "format"\r\n", __func__, __LINE__, ##__VA_ARGS__); \
printf("%s:func:%s LINE: %d: "format"\r\n",s_debug[level],__func__, __LINE__, ##__VA_ARGS__); \
}}while(0)

#define wilddog_debug(format,...) wilddog_debug_level(WD_DEBUG_NODBG, \
#define wilddog_debug(format,...) wilddog_debug_level(WD_DEBUG_DEBUG, \
format,##__VA_ARGS__)

#else
Expand Down Expand Up @@ -146,6 +155,7 @@ typedef enum WILDDOG_RETURN_T
WILDDOG_ERR_RECVNOMATCH = -11,
WILDDOG_ERR_CLIENTOFFLINE = -12,
WILDDOG_ERR_RECONNECT = -13,
WILDDOG_ERR_IGNORE = -14,
/*
* Using auto detect udp session tech, sdk maybe trigger reconnect event in
* first serval minutes, and the snapshot in callback maybe newer than local
Expand All @@ -155,6 +165,7 @@ typedef enum WILDDOG_RETURN_T
WILDDOG_HTTP_OK = 200,
WILDDOG_HTTP_CREATED = 201,
WILDDOG_HTTP_NO_CONTENT = 204,
WILDDOG_HTTP_PARTICAL_CONTENT = 206,

WILDDOG_HTTP_NOT_MODIFIED = 304,

Expand Down
16 changes: 0 additions & 16 deletions platform/espressif/Makefile

This file was deleted.

11 changes: 0 additions & 11 deletions platform/espressif/esp.patch

This file was deleted.

Binary file removed platform/espressif/lib_mem_optimize_150714.zip
Binary file not shown.
Empty file removed platform/espressif/user_config.h
Empty file.
Loading

0 comments on commit b567634

Please sign in to comment.