Vodafone Test Suite
Dependencies: mbed-rtos mbed HTTPClient VodafoneUSBModem
Diff: main.cpp
- Revision:
- 57:b76b3bdbe533
- Parent:
- 56:6ca2d4c1ffc4
- Child:
- 58:8b63f4c3a5a5
diff -r 6ca2d4c1ffc4 -r b76b3bdbe533 main.cpp --- a/main.cpp Mon Oct 15 15:55:22 2012 +0000 +++ b/main.cpp Mon Oct 15 16:02:24 2012 +0000 @@ -23,26 +23,6 @@ time_t gPreviousUptime = 0; time_t gUptime = 0; -<<<<<<< local -void loopForever() { - while(1) { - Thread::wait(1000); - time_t now = time(NULL); - gPreviousUptime = gUptime; - } -} - -void test(void const*) { - VodafoneUSBModem modem; - LOG("Constructing TestManager"); - LOG("Running tests."); - TestManager *m = new TestManager(&modem); - int numPassed = m->executeTestProfile(TESTS_MANUAL); - loopForever(); -} - -======= ->>>>>>> other void setTime() { struct tm t; t.tm_year = 100;