jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-10 18:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Added callback for yield

Browse Source
This commit is contained in:
Yurii
2023-11-11 05:00:55 +03:00
parent 5e8916b254
commit 6de6f7d138
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/CustomOpenTherm/CustomOpenTherm.h
View File

@@ -1,12 +1,12 @@
#include <Arduino.h> #include <Arduino.h>
#include <OpenTherm.h> #include <OpenTherm.h>
extern SchedulerClass Scheduler;
class CustomOpenTherm : public OpenTherm { class CustomOpenTherm : public OpenTherm {
private: private:
unsigned long send_ts = millis(); unsigned long send_ts = millis();
void(*handleSendRequestCallback)(unsigned long, unsigned long, OpenThermResponseStatus status, byte attempt); void(*handleSendRequestCallback)(unsigned long, unsigned long, OpenThermResponseStatus status, byte attempt);
void(*yieldCallback)(void*);
void* yieldArg;
public: public:
CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {} CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
@@ -14,10 +14,25 @@ public:
this->handleSendRequestCallback = handleSendRequestCallback; this->handleSendRequestCallback = handleSendRequestCallback;
} }
void setYieldCallback(void(*yieldCallback)(void*)) {
this->yieldCallback = yieldCallback;
this->yieldArg = nullptr;
}
void setYieldCallback(void(*yieldCallback)(void*), void* arg) {
this->yieldCallback = yieldCallback;
this->yieldArg = arg;
}
unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) { unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
_attempt++; _attempt++;
while (send_ts > 0 && millis() - send_ts < 200) { while (send_ts > 0 && millis() - send_ts < 200) {
Scheduler.yield(); if (yieldCallback != NULL) {
yieldCallback(yieldArg);
} else {
::yield();
}
} }
unsigned long _response; unsigned long _response;
@@ -25,19 +40,26 @@ public:
_response = 0; _response = 0;
} else { } else {
while (!isReady()) { while (!isReady()) {
Scheduler.yield(); if (yieldCallback != NULL) {
yieldCallback(yieldArg);
} else {
::yield();
}
process(); process();
} }
_response = getLastResponse(); _response = getLastResponse();
} }
OpenThermResponseStatus _responseStatus = getLastResponseStatus();
if (handleSendRequestCallback != NULL) { if (handleSendRequestCallback != NULL) {
handleSendRequestCallback(request, _response, getLastResponseStatus(), _attempt); handleSendRequestCallback(request, _response, _responseStatus, _attempt);
} }
send_ts = millis(); send_ts = millis();
if (getLastResponseStatus() == OpenThermResponseStatus::SUCCESS || _attempt >= attempts) { if (_responseStatus == OpenThermResponseStatus::SUCCESS || _responseStatus == OpenThermResponseStatus::INVALID || _attempt >= attempts) {
return _response; return _response;
} else { } else {
return sendRequest(request, attempts, _attempt); return sendRequest(request, attempts, _attempt);