Mike Pulice / ublox_C200Test

Integrating the ublox LISA C200 modem

Fork of SprintUSBModemHTTPClientTest by Donatien Garnier

Files at this revision

API Documentation at this revision

Revision 19:f1d893c651e5, committed 2013-10-01

Comitter:
sam_grove
Date:
Tue Oct 01 17:36:06 2013 -0500
Parent:
18:37ee90b79cd3
Child:
20:39772b740985
Commit message:
Speed up the websocket test

Changed in this revision

WebSocketClient.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
ublox_C200Test.uvopt Show annotated file Show diff for this revision Revisions of this file
ublox_C200Test.uvproj Show annotated file Show diff for this revision Revisions of this file 
--- a/WebSocketClient.lib	Tue Oct 01 17:22:34 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-WebSocketClient#4567996414a5

--- a/main.cpp	Tue Oct 01 17:22:34 2013 -0500
+++ b/main.cpp	Tue Oct 01 17:36:06 2013 -0500
@@ -35,14 +35,14 @@
         sprintf(json_str, "{\"id\":\"test\",\"ax\":%d,\"ay\":%d,\"az\":%d, \"tmp\":%d}", i, i, i, i);
         // send str
         ws.send(json_str);    
-        wait(1.0f);
+        wait(0.5f);
         memset(json_str, 0, 100);
         if (ws.read(json_str))
         {
            printf("rcv: %s\r\n", json_str);
         }
     }
-    
+    ws.close();
     
     //GET data
     printf("Trying to fetch page...\r\n");

--- a/ublox_C200Test.uvopt	Tue Oct 01 17:22:34 2013 -0500
+++ b/ublox_C200Test.uvopt	Tue Oct 01 17:36:06 2013 -0500
@@ -1754,10 +1754,10 @@
       <FileType>8</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
+      <ColumnNumber>16</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>29</TopLine>
-      <CurrentLine>63</CurrentLine>
+      <TopLine>25</TopLine>
+      <CurrentLine>38</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>main.cpp</PathWithFileName>
       <FilenameWithoutPath>main.cpp</FilenameWithoutPath>
@@ -2628,6 +2628,22 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>151</FileNumber>
+      <FileType>8</FileType>
+      <tvExp>1</tvExp>
+      <Focus>0</Focus>
+      <ColumnNumber>0</ColumnNumber>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\WebSocketClient\Websocket.cpp</PathWithFileName>
+      <FilenameWithoutPath>Websocket.cpp</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
 </ProjectOpt>

--- a/ublox_C200Test.uvproj	Tue Oct 01 17:22:34 2013 -0500
+++ b/ublox_C200Test.uvproj	Tue Oct 01 17:36:06 2013 -0500
@@ -349,9 +349,9 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls>--gnu</MiscControls>
-              <Define> TARGET_LPC1768,  TARGET_M3,  TARGET_NXP,  TARGET_LPC176X,  TOOLCHAIN_ARM_STD,  TOOLCHAIN_ARM,  __CORTEX_M3,  ARM_MATH_CM3, </Define>
+              <Define>TARGET_LPC1768,  TARGET_M3,  TARGET_NXP,  TARGET_LPC176X,  TOOLCHAIN_ARM_STD,  TOOLCHAIN_ARM,  __CORTEX_M3,  ARM_MATH_CM3,</Define>
               <Undefine></Undefine>
