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

auto formatting

Browse Source
This commit is contained in:
proddy
2021-04-21 21:17:02 +02:00
parent a951ebc3ed
commit 48c3aa7656
8 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/uuid-console/src/commands.cpp
View File

@@ -50,10 +50,7 @@ void Commands::add_command(const flash_string_vector & name, const flash_string_
add_command(0, 0, name, arguments, function, nullptr); add_command(0, 0, name, arguments, function, nullptr);
} }
void Commands::add_command(const flash_string_vector & name, void Commands::add_command(const flash_string_vector & name, const flash_string_vector & arguments, command_function function, argument_completion_function arg_function) {
const flash_string_vector & arguments,
command_function function,
argument_completion_function arg_function) {
add_command(0, 0, name, arguments, function, arg_function); add_command(0, 0, name, arguments, function, arg_function);
} }
@@ -61,20 +58,11 @@ void Commands::add_command(unsigned int context, unsigned int flags, const flash
add_command(context, flags, name, flash_string_vector{}, function, nullptr); add_command(context, flags, name, flash_string_vector{}, function, nullptr);
} }
void Commands::add_command(unsigned int context, void Commands::add_command(unsigned int context, unsigned int flags, const flash_string_vector & name, const flash_string_vector & arguments, command_function function) {
unsigned int flags,
const flash_string_vector & name,
const flash_string_vector & arguments,
command_function function) {
add_command(context, flags, name, arguments, function, nullptr); add_command(context, flags, name, arguments, function, nullptr);
} }
void Commands::add_command(unsigned int context, void Commands::add_command(unsigned int context, unsigned int flags, const flash_string_vector & name, const flash_string_vector & arguments, command_function function, argument_completion_function arg_function) {
unsigned int flags,
const flash_string_vector & name,
const flash_string_vector & arguments,
command_function function,
argument_completion_function arg_function) {
commands_.emplace(std::piecewise_construct, std::forward_as_tuple(context), std::forward_as_tuple(flags, name, arguments, function, arg_function)); commands_.emplace(std::piecewise_construct, std::forward_as_tuple(context), std::forward_as_tuple(flags, name, arguments, function, arg_function));
} }
@@ -179,8 +167,7 @@ bool Commands::find_longest_common_prefix(const std::multimap<size_t, const Comm
for (auto command_it = std::next(commands.begin()); command_it != commands.end(); command_it++) { for (auto command_it = std::next(commands.begin()); command_it != commands.end(); command_it++) {
// This relies on the null terminator character limiting the // This relies on the null terminator character limiting the
// length before it becomes longer than any of the strings // length before it becomes longer than any of the strings
if (pgm_read_byte(reinterpret_cast<PGM_P>(first) + length) if (pgm_read_byte(reinterpret_cast<PGM_P>(first) + length) != pgm_read_byte(reinterpret_cast<PGM_P>(*std::next(command_it->second->name_.begin(), component_prefix)) + length)) {
!= pgm_read_byte(reinterpret_cast<PGM_P>(*std::next(command_it->second->name_.begin(), component_prefix)) + length)) {
all_match = false; all_match = false;
break; break;
} }
@@ -275,8 +262,7 @@ Commands::Completion Commands::complete_command(Shell & shell, const CommandLine
result.replacement->push_back(std::move(read_flash_string(name))); result.replacement->push_back(std::move(read_flash_string(name)));
} }
if (command_line.total_size() > result.replacement->size() if (command_line.total_size() > result.replacement->size() && command_line.total_size() <= matching_command->name_.size() + matching_command->maximum_arguments()) {
&& command_line.total_size() <= matching_command->name_.size() + matching_command->maximum_arguments()) {
// Try to auto-complete arguments // Try to auto-complete arguments
std::vector<std::string> arguments{std::next(command_line->cbegin(), result.replacement->size()), command_line->cend()}; std::vector<std::string> arguments{std::next(command_line->cbegin(), result.replacement->size()), command_line->cend()};
@@ -526,11 +512,7 @@ void Commands::for_each_available_command(Shell & shell, apply_function f) const
} }
} }
Commands::Command::Command(unsigned int flags, Commands::Command::Command(unsigned int flags, const flash_string_vector name, const flash_string_vector arguments, command_function function, argument_completion_function arg_function)
const flash_string_vector name,
const flash_string_vector arguments,
command_function function,
argument_completion_function arg_function)
: flags_(flags) : flags_(flags)
, name_(name) , name_(name)
, arguments_(arguments) , arguments_(arguments)

