Skip to content

Commit eab86d6

Browse files
authored
incorrect use of serial buffer status corrected (#111)
* incorrect use of serial buffer status corrected * unnecessary if's removed in ebus library * library updated * counter for failed 0704 added
1 parent 09530d5 commit eab86d6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Diff for: include/schedule.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class Schedule {
4949
std::deque<std::vector<uint8_t>> sendCommands;
5050
std::vector<uint8_t> sendCommand;
5151

52-
static bool busReadyCallback();
53-
static void busWriteCallback(const uint8_t byte);
52+
static void writeCallback(const uint8_t byte);
53+
static int readBufferCallback();
5454

5555
static void activeCallback(const std::vector<uint8_t> &master,
5656
const std::vector<uint8_t> &slave);

Diff for: platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ lib_deps =
1616
https://github.com/prampec/IotWebConf#v3.2.1
1717
heman/AsyncMqttClient-esphome@^2.1.0
1818
bblanchon/ArduinoJson@^7.2.0
19-
https://github.com/yuhu-/ebus#7a8b223
19+
https://github.com/yuhu-/ebus#56e782c
2020

2121
build_flags =
2222
-DIOTWEBCONF_CONFIG_DONT_USE_MDNS=1

Diff for: src/schedule.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Track<uint32_t> errorsActiveSlaveACK("ebus/errors/active/slaveACK", 10);
4343
// resets
4444
Track<uint32_t> resetsTotal("ebus/resets/total", 10);
4545
Track<uint32_t> resetsPassive00("ebus/resets/passive00", 10);
46+
Track<uint32_t> resetsPassive0704("ebus/resets/passive0704", 10);
4647
Track<uint32_t> resetsPassive("ebus/resets/passive", 10);
4748
Track<uint32_t> resetsActive("ebus/resets/active", 10);
4849

@@ -56,7 +57,7 @@ Track<uint32_t> requestsError("ebus/requests/error", 10);
5657
Schedule schedule;
5758

5859
Schedule::Schedule()
59-
: ebusHandler(0xff, &busReadyCallback, &busWriteCallback, &activeCallback,
60+
: ebusHandler(0xff, &writeCallback, &readBufferCallback, &activeCallback,
6061
&passiveCallback, &reactiveCallback) {
6162
ebusHandler.setErrorCallback(errorCallback);
6263
}
@@ -186,6 +187,7 @@ void Schedule::publishCounters() {
186187
// resets
187188
resetsTotal = counters.resetsTotal;
188189
resetsPassive00 = counters.resetsPassive00;
190+
resetsPassive0704 = counters.resetsPassive0704;
189191
resetsPassive = counters.resetsPassive;
190192
resetsActive = counters.resetsActive;
191193

@@ -197,9 +199,9 @@ void Schedule::publishCounters() {
197199
requestsError = counters.requestsError;
198200
}
199201

200-
bool Schedule::busReadyCallback() { return Bus.availableForWrite(); }
202+
void Schedule::writeCallback(const uint8_t byte) { Bus.write(byte); }
201203

202-
void Schedule::busWriteCallback(const uint8_t byte) { Bus.write(byte); }
204+
int Schedule::readBufferCallback() { return Bus.available(); }
203205

204206
void Schedule::activeCallback(const std::vector<uint8_t> &master,
205207
const std::vector<uint8_t> &slave) {

0 commit comments

Comments
 (0)