Xinlei Cao
Own fork of MbedSmartRestMain
Dependencies: C027_Support C12832 LM75B MMA7660 MbedSmartRest mbed-rtos mbed
Fork of
MbedSmartRestMain
by 
Cumulocity Official
Revision 89:0525121f307e, committed 2015-03-16
- Comitter:
- xinlei
- Date:
- Mon Mar 16 12:12:04 2015 +0000
- Parent:
- 88:8ab476939897
- Child:
- 90:423177e8a401
- Commit message:
- Display server domain name when booting
Changed in this revision
--- a/DeviceBootstrap.cpp Mon Mar 16 10:16:48 2015 +0000
+++ b/DeviceBootstrap.cpp Mon Mar 16 12:12:04 2015 +0000
@@ -72,7 +72,7 @@
_client.stop();
Thread::wait(2000);
continue;
- }
+ }
if (_client.receive(recvdRecord) != SMARTREST_SUCCESS) {
_client.stop();
Thread::wait(2000);
--- a/LM75B.lib Mon Mar 16 10:16:48 2015 +0000 +++ b/LM75B.lib Mon Mar 16 12:12:04 2015 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/neilt6/code/LM75B/#3a44310726fe +http://mbed.org/users/neilt6/code/LM75B/#7ac462ba84ac
--- a/MMA7660.lib Mon Mar 16 10:16:48 2015 +0000 +++ b/MMA7660.lib Mon Mar 16 12:12:04 2015 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/Sissors/code/MMA7660/#a8e20db7901e +http://mbed.org/users/Sissors/code/MMA7660/#36a163511e34
--- a/MbedAgent.cpp Mon Mar 16 10:16:48 2015 +0000
+++ b/MbedAgent.cpp Mon Mar 16 12:12:04 2015 +0000
@@ -72,7 +72,7 @@
Thread::wait(5000);
- _io.lcdPrint("Connect to Cloud");
+ _io.lcdPrint("Connect to Cloud", MBED_AGENT_HOST);
if (!_integration.integrate()) {
return false;
}
--- a/main.cpp Mon Mar 16 10:16:48 2015 +0000
+++ b/main.cpp Mon Mar 16 12:12:04 2015 +0000
@@ -50,38 +50,38 @@
mdm.setDebug(-1);
}
- io.lcdPrint("Device Init V2.1rc1");
+ io.lcdPrint("Mbed Agent V2.1rc1", MBED_AGENT_HOST);
if (!mdm.init(SIM_PIN, &devStatus)) {
status = 1;
io.lcdPrint("Modem Init Failure", "No SIM card found", "Or SIM has PIN code");
} else if (!gps.init()) {
status = 2;
io.lcdPrint("GPS Init Failure");
- }
+ }
if (status != 0) {
mdm.disconnect();
mdm.powerOff();
return 1;
}
- DeviceInfo deviceInfo(mdm, devStatus);
- DeviceMemory deviceMemory(mdm);
-
- if (io.resetButtonPressed()) {
- io.lcdPrint("Factory Reset");
- if (deviceMemory.resetPlatformCredentials()) {
-// io.deviceFeedback().beepSuccess();
- io.lcdPrint("Reset Success");
- }
- else {
-// io.deviceFeedback().beepFailure();
- io.lcdPrint("Reset Failure");
- }
- Thread::wait(1000);
- return 0;
+ DeviceInfo deviceInfo(mdm, devStatus);
+ DeviceMemory deviceMemory(mdm);
+
+ if (io.resetButtonPressed()) {
+ io.lcdPrint("Factory Reset");
+ if (deviceMemory.resetPlatformCredentials()) {
+// io.deviceFeedback().beepSuccess();
+ io.lcdPrint("Reset Success");
}
+ else {
+// io.deviceFeedback().beepFailure();
+ io.lcdPrint("Reset Failure");
+ }
+ Thread::wait(1000);
+ return 0;
+ }
- io.lcdPrint("Register Network", "IMEI", devStatus.imei);
+ io.lcdPrint("Register Network...", "IMEI", devStatus.imei);
if (!mdm.registerNet()) {
io.lcdPrint("No Network Coverage");
goto error;
--- a/mbed-rtos.lib Mon Mar 16 10:16:48 2015 +0000 +++ b/mbed-rtos.lib Mon Mar 16 12:12:04 2015 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/mbed_official/code/mbed-rtos/#3761f69dbbb2 +http://mbed.org/users/mbed_official/code/mbed-rtos/#d3d0e710b443
--- a/mbed.bld Mon Mar 16 10:16:48 2015 +0000 +++ b/mbed.bld Mon Mar 16 12:12:04 2015 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/mbed_official/code/mbed/builds/0b3ab51c8877 \ No newline at end of file +http://mbed.org/users/mbed_official/code/mbed/builds/7e07b6fb45cf \ No newline at end of file