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
Fork of ICE by
Diff: src/ConfigurationHandler/ConfigurationHandler.cpp
- Revision:
- 121:650205ffa656
- Parent:
- 97:5cf6ab71dcd0
- Child:
- 122:4db48b933115
diff -r 539b20bd3816 -r 650205ffa656 src/ConfigurationHandler/ConfigurationHandler.cpp
--- a/src/ConfigurationHandler/ConfigurationHandler.cpp Thu Sep 22 21:30:48 2016 +0000
+++ b/src/ConfigurationHandler/ConfigurationHandler.cpp Fri Sep 23 12:45:49 2016 +0000
@@ -92,7 +92,7 @@
pos->second->display();
}
}
-
+
if ( !manualTable.empty() ) {
printf("MANUAL CONTROLS\n");
StringManualMap::iterator pos;
@@ -114,7 +114,7 @@
static bool loaded = false;
if ( !loaded ) { // lazy protection
-
+
printf("\rLoading persistent controls: \n");
std::vector<mDot::mdot_file> file_list = GLOBAL_mdot->listUserFiles();
@@ -126,22 +126,25 @@
strncpy(msg.controlFile, i->name, sizeof(msg.controlFile));
int rc = createControl(&msg);
if ( rc != 0 ) {
+ logError("%s: failed to load %s", __func__, msg.controlFile);
} else {
printf("\r control %s loaded.\n", msg.controlFile);
}
} else if ( strncmp( i->name, CONTROL_TM_STR, strlen(CONTROL_TM_STR)) == 0 ) {
- // create the timer control
+ // create the timer control
Message_t msg;
msg.control = CONTROL_TIMER;
strncpy(msg.controlFile, i->name, sizeof(msg.controlFile));
int rc = createControl(&msg);
if ( rc != 0 ) {
+ logError("%s: failed to load %s", __func__, msg.controlFile);
+
} else {
printf("\r control %s loaded.\n", msg.controlFile);
}
} else if ( strncmp( i->name, CONTROL_MN_STR, strlen(CONTROL_MN_STR)) == 0 ) {
// TODO: load the manual control -> these may not persist??
- // do nothing
+ // do nothing
} else {
// not a control file
}
