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
src/ConfigurationHandler/ConfigurationHandler.cpp@75:96512ccc0443, 2016-09-19 (annotated)
- Committer:
- jmarkel44
- Date:
- Mon Sep 19 14:42:19 2016 +0000
- Revision:
- 75:96512ccc0443
- Parent:
- 74:03ccf04998b5
- Child:
- 77:43e0a3d9e536
cleanup
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
jmarkel44 | 0:65cfa4873284 | 1 | /****************************************************************************** |
jmarkel44 | 0:65cfa4873284 | 2 | * |
jmarkel44 | 0:65cfa4873284 | 3 | * File: ConfigurationHandler.cpp |
jmarkel44 | 0:65cfa4873284 | 4 | * Desciption: source for the ICE Configuration Handler |
jmarkel44 | 0:65cfa4873284 | 5 | * |
jmarkel44 | 0:65cfa4873284 | 6 | *****************************************************************************/ |
jmarkel44 | 3:8ea4db957749 | 7 | #include "ConfigurationHandler.h" |
jmarkel44 | 0:65cfa4873284 | 8 | #include "global.h" |
jmarkel44 | 5:5e77a1db4d45 | 9 | #include "SetpointControl.h" |
jmarkel44 | 12:ea87887ca7ad | 10 | #include "TimerControl.h" |
jmarkel44 | 12:ea87887ca7ad | 11 | |
jmarkel44 | 46:4cb96ab2d1c8 | 12 | StringSetpointMap setpointTable; // setpoint control object table |
jmarkel44 | 46:4cb96ab2d1c8 | 13 | StringTimerMap timerTable; // timer control object table |
jmarkel44 | 46:4cb96ab2d1c8 | 14 | //StringManualMap manualTable; // manual control object table |
jmarkel44 | 5:5e77a1db4d45 | 15 | |
jmarkel44 | 5:5e77a1db4d45 | 16 | // local function prototypes |
jmarkel44 | 5:5e77a1db4d45 | 17 | static int loadPersistentControls(void); |
jmarkel44 | 5:5e77a1db4d45 | 18 | |
jmarkel44 | 74:03ccf04998b5 | 19 | // local helper functions |
jmarkel44 | 5:5e77a1db4d45 | 20 | static int createControl(const Message_t *msg); |
jmarkel44 | 5:5e77a1db4d45 | 21 | static int modifyControl(const Message_t *msg); |
jmarkel44 | 5:5e77a1db4d45 | 22 | static int destroyControl(const Message_t *msg); |
jmarkel44 | 5:5e77a1db4d45 | 23 | |
jmarkel44 | 12:ea87887ca7ad | 24 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 25 | * Function: ConfigurationHandler() |
jmarkel44 | 12:ea87887ca7ad | 26 | * Description: The ICE Configuration Handler |
jmarkel44 | 12:ea87887ca7ad | 27 | * |
jmarkel44 | 12:ea87887ca7ad | 28 | * @param args (unused) |
jmarkel44 | 12:ea87887ca7ad | 29 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 30 | *****************************************************************************/ |
jmarkel44 | 0:65cfa4873284 | 31 | void ConfigurationHandler(void const *args) |
jmarkel44 | 0:65cfa4873284 | 32 | { |
jmarkel44 | 12:ea87887ca7ad | 33 | UNUSED(args); |
jmarkel44 | 5:5e77a1db4d45 | 34 | loadPersistentControls(); |
jmarkel44 | 75:96512ccc0443 | 35 | osSignalSet(mainThreadId, sig_config_continue); |
jmarkel44 | 5:5e77a1db4d45 | 36 | |
jmarkel44 | 3:8ea4db957749 | 37 | while ( true ) { |
jmarkel44 | 5:5e77a1db4d45 | 38 | // wait for an event |
jmarkel44 | 5:5e77a1db4d45 | 39 | osEvent evt = MailBox.get(); |
jmarkel44 | 5:5e77a1db4d45 | 40 | if (evt.status == osEventMail) { |
jmarkel44 | 5:5e77a1db4d45 | 41 | Message_t *msg = (Message_t*) evt.value.p; |
jmarkel44 | 5:5e77a1db4d45 | 42 | |
jmarkel44 | 37:7e6986b77f01 | 43 | logInfo("\r%s: mes->action = %d\n", __func__, msg->action); |
jmarkel44 | 37:7e6986b77f01 | 44 | logInfo("\r%s: msg->control = %d\n", __func__, msg->control); |
jmarkel44 | 37:7e6986b77f01 | 45 | logInfo("\r%s: msg->controlFile = %s\n", __func__, msg->controlFile); |
jmarkel44 | 5:5e77a1db4d45 | 46 | |
jmarkel44 | 5:5e77a1db4d45 | 47 | switch ( msg->action ) { |
jmarkel44 | 5:5e77a1db4d45 | 48 | case ACTION_CREATE: { |
jmarkel44 | 5:5e77a1db4d45 | 49 | (void)createControl(msg); |
jmarkel44 | 5:5e77a1db4d45 | 50 | break; |
jmarkel44 | 5:5e77a1db4d45 | 51 | } |
jmarkel44 | 5:5e77a1db4d45 | 52 | case ACTION_MODIFY: { |
jmarkel44 | 5:5e77a1db4d45 | 53 | (void)modifyControl(msg); |
jmarkel44 | 5:5e77a1db4d45 | 54 | break; |
jmarkel44 | 5:5e77a1db4d45 | 55 | } |
jmarkel44 | 5:5e77a1db4d45 | 56 | case ACTION_DESTROY: { |
jmarkel44 | 5:5e77a1db4d45 | 57 | (void)destroyControl(msg); |
jmarkel44 | 5:5e77a1db4d45 | 58 | break; |
jmarkel44 | 5:5e77a1db4d45 | 59 | } |
jmarkel44 | 5:5e77a1db4d45 | 60 | default: |
jmarkel44 | 5:5e77a1db4d45 | 61 | break; |
jmarkel44 | 5:5e77a1db4d45 | 62 | } |
jmarkel44 | 5:5e77a1db4d45 | 63 | |
jmarkel44 | 5:5e77a1db4d45 | 64 | // free the message |
jmarkel44 | 5:5e77a1db4d45 | 65 | MailBox.free(msg); |
jmarkel44 | 5:5e77a1db4d45 | 66 | } |
jmarkel44 | 0:65cfa4873284 | 67 | } |
jmarkel44 | 0:65cfa4873284 | 68 | } |
jmarkel44 | 5:5e77a1db4d45 | 69 | |
jmarkel44 | 12:ea87887ca7ad | 70 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 71 | * Function: ConfigurationHandler_showControls() |
jmarkel44 | 13:c80c283f9db2 | 72 | * Description: show the controls |
jmarkel44 | 12:ea87887ca7ad | 73 | * |
jmarkel44 | 12:ea87887ca7ad | 74 | * @param msg |
jmarkel44 | 12:ea87887ca7ad | 75 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 76 | *****************************************************************************/ |
jmarkel44 | 12:ea87887ca7ad | 77 | void ConfigurationHandler_showControls(void) |
jmarkel44 | 12:ea87887ca7ad | 78 | { |
jmarkel44 | 12:ea87887ca7ad | 79 | if ( !timerTable.empty() ) { |
jmarkel44 | 12:ea87887ca7ad | 80 | printf("\rTIMER CONTROLS\n"); |
jmarkel44 | 12:ea87887ca7ad | 81 | StringTimerMap::iterator pos; |
jmarkel44 | 46:4cb96ab2d1c8 | 82 | for ( pos = timerTable.begin(); pos != timerTable.end(); ++pos ) { |
jmarkel44 | 46:4cb96ab2d1c8 | 83 | printf("\r control file: %32s\n", |
jmarkel44 | 46:4cb96ab2d1c8 | 84 | pos->second->getControlFile().c_str()); |
jmarkel44 | 12:ea87887ca7ad | 85 | } |
jmarkel44 | 12:ea87887ca7ad | 86 | } |
jmarkel44 | 74:03ccf04998b5 | 87 | |
jmarkel44 | 12:ea87887ca7ad | 88 | if ( !setpointTable.empty() ) { |
jmarkel44 | 12:ea87887ca7ad | 89 | printf("\rSETPOINT CONTROLS\n"); |
jmarkel44 | 12:ea87887ca7ad | 90 | StringSetpointMap::iterator pos; |
jmarkel44 | 12:ea87887ca7ad | 91 | for ( pos = setpointTable.begin(); |
jmarkel44 | 12:ea87887ca7ad | 92 | pos != setpointTable.end(); |
jmarkel44 | 12:ea87887ca7ad | 93 | ++pos ) { |
jmarkel44 | 28:c410a61238bb | 94 | printf("\r controlFile : %s \n", pos->second->getControlFile().c_str()); |
jmarkel44 | 28:c410a61238bb | 95 | printf("\r id : %s \n", pos->second->getId().c_str()); |
jmarkel44 | 28:c410a61238bb | 96 | printf("\r name : %s \n", pos->second->getName().c_str()); |
jmarkel44 | 28:c410a61238bb | 97 | printf("\r priority : %d \n", pos->second->getPriority()); |
jmarkel44 | 28:c410a61238bb | 98 | printf("\r input : %s \n", pos->second->getInput().c_str()); |
jmarkel44 | 28:c410a61238bb | 99 | printf("\r output : %s \n", pos->second->getOutput().c_str()); |
jmarkel44 | 28:c410a61238bb | 100 | printf("\r prodfact : %0.2f\n", pos->second->getProductFactor()); |
jmarkel44 | 28:c410a61238bb | 101 | printf("\r halert : %0.2f\n", pos->second->getHighAlert()); |
jmarkel44 | 28:c410a61238bb | 102 | printf("\r lalert : %0.2f\n", pos->second->getLowAlert()); |
jmarkel44 | 28:c410a61238bb | 103 | printf("\r hfs : %0.2f\n", pos->second->getHighFailsafe()); |
jmarkel44 | 28:c410a61238bb | 104 | printf("\r lfs : %0.2f\n", pos->second->getLowFailsafe()); |
jmarkel44 | 28:c410a61238bb | 105 | printf("\r tol : %0.2f\n", pos->second->getTol()); |
jmarkel44 | 28:c410a61238bb | 106 | printf("\r\n"); |
jmarkel44 | 51:66b820f203a5 | 107 | printf("\r currentState: %u\n", pos->second->getCurrentState()); |
jmarkel44 | 51:66b820f203a5 | 108 | printf("\r\n"); |
jmarkel44 | 12:ea87887ca7ad | 109 | } |
jmarkel44 | 12:ea87887ca7ad | 110 | } |
jmarkel44 | 12:ea87887ca7ad | 111 | } |
jmarkel44 | 12:ea87887ca7ad | 112 | |
jmarkel44 | 12:ea87887ca7ad | 113 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 114 | * Function: loadPersistentControls() |
jmarkel44 | 12:ea87887ca7ad | 115 | * Description: load persistent controls from flash |
jmarkel44 | 12:ea87887ca7ad | 116 | * |
jmarkel44 | 12:ea87887ca7ad | 117 | * @param none |
jmarkel44 | 12:ea87887ca7ad | 118 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 119 | *****************************************************************************/ |
jmarkel44 | 12:ea87887ca7ad | 120 | static int loadPersistentControls(void) |
jmarkel44 | 12:ea87887ca7ad | 121 | { |
jmarkel44 | 12:ea87887ca7ad | 122 | static bool loaded = false; |
jmarkel44 | 12:ea87887ca7ad | 123 | |
jmarkel44 | 12:ea87887ca7ad | 124 | if ( !loaded ) { // lazy protection |
jmarkel44 | 74:03ccf04998b5 | 125 | // loop through all the control files and create the controls |
jmarkel44 | 74:03ccf04998b5 | 126 | printf("\rLoading persistent controls\n"); |
jmarkel44 | 74:03ccf04998b5 | 127 | std::vector<mDot::mdot_file> file_list = GLOBAL_mdot->listUserFiles(); |
jmarkel44 | 74:03ccf04998b5 | 128 | |
jmarkel44 | 74:03ccf04998b5 | 129 | for (std::vector<mDot::mdot_file>::iterator i = file_list.begin(); i != file_list.end(); ++i) { |
jmarkel44 | 74:03ccf04998b5 | 130 | if( strncmp( i->name, CONTROL_SP_STR, strlen(CONTROL_SP_STR)) == 0 ) { |
jmarkel44 | 74:03ccf04998b5 | 131 | // load the setpoint control |
jmarkel44 | 74:03ccf04998b5 | 132 | Message_t msg; |
jmarkel44 | 74:03ccf04998b5 | 133 | msg.control = CONTROL_SETPOINT; |
jmarkel44 | 74:03ccf04998b5 | 134 | strncpy(msg.controlFile, i->name, sizeof(msg.controlFile)); |
jmarkel44 | 74:03ccf04998b5 | 135 | int rc = createControl(&msg); |
jmarkel44 | 74:03ccf04998b5 | 136 | if ( rc != 0 ) { |
jmarkel44 | 74:03ccf04998b5 | 137 | } else { |
jmarkel44 | 74:03ccf04998b5 | 138 | printf("\r control %s loaded.\n", msg.controlFile); |
jmarkel44 | 74:03ccf04998b5 | 139 | } |
jmarkel44 | 74:03ccf04998b5 | 140 | } else if ( strncmp( i->name, CONTROL_TM_STR, strlen(CONTROL_TM_STR)) == 0 ) { |
jmarkel44 | 74:03ccf04998b5 | 141 | // load the timer control |
jmarkel44 | 74:03ccf04998b5 | 142 | Message_t msg; |
jmarkel44 | 74:03ccf04998b5 | 143 | msg.control = CONTROL_TIMER; |
jmarkel44 | 74:03ccf04998b5 | 144 | strncpy(msg.controlFile, i->name, sizeof(msg.controlFile)); |
jmarkel44 | 74:03ccf04998b5 | 145 | int rc = createControl(&msg); |
jmarkel44 | 74:03ccf04998b5 | 146 | if ( rc != 0 ) { |
jmarkel44 | 74:03ccf04998b5 | 147 | } else { |
jmarkel44 | 74:03ccf04998b5 | 148 | printf("\r control %s loaded.\n", msg.controlFile); |
jmarkel44 | 74:03ccf04998b5 | 149 | } |
jmarkel44 | 74:03ccf04998b5 | 150 | } else if ( strncmp( i->name, CONTROL_MN_STR, strlen(CONTROL_MN_STR)) == 0 ) { |
jmarkel44 | 74:03ccf04998b5 | 151 | // TODO: load the manual control -> these may not persist |
jmarkel44 | 74:03ccf04998b5 | 152 | } else { |
jmarkel44 | 74:03ccf04998b5 | 153 | // not a control file |
jmarkel44 | 74:03ccf04998b5 | 154 | } |
jmarkel44 | 74:03ccf04998b5 | 155 | } |
jmarkel44 | 12:ea87887ca7ad | 156 | } |
jmarkel44 | 12:ea87887ca7ad | 157 | return 0; |
jmarkel44 | 12:ea87887ca7ad | 158 | } |
jmarkel44 | 12:ea87887ca7ad | 159 | |
jmarkel44 | 12:ea87887ca7ad | 160 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 161 | * Function: createControl() |
jmarkel44 | 12:ea87887ca7ad | 162 | * Description: creates a new control |
jmarkel44 | 12:ea87887ca7ad | 163 | * |
jmarkel44 | 12:ea87887ca7ad | 164 | * @param none |
jmarkel44 | 12:ea87887ca7ad | 165 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 166 | *****************************************************************************/ |
jmarkel44 | 5:5e77a1db4d45 | 167 | static int createControl(const Message_t *msg) |
jmarkel44 | 5:5e77a1db4d45 | 168 | { |
jmarkel44 | 37:7e6986b77f01 | 169 | logInfo("\r%s invoked\n", __func__); |
jmarkel44 | 5:5e77a1db4d45 | 170 | |
jmarkel44 | 5:5e77a1db4d45 | 171 | switch (msg->control) { |
jmarkel44 | 5:5e77a1db4d45 | 172 | case CONTROL_SETPOINT: { |
jmarkel44 | 46:4cb96ab2d1c8 | 173 | SetpointControl *setpointControl = new SetpointControl; |
jmarkel44 | 28:c410a61238bb | 174 | bool rc = setpointControl->load(msg->controlFile); |
jmarkel44 | 19:9bc8fabeddfa | 175 | if ( rc != true ) { |
jmarkel44 | 19:9bc8fabeddfa | 176 | logError("%s: failed to load %s\n", __func__, msg->controlFile); |
jmarkel44 | 19:9bc8fabeddfa | 177 | delete setpointControl; |
jmarkel44 | 19:9bc8fabeddfa | 178 | } else { |
jmarkel44 | 19:9bc8fabeddfa | 179 | setpointTable[msg->controlFile] = setpointControl; |
jmarkel44 | 74:03ccf04998b5 | 180 | // start the setpoint control |
jmarkel44 | 74:03ccf04998b5 | 181 | setpointControl->start(); |
jmarkel44 | 19:9bc8fabeddfa | 182 | } |
jmarkel44 | 5:5e77a1db4d45 | 183 | break; |
jmarkel44 | 5:5e77a1db4d45 | 184 | } |
jmarkel44 | 5:5e77a1db4d45 | 185 | case CONTROL_TIMER: { |
jmarkel44 | 46:4cb96ab2d1c8 | 186 | TimerControl *timerControl = new TimerControl; |
jmarkel44 | 28:c410a61238bb | 187 | bool rc = timerControl->load(msg->controlFile); |
jmarkel44 | 19:9bc8fabeddfa | 188 | if ( rc != true ) { |
jmarkel44 | 19:9bc8fabeddfa | 189 | logError("%s: failed to load %s\n", __func__, msg->controlFile); |
jmarkel44 | 19:9bc8fabeddfa | 190 | delete timerControl; |
jmarkel44 | 19:9bc8fabeddfa | 191 | } else { |
jmarkel44 | 19:9bc8fabeddfa | 192 | timerTable[msg->controlFile] = timerControl; |
jmarkel44 | 19:9bc8fabeddfa | 193 | } |
jmarkel44 | 5:5e77a1db4d45 | 194 | break; |
jmarkel44 | 5:5e77a1db4d45 | 195 | } |
jmarkel44 | 46:4cb96ab2d1c8 | 196 | case CONTROL_MANUAL: { |
jmarkel44 | 46:4cb96ab2d1c8 | 197 | #if 0 |
jmarkel44 | 46:4cb96ab2d1c8 | 198 | ManualControl *manualControl = new ManualControl; |
jmarkel44 | 46:4cb96ab2d1c8 | 199 | bool rc = manualControl->load(msg->controlFile); |
jmarkel44 | 46:4cb96ab2d1c8 | 200 | if ( rc != true ) { |
jmarkel44 | 46:4cb96ab2d1c8 | 201 | logError("%s: failed to load %s\n", __func__, msg->controlFile); |
jmarkel44 | 46:4cb96ab2d1c8 | 202 | delete manualControl; |
jmarkel44 | 46:4cb96ab2d1c8 | 203 | } else { |
jmarkel44 | 46:4cb96ab2d1c8 | 204 | manualTable[msg->controlFile] = manualControl; |
jmarkel44 | 46:4cb96ab2d1c8 | 205 | } |
jmarkel44 | 46:4cb96ab2d1c8 | 206 | #endif |
jmarkel44 | 46:4cb96ab2d1c8 | 207 | break; |
jmarkel44 | 46:4cb96ab2d1c8 | 208 | } |
jmarkel44 | 19:9bc8fabeddfa | 209 | case CONTROL_PID: |
jmarkel44 | 19:9bc8fabeddfa | 210 | case CONTROL_COMPOSITE: |
jmarkel44 | 5:5e77a1db4d45 | 211 | default: |
jmarkel44 | 46:4cb96ab2d1c8 | 212 | logInfo("\r%s: control type %d not implemented yet...\n", |
jmarkel44 | 46:4cb96ab2d1c8 | 213 | __func__, msg->control); |
jmarkel44 | 5:5e77a1db4d45 | 214 | break; |
jmarkel44 | 5:5e77a1db4d45 | 215 | } |
jmarkel44 | 5:5e77a1db4d45 | 216 | return 0; |
jmarkel44 | 5:5e77a1db4d45 | 217 | } |
jmarkel44 | 12:ea87887ca7ad | 218 | |
jmarkel44 | 12:ea87887ca7ad | 219 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 220 | * Function: modifyControl() |
jmarkel44 | 12:ea87887ca7ad | 221 | * Description: modifies a control |
jmarkel44 | 12:ea87887ca7ad | 222 | * |
jmarkel44 | 12:ea87887ca7ad | 223 | * @param msg |
jmarkel44 | 12:ea87887ca7ad | 224 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 225 | *****************************************************************************/ |
jmarkel44 | 5:5e77a1db4d45 | 226 | static int modifyControl(const Message_t *msg) |
jmarkel44 | 5:5e77a1db4d45 | 227 | { |
jmarkel44 | 37:7e6986b77f01 | 228 | logInfo("\r%s invoked\n", __func__); |
jmarkel44 | 46:4cb96ab2d1c8 | 229 | |
jmarkel44 | 46:4cb96ab2d1c8 | 230 | // TODO: can we delete the current object and start a new one? |
jmarkel44 | 5:5e77a1db4d45 | 231 | return 0; |
jmarkel44 | 5:5e77a1db4d45 | 232 | |
jmarkel44 | 5:5e77a1db4d45 | 233 | } |
jmarkel44 | 12:ea87887ca7ad | 234 | |
jmarkel44 | 12:ea87887ca7ad | 235 | /***************************************************************************** |
jmarkel44 | 12:ea87887ca7ad | 236 | * Function: destroyControl() |
jmarkel44 | 12:ea87887ca7ad | 237 | * Description: destroys a controls |
jmarkel44 | 12:ea87887ca7ad | 238 | * |
jmarkel44 | 12:ea87887ca7ad | 239 | * @param msg |
jmarkel44 | 12:ea87887ca7ad | 240 | * @return none |
jmarkel44 | 12:ea87887ca7ad | 241 | *****************************************************************************/ |
jmarkel44 | 5:5e77a1db4d45 | 242 | static int destroyControl(const Message_t *msg) |
jmarkel44 | 5:5e77a1db4d45 | 243 | { |
jmarkel44 | 37:7e6986b77f01 | 244 | logInfo("\r%s invoked\n", __func__); |
jmarkel44 | 12:ea87887ca7ad | 245 | |
jmarkel44 | 12:ea87887ca7ad | 246 | switch ( msg->control ) { |
jmarkel44 | 12:ea87887ca7ad | 247 | case CONTROL_SETPOINT: { |
jmarkel44 | 12:ea87887ca7ad | 248 | StringSetpointMap::iterator pos; |
jmarkel44 | 12:ea87887ca7ad | 249 | pos = setpointTable.find(msg->controlFile); |
jmarkel44 | 12:ea87887ca7ad | 250 | if ( pos != setpointTable.end() ) { |
jmarkel44 | 74:03ccf04998b5 | 251 | pos->second->unregisterControl(); |
jmarkel44 | 12:ea87887ca7ad | 252 | delete (pos->second); |
jmarkel44 | 12:ea87887ca7ad | 253 | setpointTable.erase(pos); |
jmarkel44 | 12:ea87887ca7ad | 254 | } |
jmarkel44 | 12:ea87887ca7ad | 255 | break; |
jmarkel44 | 12:ea87887ca7ad | 256 | } |
jmarkel44 | 12:ea87887ca7ad | 257 | case CONTROL_TIMER: { |
jmarkel44 | 12:ea87887ca7ad | 258 | StringTimerMap::iterator pos; |
jmarkel44 | 12:ea87887ca7ad | 259 | pos = timerTable.find(msg->controlFile); |
jmarkel44 | 12:ea87887ca7ad | 260 | if ( pos != timerTable.end() ) { |
jmarkel44 | 12:ea87887ca7ad | 261 | delete (pos->second); |
jmarkel44 | 12:ea87887ca7ad | 262 | timerTable.erase(pos); |
jmarkel44 | 12:ea87887ca7ad | 263 | } |
jmarkel44 | 12:ea87887ca7ad | 264 | break; |
jmarkel44 | 12:ea87887ca7ad | 265 | } |
jmarkel44 | 46:4cb96ab2d1c8 | 266 | case CONTROL_MANUAL: { |
jmarkel44 | 46:4cb96ab2d1c8 | 267 | #if 0 |
jmarkel44 | 46:4cb96ab2d1c8 | 268 | StringManualMap::iterator pos; |
jmarkel44 | 46:4cb96ab2d1c8 | 269 | pos = manualTable.find(msg->controlFile); |
jmarkel44 | 46:4cb96ab2d1c8 | 270 | if ( pos != manualTable.end() ) { |
jmarkel44 | 46:4cb96ab2d1c8 | 271 | delete (pos->second); |
jmarkel44 | 46:4cb96ab2d1c8 | 272 | manualTable.erase(pos); |
jmarkel44 | 46:4cb96ab2d1c8 | 273 | } |
jmarkel44 | 46:4cb96ab2d1c8 | 274 | #endif |
jmarkel44 | 46:4cb96ab2d1c8 | 275 | break; |
jmarkel44 | 46:4cb96ab2d1c8 | 276 | } |
jmarkel44 | 12:ea87887ca7ad | 277 | default: |
jmarkel44 | 12:ea87887ca7ad | 278 | break; |
jmarkel44 | 12:ea87887ca7ad | 279 | } |
jmarkel44 | 12:ea87887ca7ad | 280 | return 0; |
jmarkel44 | 20:653923c2f37a | 281 | } |