andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

some typos

Browse Source
This commit is contained in:
MichaelDvP
2021-01-30 12:54:35 +01:00
parent e963a190f8
commit f769d02ef9
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dallassensor.cpp
View File

@@ -94,11 +94,13 @@ void DallasSensor::loop() {
} else if (time_now - last_activity_ > READ_TIMEOUT_MS) {
LOG_WARNING(F("Dallas sensor read timeout"));
state_ = State::IDLE;
sensorfails_++;
}
} else if (state_ == State::SCANNING) {
if (time_now - last_activity_ > SCAN_TIMEOUT_MS) {
LOG_ERROR(F("Dallas sensor scan timeout"));
state_ = State::IDLE;
sensorfails_++;
} else {
uint8_t addr[ADDR_LEN] = {0};

9
src/telegram.cpp
View File

@@ -279,7 +279,7 @@ void TxService::send() {
}
// if there's nothing in the queue to transmit or sending should be delayed, send back a poll and quit
if (tx_telegrams_.empty() || (delayed_send_ && uuid::get_uptime() < (delayed_send_ + POST_SEND_DELAY))) {
if (tx_telegrams_.empty() || (delayed_send_ && uuid::get_uptime() < delayed_send_)) {
send_poll();
return;
}
@@ -430,7 +430,7 @@ void TxService::add(const uint8_t operation,
}
if (front) {
tx_telegrams_.emplace_front(tx_telegram_id_++, std::move(telegram), false); // add to back of queue
tx_telegrams_.emplace_front(tx_telegram_id_++, std::move(telegram), false); // add to front of queue
} else {
tx_telegrams_.emplace_back(tx_telegram_id_++, std::move(telegram), false); // add to back of queue
}
@@ -538,8 +538,7 @@ void TxService::add(uint8_t operation, const uint8_t * data, const uint8_t lengt
if (front) {
// tx_telegrams_.push_front(qtxt); // add to front of queue
tx_telegrams_.emplace_front(tx_telegram_id_++, std::move(telegram), false); // add to back of queue
tx_telegrams_.emplace_front(tx_telegram_id_++, std::move(telegram), false); // add to front of queue
} else {
// tx_telegrams_.push_back(qtxt); // add to back of queue
tx_telegrams_.emplace_back(tx_telegram_id_++, std::move(telegram), false); // add to back of queue
@@ -664,7 +663,7 @@ uint16_t TxService::post_send_query() {
LOG_DEBUG(F("Sending post validate read, type ID 0x%02X to dest 0x%02X"), post_typeid, dest);
set_post_send_query(0); // reset
// delay the request if we have a different type_id for post_send_query
delayed_send_ = (this->telegram_last_->type_id == post_typeid) ? 0 : uuid::get_uptime();
delayed_send_ = (this->telegram_last_->type_id == post_typeid) ? 0 : (uuid::get_uptime() + POST_SEND_DELAY);
}
return post_typeid;