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

temperature: Change to new Event.

Browse Source
This commit is contained in:
RedHawk 2023-05-19 00:10:47 +03:00
parent 05037d2677
commit 353fea2255
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/shoh/src/threads/manager/Menu.cpp
View File

@ -32,9 +32,11 @@ Menu::readSetPointFromEEPROM (void)
{ {
EventRawData *data = (EventRawData *)eeprom.read_from (EEPROM_START_ADDR, EventRawData *data = (EventRawData *)eeprom.read_from (EEPROM_START_ADDR,
sizeof(EventRawData)); sizeof(EventRawData));
if ((*data) > 0 && (*data) < 120) if ((*data) > 0 && (*data) < 100)
{ {
set_point.setCurrent(*data); set_point.setCurrent(*data);
Event e(Event::EventType::SetPoint, set_point.getCurrent());
_qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &e , 1);
} }
} }

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

@ -38,7 +38,8 @@ void inline RelayDevice::RelayOff()
} }
Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) Relay::Relay(ThreadCommon::QueueManager* qm):
_qm(qm), ext_temp(0x7f), setpoint(0)
{ {
LOG_DEBUG("Creating Relay"); LOG_DEBUG("Creating Relay");
} }
@ -95,9 +96,11 @@ void Relay::parseEvent(Event* e)
{ {
case Event::ExternalTemp: case Event::ExternalTemp:
ext_temp = rd; ext_temp = rd;
LOG_DEBUG("Relay got ext_temp: %d", rd);
break; break;
case Event::SetPoint: case Event::SetPoint:
setpoint = rd; setpoint = rd;
LOG_DEBUG("Relay got setpoint: %d", rd);
break; break;
default: default:
assert(0); assert(0);

2
source/shoh/src/threads/temperature/Temperature.cpp
View File

@ -30,7 +30,7 @@ void Temperature::taskFunction()
} }
LOG_DEBUG("External temperature is: %d", temp_value); LOG_DEBUG("External temperature is: %d", temp_value);
t.setDataOf(Event::ExternalTemp, temp_value); t.setEvent(Event::ExternalTemp, temp_value);
_qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &t, 0); _qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &t, 0);
vTaskDelay(5000); vTaskDelay(5000);
} }