From f769d02ef9194dd5b161a3daa9c8c8dae008dcd5 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Sat, 30 Jan 2021 12:54:35 +0100 Subject: [PATCH] some typos --- src/WebSettingsService.cpp | 2 +- src/dallassensor.cpp | 2 ++ src/telegram.cpp | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/WebSettingsService.cpp b/src/WebSettingsService.cpp index ee0e6d618..1fc922b9f 100644 --- a/src/WebSettingsService.cpp +++ b/src/WebSettingsService.cpp @@ -79,7 +79,7 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) settings.syslog_level = root["syslog_level"] | EMSESP_DEFAULT_SYSLOG_LEVEL; settings.syslog_mark_interval = root["syslog_mark_interval"] | EMSESP_DEFAULT_SYSLOG_MARK_INTERVAL; settings.syslog_host = root["syslog_host"] | EMSESP_DEFAULT_SYSLOG_HOST; - settings.trace_raw = root["trace_raw"] | EMSESP_DEFAULT_TRACELOG_RAW ; + settings.trace_raw = root["trace_raw"] | EMSESP_DEFAULT_TRACELOG_RAW; EMSESP::trace_raw(settings.trace_raw); snprintf_P(&crc_after[0], crc_after.capacity() + 1, diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp index 2469405d0..29e73640e 100644 --- a/src/dallassensor.cpp +++ b/src/dallassensor.cpp @@ -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}; diff --git a/src/telegram.cpp b/src/telegram.cpp index ccb094e8f..d45f47813 100644 --- a/src/telegram.cpp +++ b/src/telegram.cpp @@ -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;