Revision 64:ef77cb252ed6, committed 2012-10-30

Comitter:

ashleymills

Date:

Tue Oct 30 15:49:40 2012 +0000

Parent:

62:e4a094aabbbc

Child:

65:ef3357b6ce97

Commit message:

mbed lib updated, updated test 51

Changed in this revision

--- a/Tests/Test51.h	Wed Oct 24 14:24:17 2012 +0000
+++ b/Tests/Test51.h	Tue Oct 30 15:49:40 2012 +0000
@@ -23,7 +23,7 @@
       
       virtual bool executeTest() {
          // locals
-         int smsToSend = 10, mailBoxSize = 5;
+         int smsToSend = 50, mailBoxSize = 25;
          size_t smCount, oldSMCount;
          Timer t;
          
@@ -73,9 +73,8 @@
          // wait for 25 to arrive and then read them as quickly as possible
          smCount = 0, oldSMCount = 0;
          t.start();
-         // wait a maximum of 5 minutes
-         //while(smCount<mailBoxSize&&t.read_ms()<300000) {
-         while(smCount<mailBoxSize&&t.read_ms()<30000) { //Reduce timeout to 30s for now
+         // wait a maximum of 10 minutes
+         while(smCount<mailBoxSize&&t.read_ms()<600000) {
             if(_modem->getSMCount(&smCount)!=0) {
                LOG("Failure getting SM count");
                return false;
@@ -93,9 +92,9 @@
          }
          
          LOG("dumping SMS");
-         while(smCount--) {
+         for(int i=0; i<mailBoxSize; i++) {
             if(_modem->getSM(_senderNumber,_smsIn,_smsLen)!=0) {
-               LOG("Error reading SMS %d",smCount);
+               LOG("Error reading SMS %d",i);
                return false;
             } else {
                LOG("Got SMS: \"%s\" (%s)",_smsIn,_senderNumber);
@@ -105,8 +104,8 @@
          // wait for next 25 to arrive and then read them as quickly as possible
          smCount = 0, oldSMCount = 0;
          t.start();
-         // wait a maximum of 5 minutes
-         while(smCount<mailBoxSize&&t.read_ms()<300000) {
+         // wait a maximum of 10 minutes
+         while(smCount<mailBoxSize&&t.read_ms()<600000) {
             if(_modem->getSMCount(&smCount)!=0) {
                LOG("Failure getting SM count");
                return false;
@@ -124,9 +123,9 @@
          }
          
          LOG("dumping SMS");
-         while(smCount--) {
+         for(int i=0; i<mailBoxSize; i++) {
             if(_modem->getSM(_senderNumber,_smsIn,_smsLen)!=0) {
-               LOG("Error reading SMS %d",smCount);
+               LOG("Error reading SMS %d",i);
                return false;
             } else {
                LOG("Got SMS: \"%s\" (%s)",_smsIn,_senderNumber);

--- a/main.cpp	Wed Oct 24 14:24:17 2012 +0000
+++ b/main.cpp	Tue Oct 30 15:49:40 2012 +0000
@@ -51,8 +51,8 @@
   LOG("Running tests.");
   TestManager *m = new TestManager(&modem);
   //m->runTestProfile(TESTS_MANUAL);
-  m->runTest(51);
-  
+  m->runTest(8);
+  //m->runTestProfile(TESTS_AUTOMATED);
   
   // this thread just waits and blinks leds periodically
   while(1) {

--- a/mbed.bld	Wed Oct 24 14:24:17 2012 +0000
+++ b/mbed.bld	Tue Oct 30 15:49:40 2012 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/cd19af002ccc
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/e2ed12d17f06
\ No newline at end of file