Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

[ESP32] Fix merge issue

Browse Source
This commit is contained in:
TD-er
2021-07-03 01:07:10 +02:00
parent 105a6eaa4e
commit 1341d7c706
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/ControllerQueue/queue_element_single_value_base.cpp
-17
View File
@@ -40,23 +40,6 @@ queue_element_single_value_base& queue_element_single_value_base::operator=(queu
return *this;
}
queue_element_single_value_base& queue_element_single_value_base::operator=(queue_element_single_value_base&& rval) {
idx = rval.idx;
_timestamp = rval._timestamp;
TaskIndex = rval.TaskIndex;
controller_idx = rval.controller_idx;
valuesSent = rval.valuesSent;
valueCount = rval.valueCount;
#ifdef USE_SECOND_HEAP
HeapSelectIram ephemeral;
#endif // ifdef USE_SECOND_HEAP
for (byte i = 0; i < VARS_PER_TASK; ++i) {
txt[i] = std::move(rval.txt[i]);
}
return *this;
}
bool queue_element_single_value_base::checkDone(bool succesfull) const {
if (succesfull) { ++valuesSent; }
return valuesSent >= valueCount || valuesSent >= VARS_PER_TASK;