Erick
/
ICE_BLE_TEST
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: NaturalTinyShell_ice libmDot-12Sept mbed-rtos mbed
Diff: src/CommandParser/cmd.cpp
- Revision:
- 118:2a131efdfd5a
- Parent:
- 117:a4a61da3de36
- Child:
- 121:650205ffa656
- Child:
- 123:ce602c91a9c3
--- a/src/CommandParser/cmd.cpp Thu Sep 22 21:11:20 2016 +0000
+++ b/src/CommandParser/cmd.cpp Thu Sep 22 21:27:54 2016 +0000
@@ -420,13 +420,8 @@
"\"halert\": \"115\","
"\"lalert\": \"85\", "
"\"hfs\": \"130\","
-<<<<<<< local
"\"lfs\": \"70\", "
"\"tol\": \"%s\" }", argv[2], argv[3], argv[4], argv[5], argv[6]
-=======
- "\"lfs\": \"70\", "
- "\"tol\": \"%s\" ", argv[2], argv[3], argv[4], argv[5], argv[6]
->>>>>>> other
);
bool status = GLOBAL_mdot->saveUserFile(argv[1], (void *)data_buf, 1024);
@@ -570,13 +565,7 @@
"\"duration\": \"30\", " // seconds
"\"setpoint\": \"2000.0\", "
"\"state\": \"1\", "
-<<<<<<< local
"\"percent\": \"100\", }", argv[2]
-
-=======
- "\"percent\": \"100\", ", argv[2]
-
->>>>>>> other
);
bool status = GLOBAL_mdot->saveUserFile(argv[1], (void *)data_buf, 1024);