Revision 8:08588dd2a66f, committed 2017-08-28

Comitter:

cliff1

Date:

Mon Aug 28 05:19:48 2017 +0000

Parent:

7:b7019399eb1e

Child:

9:90902218e268

Commit message:

20170828_RECV

Changed in this revision

--- a/WizFi310/WizFi310.h	Fri Aug 25 00:55:43 2017 +0000
+++ b/WizFi310/WizFi310.h	Mon Aug 28 05:19:48 2017 +0000
@@ -154,7 +154,7 @@
     int cmdSKTPCONTAINER (const char *openType, const char *containerName);
     int cmdSKTPCMD       (const char *openType, const char *commandName);
     int cmdSKTPSEND      (const char *containerName, const char *sendData);
-    int cmdSKTPRESULT    ();
+    int cmdSKTPRESULT    (const char *commandName, int executeStatus, int executeResult);
 
 
     static WizFi310 * getInstance() {

--- a/WizFi310/WizFi310_at.cpp	Fri Aug 25 00:55:43 2017 +0000
+++ b/WizFi310/WizFi310_at.cpp	Mon Aug 28 05:19:48 2017 +0000
@@ -374,8 +374,8 @@
     int resp;
 
     sprintf(cmd,"AT+SKTPDEVICE=%s,%s", openType, devId);
-    resp = sendCommand(cmd);        
-    
+    resp = sendCommand(cmd);
+        
     return resp;
 }
 
@@ -399,6 +399,17 @@
     return resp;
 }
 
+int WizFi310::cmdSKTPRESULT ( const char *commandName, int executeStatus, int executeResult )
+{
+    char cmd[CFG_CMD_SIZE];
+    int resp;
+
+    sprintf(cmd,"AT+SKTPRESULT=%s,%d,%d", commandName, executeStatus, executeResult);
+    resp = sendCommand(cmd);
+            
+    return resp;
+}
+
 int WizFi310::cmdSKTPSEND ( const char *containerName, const char *sendData )
 {
     char cmd[CFG_CMD_SIZE];
@@ -407,12 +418,4 @@
     sprintf(cmd,"AT+SKTPSEND=%s,%s", containerName, sendData);
     resp = sendCommand(cmd);
     return resp;
-}
-
-int WizFi310::cmdSKTPRESULT (  )
-{
-    int resp;
-
-    resp = sendCommand("AT+SKTPRESULT=?", RES_SMGMT);
-    return resp;
 }
\ No newline at end of file

--- a/WizFi310Interface.cpp	Fri Aug 25 00:55:43 2017 +0000
+++ b/WizFi310Interface.cpp	Mon Aug 28 05:19:48 2017 +0000
@@ -72,7 +72,14 @@
     return _wizfi310.getMACAddress();
 }
 
-int WizFi310Interface::conTP(const char *clientId, const char *credentialId, const char *serviceId, const char *devId, const char *containerNm)
+int WizFi310Interface::conTP(
+    const char *clientId, 
+    const char *credentialId, 
+    const char *serviceId, 
+    const char *devId, 
+    const char *containerNm,
+    const char *commandName
+    )
 {
     //if ( _wizfi310.joinTP(clientId, credentialId, serviceId, devId, containerNm) == -1 ) return NSAPI_ERROR_NO_SOCKET;
     
@@ -85,6 +92,9 @@
     if(_wizfi310.cmdSKTPCONTAINER("1", containerNm))    return -1;
     WIZ_INFO("Created Container\r\n");
     
+    if(_wizfi310.cmdSKTPCMD("1", commandName))    return -1;
+    WIZ_INFO("Created CommandName\r\n");
+    
     return 0;
 }
 
@@ -96,6 +106,34 @@
     return 0;
 }
 
+int WizFi310Interface::recvTP(const char *commandName, int executeStatus, int executeResult)
+{
+    int cid = 0;
+    char buffer[1024] = "";
+    
+    if(_wizfi310.recv(cid, buffer, sizeof(buffer)))
+    {
+        //printf("%s\r\n", buffer);
+
+        if(_wizfi310.cmdSKTPRESULT(commandName, executeStatus, executeResult))  
+        {
+            _wizfi310.initCon(cid, true);
+            
+            return -1;
+        }
+        
+        WIZ_INFO("Complete/r/n/r/n");
+        _wizfi310.initCon(cid, true);
+        
+        return 0;
+    }
+    
+    WIZ_INFO("Incorrect Request\r\n");
+    _wizfi310.initCon(cid, true);
+    
+    return -1;
+}
+
 int WizFi310Interface::disConTP()
 {   
     if(_wizfi310.cmdSKTPCON("0"))    return -1;

--- a/WizFi310Interface.h	Fri Aug 25 00:55:43 2017 +0000
+++ b/WizFi310Interface.h	Mon Aug 28 05:19:48 2017 +0000
@@ -55,8 +55,9 @@
     virtual const char *get_mac_address();
     
     
-    virtual int conTP(const char *clientId, const char *credentialId, const char *serviceId, const char *devId, const char *containerNm);
+    virtual int conTP(const char *clientId, const char *credentialId, const char *serviceId, const char *devId, const char *containerNm, const char *commandName);
     virtual int sendTP(const char *containerNm, const char *sendData);
+    virtual int recvTP(const char *commandName, int executeStatus, int executeResult);
     virtual int disConTP();