4
lib/uuid-console/src/shell.cpp
View File

@@ -220,7 +220,7 @@ void Shell::loop_normal() {
if (line_no_ < MAX_LINES - 1) { if (line_no_ < MAX_LINES - 1) {
line_no_++; line_no_++;
} }
cursor_ = 0; cursor_ = 0;
} else if (c == 'B') { // cursor down } else if (c == 'B') { // cursor down
if (line_no_) { if (line_no_) {
line_no_--; line_no_--;
@@ -514,7 +514,7 @@ void Shell::process_command() {
while (--no) { while (--no) {
line_old_[no] = line_old_[no - 1]; line_old_[no] = line_old_[no - 1];
} }
line_no_ = 0; line_no_ = 0;
line_old_[0] = line_buffer_; line_old_[0] = line_buffer_;
while (!line_buffer_.empty()) { while (!line_buffer_.empty()) {
size_t pos = line_buffer_.find(';'); size_t pos = line_buffer_.find(';');

1
lib/uuid-console/src/shell_log.cpp
View File

@@ -96,7 +96,6 @@ void Shell::output_logs() {
} }
::yield(); ::yield();
} }
display_prompt(); display_prompt();
} }

16
lib/uuid-syslog/src/syslog.cpp
View File

@@ -395,9 +395,9 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
gmtime_r(&message.time_.tv_sec, &utc); gmtime_r(&message.time_.tv_sec, &utc);
localtime_r(&message.time_.tv_sec, &tm); localtime_r(&message.time_.tv_sec, &tm);
int16_t diff = 60 * (tm.tm_hour - utc.tm_hour) + tm.tm_min - utc.tm_min; int16_t diff = 60 * (tm.tm_hour - utc.tm_hour) + tm.tm_min - utc.tm_min;
diff = diff > 720 ? diff - 1440 : diff < -720 ? diff + 1440 : diff; diff = diff > 720 ? diff - 1440 : diff < -720 ? diff + 1440 : diff;
tzh = diff / 60; tzh = diff / 60;
tzm = diff < 0 ? (0 - diff) % 60 : diff % 60; tzm = diff < 0 ? (0 - diff) % 60 : diff % 60;
} }
if (udp_.beginPacket(host_, port_) != 1) { if (udp_.beginPacket(host_, port_) != 1) {
@@ -407,15 +407,7 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
udp_.printf_P(PSTR("<%u>1 "), ((unsigned int)message.content_->facility * 8) + std::min(7U, (unsigned int)message.content_->level)); udp_.printf_P(PSTR("<%u>1 "), ((unsigned int)message.content_->facility * 8) + std::min(7U, (unsigned int)message.content_->level));
if (tm.tm_year != 0) { if (tm.tm_year != 0) {
udp_.printf_P(PSTR("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+02d:%02d"), udp_.printf_P(PSTR("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+02d:%02d"), tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, (uint32_t)message.time_.tv_usec, tzh, tzm);
tm.tm_year + 1900,
tm.tm_mon + 1,
tm.tm_mday,
tm.tm_hour,
tm.tm_min,
tm.tm_sec,
(uint32_t)message.time_.tv_usec,
tzh, tzm);
} else { } else {
udp_.print('-'); udp_.print('-');
} }

8
src/devices/thermostat.cpp
View File

@@ -794,8 +794,8 @@ void Thermostat::process_RC300Set(std::shared_ptr<const Telegram> telegram) {
// check why mode is both in the Monitor and Set for the RC300. It'll be read twice! // check why mode is both in the Monitor and Set for the RC300. It'll be read twice!
// has_update(telegram->read_value(hc->mode, 0); // Auto = xFF, Manual = x00 eg. 10 00 FF 08 01 B9 FF // has_update(telegram->read_value(hc->mode, 0); // Auto = xFF, Manual = x00 eg. 10 00 FF 08 01 B9 FF
has_update(telegram->read_value(hc->daytemp, 2)); // is * 2 has_update(telegram->read_value(hc->daytemp, 2)); // is * 2
has_update(telegram->read_value(hc->nighttemp, 4)); // is * 2 has_update(telegram->read_value(hc->nighttemp, 4)); // is * 2
has_update(telegram->read_value(hc->tempautotemp, 8)); has_update(telegram->read_value(hc->tempautotemp, 8));
has_update(telegram->read_value(hc->manualtemp, 10)); // is * 2 has_update(telegram->read_value(hc->manualtemp, 10)); // is * 2
has_update(telegram->read_value(hc->program, 11)); // timer program 1 or 2 has_update(telegram->read_value(hc->program, 11)); // timer program 1 or 2
@@ -962,8 +962,8 @@ void Thermostat::process_RC35Set(std::shared_ptr<const Telegram> telegram) {
has_update(telegram->read_value(hc->reducemode, 25)); // 0-nofrost, 1-reduce, 2-roomhold, 3-outdoorhold has_update(telegram->read_value(hc->reducemode, 25)); // 0-nofrost, 1-reduce, 2-roomhold, 3-outdoorhold
has_update(telegram->read_value(hc->control, 26)); // 0-off, 1-RC20 (remote), 2-RC35 has_update(telegram->read_value(hc->control, 26)); // 0-off, 1-RC20 (remote), 2-RC35
has_update(telegram->read_value(hc->controlmode, 33)); // 0-outdoortemp, 1-roomtemp has_update(telegram->read_value(hc->controlmode, 33)); // 0-outdoortemp, 1-roomtemp
has_update(telegram->read_value(hc->tempautotemp, 37)); // 0-outdoortemp, 1-roomtemp has_update(telegram->read_value(hc->tempautotemp, 37)); // 0-outdoortemp, 1-roomtemp
has_update(telegram->read_value(hc->noreducetemp, 38)); // outdoor temperature for no reduce has_update(telegram->read_value(hc->noreducetemp, 38)); // outdoor temperature for no reduce
has_update(telegram->read_value(hc->minflowtemp, 16)); has_update(telegram->read_value(hc->minflowtemp, 16));
if (hc->heatingtype == 3) { if (hc->heatingtype == 3) {
has_update(telegram->read_value(hc->designtemp, 36)); // is * 1 has_update(telegram->read_value(hc->designtemp, 36)); // is * 1

2
src/emsdevice.cpp
View File

@@ -754,7 +754,7 @@ bool EMSdevice::generate_values_json(JsonObject & root, const uint8_t tag_filter
} }
} }
} }
dv.ha |= has_value ? DeviceValueHA::HA_VALUE : DeviceValueHA::HA_NONE; dv.ha |= has_value ? DeviceValueHA::HA_VALUE : DeviceValueHA::HA_NONE;
has_values |= has_value; has_values |= has_value;
} }