-              <IncludePath>  .;  mbed-rtos;  mbed-rtos/rtx;  mbed-rtos/rtx/TARGET_M3;  mbed-rtos/rtx/TARGET_M3/TOOLCHAIN_ARM;  mbed-rtos/rtos;  HTTPClient;  HTTPClient/data;  SprintUSBModem;  SprintUSBModem/sms;  SprintUSBModem/serial;  SprintUSBModem/serial/usb;  SprintUSBModem/serial/io;  SprintUSBModem/Socket;  SprintUSBModem/at;  SprintUSBModem/lwip;  SprintUSBModem/lwip/netif;  SprintUSBModem/lwip/netif/ppp;  SprintUSBModem/lwip/api;  SprintUSBModem/lwip/core;  SprintUSBModem/lwip/core/snmp;  SprintUSBModem/lwip/core/ipv4;  SprintUSBModem/lwip/include;  SprintUSBModem/lwip/include/netif;  SprintUSBModem/lwip/include/lwip;  SprintUSBModem/lwip/include/ipv4;  SprintUSBModem/lwip/include/ipv4/lwip;  SprintUSBModem/lwip-sys;  SprintUSBModem/lwip-sys/arch;  SprintUSBModem/ip;  SprintUSBModem/USBHostWANDongleSprint;  SprintUSBModem/USBHostWANDongleSprint/USB3GModule;  SprintUSBModem/USBHostWANDongleSprint/USBHost;  SprintUSBModem/core;  SprintUSBModem/socket;  SprintUSBModem/socket/netinet;  SprintUSBModem/socket/sys;  mbed-src;  mbed-src/hal;  mbed-src/api;  mbed-src/targets;  mbed-src/targets/hal;  mbed-src/targets/hal/TARGET_NXP;  mbed-src/targets/hal/TARGET_NXP/TARGET_LPC176X;  mbed-src/targets/cmsis;  mbed-src/targets/cmsis/TARGET_NXP;  mbed-src/targets/cmsis/TARGET_NXP/TARGET_LPC176X;  mbed-src/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_ARM_STD;  mbed-src/common</IncludePath>
+              <IncludePath>.;mbed-rtos;mbed-rtos/rtx;mbed-rtos/rtx/TARGET_M3;mbed-rtos/rtx/TARGET_M3/TOOLCHAIN_ARM;mbed-rtos/rtos;HTTPClient;HTTPClient/data;SprintUSBModem;SprintUSBModem/sms;SprintUSBModem/serial;SprintUSBModem/serial/usb;SprintUSBModem/serial/io;SprintUSBModem/Socket;SprintUSBModem/at;SprintUSBModem/lwip;SprintUSBModem/lwip/netif;SprintUSBModem/lwip/netif/ppp;SprintUSBModem/lwip/api;SprintUSBModem/lwip/core;SprintUSBModem/lwip/core/snmp;SprintUSBModem/lwip/core/ipv4;SprintUSBModem/lwip/include;SprintUSBModem/lwip/include/netif;SprintUSBModem/lwip/include/lwip;SprintUSBModem/lwip/include/ipv4;SprintUSBModem/lwip/include/ipv4/lwip;SprintUSBModem/lwip-sys;SprintUSBModem/lwip-sys/arch;SprintUSBModem/ip;SprintUSBModem/USBHostWANDongleSprint;SprintUSBModem/USBHostWANDongleSprint/USB3GModule;SprintUSBModem/USBHostWANDongleSprint/USBHost;SprintUSBModem/core;SprintUSBModem/socket;SprintUSBModem/socket/netinet;SprintUSBModem/socket/sys;mbed-src;mbed-src/hal;mbed-src/api;mbed-src/targets;mbed-src/targets/hal;mbed-src/targets/hal/TARGET_NXP;mbed-src/targets/hal/TARGET_NXP/TARGET_LPC176X;mbed-src/targets/cmsis;mbed-src/targets/cmsis/TARGET_NXP;mbed-src/targets/cmsis/TARGET_NXP/TARGET_LPC176X;mbed-src/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_ARM_STD;mbed-src/common;.\WebSocketClient</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -4865,6 +4865,11 @@
               <FileType>8</FileType>
               <FilePath>mbed-src/common/LocalFileSystem.cpp</FilePath>
             </File>
+            <File>
+              <FileName>Websocket.cpp</FileName>
+              <FileType>8</FileType>
+              <FilePath>.\WebSocketClient\Websocket.cpp</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>