tylen/SHOH-Innovation-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

threads: relay: [#46] use new Event

Browse Source
This commit is contained in:
Vasily Davydov 2023-05-18 23:32:27 +03:00
parent 23dda8ba74
commit c5692fd5ba
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/shoh/src/threads/relay/Relay.cpp
View File

@ -87,16 +87,10 @@ void Relay::taskFunction()
} }
} }
void Relay::parseEvent(Event* d) void Relay::parseEvent(Event* e)
{ {
for (uint8_t i = Event::ExternalTemp; i <= Event::SetPoint; i++) EventRawData rd = e->getData();
{ switch(e->getType() /* EventType */)
EventRawData rd = d->getDataOf(static_cast<Event::EventType>(i));
if(rd == ERROR_RETURN)
{
continue;
}
switch(i /* EventType */)
{ {
case Event::ExternalTemp: case Event::ExternalTemp:
ext_temp = rd; ext_temp = rd;
@ -108,8 +102,6 @@ void Relay::parseEvent(Event* d)
assert(0); assert(0);
break; break;
} }
}
} }
void Relay::utilizeEventData() void Relay::utilizeEventData()

2
source/shoh/src/threads/relay/Relay.h
View File

@ -51,7 +51,7 @@ private:
RelayDevice relays [2] = {{0, 24, 0}, RelayDevice relays [2] = {{0, 24, 0},
{0, 26, 1}}; {0, 26, 1}};
void parseEvent(Event * d); void parseEvent(Event * e);
int8_t setpoint, ext_temp; int8_t setpoint, ext_temp;
}; };