ACKme / Mbed 2 deprecated wiconnect-test-console

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   WiConnect mbed

Files at this revision

API Documentation at this revision

Revision 15:a835e28308b6, committed 2014-08-23

Comitter:
dan_ackme
Date:
Sat Aug 23 05:40:50 2014 -0700
Parent:
13:779e8b2b50b4
Child:
16:d7e0d890426a
Commit message:
Renamed Socket to WiconnectSocket

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/file/FileListTest.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/file/FileReadTest.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/socket/HttpGetTest.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/socket/HttpPostTest.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/socket/TcpEchoTest.cpp Show annotated file Show diff for this revision Revisions of this file
tests/blocking/socket/UdpEchoTest.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/main.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -66,7 +66,8 @@
 
 /*************************************************************************************************/
 int main(int argc, char **argv)
-{
+{
+    WiconnectResult result = WICONNECT_SUCCESS;
     consoleSerial.setBaud(CONSOLE_BAUD);
 
     wiconnectIfc.setAssertLogger(LogFunc(wiconnectLogAssert));
@@ -77,7 +78,6 @@
 
     initialize_loop:
     {
-        WiconnectResult result;
         LOG_INFO("\r\n\r\nInitializing WiConnect...");
         if(WICONNECT_FAILED(result, wiconnectIfc.init(true)))
         {
@@ -89,7 +89,6 @@
     }
 
     {
-        WiconnectResult result;
         if(!WICONNECT_FAILED(result, wiconnectIfc.getVersion()))
         {
             LOG_INFO("Version: %s", wiconnectIfc.getResponseBuffer());

--- a/tests/blocking/file/FileListTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/file/FileListTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -98,7 +98,7 @@
     int i = 1;
 
     LOG_INFO("File count: %d", fileList.getCount());
-    for(const File *file = fileList.getListHead(); file != NULL; file = file->getNext(), ++i)
+    for(const WiconnectFile *file = fileList.getListHead(); file != NULL; file = file->getNext(), ++i)
     {
         LOG_INFO("------------------------\r\n"
                  "%d: %s\r\n"

--- a/tests/blocking/file/FileReadTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/file/FileReadTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -32,7 +32,7 @@
 #include "Wiconnect.h"
 
 
-static WiconnectResult readFile(File &file);
+static WiconnectResult readFile(WiconnectFile &file);
 
 
 
@@ -40,7 +40,7 @@
 WiconnectResult fileReadCommand(int argc, char **argv)
 {
     WiconnectResult result;
-    File file(TEST_BUFFER_LENGTH, TEST_BUFFER);
+    WiconnectFile file(TEST_BUFFER_LENGTH, TEST_BUFFER);
     Wiconnect *wiconnect = Wiconnect::getInstance();
 
     if(argc != 1)
@@ -59,7 +59,7 @@
 }
 
 /*************************************************************************************************/
-static WiconnectResult readFile(File &file)
+static WiconnectResult readFile(WiconnectFile &file)
 {
     uint8_t *ptr;
     uint16_t size;

--- a/tests/blocking/socket/HttpGetTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/socket/HttpGetTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -32,8 +32,8 @@
 
 
 
-static WiconnectResult addHeadersPrompt(Wiconnect *wiconnect, Socket &socket);
-static WiconnectResult readResponse(Socket &socket);
+static WiconnectResult addHeadersPrompt(Wiconnect *wiconnect, WiconnectSocket &socket);
+static WiconnectResult readResponse(WiconnectSocket &socket);
 
 
 
@@ -42,7 +42,7 @@
 {
     WiconnectResult result;
     Wiconnect *wiconnect = Wiconnect::getInstance();
-    Socket socket(TEST_BUFFER_LENGTH, TEST_BUFFER);
+    WiconnectSocket socket(TEST_BUFFER_LENGTH, TEST_BUFFER);
     const char *url;
     bool addHeaders = false;
     int savedTimeout = wiconnect->getCommandDefaultTimeout();
@@ -89,7 +89,7 @@
 
 
 /*************************************************************************************************/
-static WiconnectResult addHeadersPrompt(Wiconnect *wiconnect, Socket &socket)
+static WiconnectResult addHeadersPrompt(Wiconnect *wiconnect, WiconnectSocket &socket)
 {
     WiconnectResult result;
 
@@ -138,7 +138,7 @@
 }
 
 /*************************************************************************************************/
-static WiconnectResult readResponse(Socket &socket)
+static WiconnectResult readResponse(WiconnectSocket &socket)
 {
     uint8_t c;
 

--- a/tests/blocking/socket/HttpPostTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/socket/HttpPostTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -35,8 +35,8 @@
 #define CONTEXT_TYPE "text/plain"
 
 
-static WiconnectResult addPostData(Socket &socket);
-static WiconnectResult readResponse(Socket &socket);
+static WiconnectResult addPostData(WiconnectSocket &socket);
+static WiconnectResult readResponse(WiconnectSocket &socket);
 
 
 /*************************************************************************************************/
@@ -44,7 +44,7 @@
 {
     WiconnectResult result;
     Wiconnect *wiconnect = Wiconnect::getInstance();
-    Socket socket(0, NULL, TEST_BUFFER_LENGTH, TEST_BUFFER);
+    WiconnectSocket socket(0, NULL, TEST_BUFFER_LENGTH, TEST_BUFFER);
     uint32_t status;
 
     if(WICONNECT_FAILED(result, wiconnect->httpPost(socket, TEST_SERVER_URL, CONTEXT_TYPE)))
@@ -68,7 +68,7 @@
 }
 
 /*************************************************************************************************/
-static WiconnectResult addPostData(Socket &socket)
+static WiconnectResult addPostData(WiconnectSocket &socket)
 {
     WiconnectResult result;
 
@@ -95,7 +95,7 @@
 }
 
 /*************************************************************************************************/
-static WiconnectResult readResponse(Socket &socket)
+static WiconnectResult readResponse(WiconnectSocket &socket)
 {
     uint8_t *buffer;
     uint16_t size;

--- a/tests/blocking/socket/TcpEchoTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/socket/TcpEchoTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -32,7 +32,7 @@
 
 
 
-static WiconnectResult processData(Socket &socket, uint32_t count, uint32_t delay, uint32_t size);
+static WiconnectResult processData(WiconnectSocket &socket, uint32_t count, uint32_t delay, uint32_t size);
 
 
 
@@ -41,7 +41,7 @@
 {
     WiconnectResult result;
     Wiconnect *wiconnect = Wiconnect::getInstance();
-    Socket socket(TEST_BUFFER_LENGTH/2, TEST_BUFFER, TEST_BUFFER_LENGTH/2, TEST_BUFFER + TEST_BUFFER_LENGTH/2);
+    WiconnectSocket socket(TEST_BUFFER_LENGTH/2, TEST_BUFFER, TEST_BUFFER_LENGTH/2, TEST_BUFFER + TEST_BUFFER_LENGTH/2);
     const char *host;
     uint32_t port;
     uint32_t delay = 5;
@@ -90,7 +90,7 @@
 
 
 /*************************************************************************************************/
-static WiconnectResult processData(Socket &socket, uint32_t count, uint32_t delay, uint32_t size)
+static WiconnectResult processData(WiconnectSocket &socket, uint32_t count, uint32_t delay, uint32_t size)
 {
     WiconnectResult result = WICONNECT_ERROR;
     uint8_t *txBuffer = socket.getTxBuffer();

--- a/tests/blocking/socket/UdpEchoTest.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/tests/blocking/socket/UdpEchoTest.cpp	Sat Aug 23 05:40:50 2014 -0700
@@ -33,7 +33,7 @@
 
 
 
-static WiconnectResult processData(Socket &socket, uint32_t count, uint32_t delay, uint32_t size);
+static WiconnectResult processData(WiconnectSocket &socket, uint32_t count, uint32_t delay, uint32_t size);
 
 
 
@@ -42,7 +42,7 @@
 {
     WiconnectResult result;
     Wiconnect *wiconnect = Wiconnect::getInstance();
-    Socket socket(TEST_BUFFER_LENGTH/2, TEST_BUFFER, TEST_BUFFER_LENGTH/2, TEST_BUFFER + TEST_BUFFER_LENGTH/2);
+    WiconnectSocket socket(TEST_BUFFER_LENGTH/2, TEST_BUFFER, TEST_BUFFER_LENGTH/2, TEST_BUFFER + TEST_BUFFER_LENGTH/2);
     const char *host;
     uint32_t port;
     uint32_t delay = 5;
@@ -91,7 +91,7 @@
 
 
 /*************************************************************************************************/
-static WiconnectResult processData(Socket &socket, uint32_t count, uint32_t delay, uint32_t size)
+static WiconnectResult processData(WiconnectSocket &socket, uint32_t count, uint32_t delay, uint32_t size)
 {
     WiconnectResult result = WICONNECT_ERROR;
     uint8_t *txBuffer = socket.getTxBuffer();