From cd6bc7457da87c91b3a6737f5c083eee35e388ac Mon Sep 17 00:00:00 2001 From: proddy Date: Wed, 18 Nov 2020 19:15:18 +0100 Subject: [PATCH] auto formatting --- lib/uuid-console/src/shell.cpp | 18 +++++++++--------- src/devices/boiler.cpp | 10 ++++------ src/devices/switch.cpp | 7 +++---- src/devices/thermostat.cpp | 6 +++--- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/lib/uuid-console/src/shell.cpp b/lib/uuid-console/src/shell.cpp index c0c086080..c5f2d9ca8 100644 --- a/lib/uuid-console/src/shell.cpp +++ b/lib/uuid-console/src/shell.cpp @@ -220,11 +220,11 @@ void Shell::loop_normal() { line_buffer_.clear(); cursor_ = 0; } else if (c == 'C') { // cursor right - if (cursor_) { + if (cursor_) { cursor_--; } } else if (c == 'D') { // cursor left - if (cursor_ < line_buffer_.length()) { + if (cursor_ < line_buffer_.length()) { cursor_++; } } else if (c == 'H') { // Home @@ -236,7 +236,7 @@ void Shell::loop_normal() { esc_ = 11 + c - 'P'; } if (c == '~' || (c >= 'P' && c <= 'Z')) { // function keys with number ESCn~ - if ((esc_ == 3) && cursor_) { // del + if ((esc_ == 3) && cursor_) { // del cursor_--; line_buffer_.erase(line_buffer_.length() - cursor_ - 1, 1); } else if (esc_ == 4) { // end @@ -265,7 +265,7 @@ void Shell::loop_normal() { set_command_str(F("call system settings")); } else if (esc_ == 23) { // F11 line_buffer_ = read_flash_string(F("call send \"0B \"")); - cursor_ = 1; + cursor_ = 1; } else if (esc_ == 24) { // F12 set_command_str(F("log debug; watch raw")); } @@ -275,7 +275,7 @@ void Shell::loop_normal() { } else if ((c != '[') && (c != 'O')) { // all other chars except start of sequence esc_ = 0; } - // process normal ascii text + // process normal ascii text } else if (c >= '\x20' && c <= '\x7E') { if (line_buffer_.length() < maximum_command_line_length_) { line_buffer_.insert(line_buffer_.length() - cursor_, 1, c); @@ -467,8 +467,8 @@ void Shell::delete_buffer_word(bool display) { } else { if (display) { size_t pos1 = 0; - pos = 0; - while (pos1 < line_buffer_.length() - cursor_) { + pos = 0; + while (pos1 < line_buffer_.length() - cursor_) { pos = pos1; pos1 = line_buffer_.find(' ', pos + 1); } @@ -502,7 +502,7 @@ void Shell::process_command() { while (!line_buffer_.empty()) { size_t pos = line_buffer_.find(';'); std::string line1; - if (pos < line_buffer_.length()) { + if (pos < line_buffer_.length()) { line1 = line_buffer_.substr(0, pos); line_buffer_.erase(0, pos + 1); } else { @@ -576,7 +576,7 @@ void Shell::process_password(bool completed) { void Shell::invoke_command(const std::string & line) { erase_current_line(); prompt_displayed_ = false; - line_buffer_ = line; + line_buffer_ = line; display_prompt(); process_command(); } diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index ee3f92e1d..8f338da35 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -185,7 +185,6 @@ void Boiler::register_mqtt_ha_config_ww() { // send stuff to the Web UI void Boiler::device_info_web(JsonArray & root) { // fetch the values into a JSON document - // DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_LARGE); StaticJsonDocument doc; JsonObject json = doc.to(); if (!export_values_main(json)) { @@ -234,6 +233,7 @@ void Boiler::device_info_web(JsonArray & root) { if (!export_values_ww(json)) { // append ww values return; } + // ww print_value_json(root, F("wWSelTemp"), nullptr, F_(wWSelTemp), F_(degrees), json); print_value_json(root, F("wWSetTemp"), nullptr, F_(wWSetTemp), F_(degrees), json); @@ -679,13 +679,11 @@ void Boiler::show_values(uuid::console::Shell & shell) { EMSdevice::show_values(shell); // for showing the header // fetch the values into a JSON document - // DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_LARGE); StaticJsonDocument doc; JsonObject json = doc.to(); if (!export_values_main(json)) { return; // empty } - // doc.shrinkToFit(); print_value_json(shell, F("heatingActive"), nullptr, F_(heatingActive), nullptr, json); print_value_json(shell, F("tapwaterActive"), nullptr, F_(tapwaterActive), nullptr, json); @@ -1045,9 +1043,9 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr telegram) { if (telegram->message_data[4] & 0x80) { // valid date char code[3]; uint16_t codeNo; - code[0] = telegram->message_data[0]; - code[1] = telegram->message_data[1]; - code[2] = 0; + code[0] = telegram->message_data[0]; + code[1] = telegram->message_data[1]; + code[2] = 0; telegram->read_value(codeNo, 2); uint16_t year = (telegram->message_data[4] & 0x7F) + 2000; uint8_t month = telegram->message_data[5]; diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp index 62ad9904f..93c9dce9e 100644 --- a/src/devices/switch.cpp +++ b/src/devices/switch.cpp @@ -75,7 +75,6 @@ void Switch::publish_values(JsonObject & json, bool force) { // export values to JSON bool Switch::export_values(JsonObject & json) { - if (Helpers::hasValue(flowTemp_)) { char s[7]; json["activated"] = Helpers::render_value(s, activated_, EMS_VALUE_BOOL); @@ -148,12 +147,12 @@ void Switch::register_mqtt_ha_config() { } // message 0x9B switch on/off -void Switch::process_WM10SetMessage(std::shared_ptr telegram){ +void Switch::process_WM10SetMessage(std::shared_ptr telegram) { changed_ |= telegram->read_value(activated_, 0); } -// message 0x9C holds flowtemp and unknown statusvalue -void Switch::process_WM10MonitorMessage(std::shared_ptr telegram){ +// message 0x9C holds flowtemp and unknown status value +void Switch::process_WM10MonitorMessage(std::shared_ptr telegram) { changed_ |= telegram->read_value(flowTemp_, 0); // is * 10 changed_ |= telegram->read_value(status_, 2); } diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 57b5c4f4d..540affea0 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1602,9 +1602,9 @@ void Thermostat::process_RCErrorMessage(std::shared_ptr telegram if (telegram->message_data[4] & 0x80) { // valid date char code[3]; uint16_t codeNo; - code[0] = telegram->message_data[0]; - code[1] = telegram->message_data[1]; - code[2] = 0; + code[0] = telegram->message_data[0]; + code[1] = telegram->message_data[1]; + code[2] = 0; telegram->read_value(codeNo, 2); uint16_t year = (telegram->message_data[4] & 0x7F) + 2000; uint8_t month = telegram->message_data[5];