2
src/emsdevice.h
View File

@@ -142,7 +142,7 @@ enum DeviceValueTAG : uint8_t {
enum MqttSubFlag : uint8_t { FLAG_NORMAL = 0, FLAG_HC, FLAG_WWC, FLAG_NOSUB }; enum MqttSubFlag : uint8_t { FLAG_NORMAL = 0, FLAG_HC, FLAG_WWC, FLAG_NOSUB };
// mqtt-HA flags // mqtt-HA flags
enum DeviceValueHA : uint8_t { HA_NONE = 0, HA_VALUE, HA_DONE}; enum DeviceValueHA : uint8_t { HA_NONE = 0, HA_VALUE, HA_DONE };
class EMSdevice { class EMSdevice {
public: public:

2
src/mqtt.cpp
View File

@@ -898,7 +898,7 @@ void Mqtt::publish_mqtt_ha_sensor(uint8_t type, // EMSdevice
DynamicJsonDocument doc(EMSESP_JSON_SIZE_HA_CONFIG); DynamicJsonDocument doc(EMSESP_JSON_SIZE_HA_CONFIG);
bool have_tag = !EMSdevice::tag_to_string(tag).empty() && (device_type != EMSdevice::DeviceType::BOILER); // ignore boiler bool have_tag = !EMSdevice::tag_to_string(tag).empty() && (device_type != EMSdevice::DeviceType::BOILER); // ignore boiler
bool is_nested = (nested_format_ == 1) || (device_type == EMSdevice::DeviceType::BOILER); // boiler never uses nested bool is_nested = (nested_format_ == 1) || (device_type == EMSdevice::DeviceType::BOILER); // boiler never uses nested
// create entity by add the tag if present, seperating with a . // create entity by add the tag if present, seperating with a .
char new_entity[50]; char new_entity[50];