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/OutputTask/OutputTask.cpp
- Revision:
- 268:50bed2502270
- Parent:
- 242:3b0086a6d625
- Child:
- 269:97243a7f56ba
--- a/src/OutputTask/OutputTask.cpp Mon Oct 24 21:10:52 2016 +0000
+++ b/src/OutputTask/OutputTask.cpp Tue Oct 25 13:56:14 2016 +0000
@@ -26,7 +26,6 @@
//
// this is the main data structure used to distinguish which control has
// priority of an output. the layout is as-follows:
-//
// outputMap["o_rly1"]-> Control<"ManControl_rly1", 100, ON > <<- highest pri control manipulates relay
// Control<"SetpointControl_rly1", 800, OFF> <<- lowest pri (queued up)
//
@@ -126,7 +125,7 @@
* @param control -> the control, this can be null
* @return none
*****************************************************************************/
-void recordEvent(std::string output, const Control *control)
+void recordEvent(std::string output, const Control* control)
{
EventReasonStruct_t ev;
@@ -224,7 +223,7 @@
recordEvent(pos->first, NULL);
} else {
ModbusMasterWriteRegister(pos->first, pos->second.begin()->getMappedState());
- recordEvent(pos->first, (Control*)pos->second.begin());
+ recordEvent(pos->first, pos->second.begin());
}
} else {
logError("%s failed to find the selected output %s",
