From 658a42db8042214579c298980b5f71d78bfa584b Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sat, 22 Jul 2023 18:00:41 +0200 Subject: [PATCH] Apply code formatter without functional changes --- include/WebApi.h | 2 +- lib/Hoymiles/src/Hoymiles.h | 2 +- lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp | 4 ++-- lib/Hoymiles/src/parser/AlarmLogParser.cpp | 4 ++-- lib/Hoymiles/src/parser/AlarmLogParser.h | 2 +- src/Configuration.cpp | 2 +- src/InverterSettings.cpp | 2 +- src/MqttSettings.cpp | 2 +- src/NetworkSettings.cpp | 9 +++------ src/WebApi_inverter.cpp | 2 +- src/WebApi_mqtt.cpp | 4 ++-- src/WebApi_prometheus.cpp | 9 +++------ src/WebApi_webapp.cpp | 2 +- src/WebApi_ws_live.cpp | 4 +--- 14 files changed, 21 insertions(+), 29 deletions(-) diff --git a/include/WebApi.h b/include/WebApi.h index ed1f386b..42e7dc17 100644 --- a/include/WebApi.h +++ b/include/WebApi.h @@ -2,11 +2,11 @@ #pragma once #include "WebApi_config.h" +#include "WebApi_device.h" #include "WebApi_devinfo.h" #include "WebApi_dtu.h" #include "WebApi_eventlog.h" #include "WebApi_firmware.h" -#include "WebApi_device.h" #include "WebApi_inverter.h" #include "WebApi_limit.h" #include "WebApi_maintenance.h" diff --git a/lib/Hoymiles/src/Hoymiles.h b/lib/Hoymiles/src/Hoymiles.h index 66bc0c13..a8f06550 100644 --- a/lib/Hoymiles/src/Hoymiles.h +++ b/lib/Hoymiles/src/Hoymiles.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "HoymilesRadio_NRF.h" #include "HoymilesRadio_CMT.h" +#include "HoymilesRadio_NRF.h" #include "inverters/InverterAbstract.h" #include "types.h" #include diff --git a/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp b/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp index bf4b04de..78bcd55e 100644 --- a/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp +++ b/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp @@ -35,11 +35,11 @@ void ActivePowerControlCommand::setActivePowerLimit(float limit, PowerLimitContr // limit _payload[12] = (l >> 8) & 0xff; - _payload[13] = (l) & 0xff; + _payload[13] = (l)&0xff; // type _payload[14] = (type >> 8) & 0xff; - _payload[15] = (type) & 0xff; + _payload[15] = (type)&0xff; udpateCRC(CRC_SIZE); } diff --git a/lib/Hoymiles/src/parser/AlarmLogParser.cpp b/lib/Hoymiles/src/parser/AlarmLogParser.cpp index 3e1dc664..536c412d 100644 --- a/lib/Hoymiles/src/parser/AlarmLogParser.cpp +++ b/lib/Hoymiles/src/parser/AlarmLogParser.cpp @@ -6,7 +6,7 @@ #include "../Hoymiles.h" #include -const std::array AlarmLogParser::_alarmMessages = {{ +const std::array AlarmLogParser::_alarmMessages = { { { AlarmMessageType_t::ALL, 1, "Inverter start" }, { AlarmMessageType_t::ALL, 2, "DTU command failed" }, { AlarmMessageType_t::ALL, 73, "Temperature >80°C" }, // https://github.com/tbnobody/OpenDTU/discussions/590#discussioncomment-6049750 @@ -84,7 +84,7 @@ const std::array AlarmLogParser::_alarmMe { AlarmMessageType_t::ALL, 5200, "Firmware error" }, { AlarmMessageType_t::ALL, 8310, "Shut down" }, { AlarmMessageType_t::ALL, 9000, "Microinverter is suspected of being stolen" }, -}}; +} }; void AlarmLogParser::clearBuffer() { diff --git a/lib/Hoymiles/src/parser/AlarmLogParser.h b/lib/Hoymiles/src/parser/AlarmLogParser.h index 0286db15..5e5faf87 100644 --- a/lib/Hoymiles/src/parser/AlarmLogParser.h +++ b/lib/Hoymiles/src/parser/AlarmLogParser.h @@ -2,8 +2,8 @@ #pragma once #include "Parser.h" #include -#include #include +#include #define ALARM_LOG_ENTRY_COUNT 15 #define ALARM_LOG_ENTRY_SIZE 12 diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 867adeaf..94a70b89 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -300,7 +300,7 @@ void ConfigurationClass::migrate() config.Mqtt_PublishInterval = mqtt["publish_invterval"]; } - if (config.Cfg_Version < 0x00011900) { + if (config.Cfg_Version < 0x00011900) { JsonObject dtu = doc["dtu"]; config.Dtu_NrfPaLevel = dtu["pa_level"]; } diff --git a/src/InverterSettings.cpp b/src/InverterSettings.cpp index a0482c0a..c7318ba9 100644 --- a/src/InverterSettings.cpp +++ b/src/InverterSettings.cpp @@ -15,7 +15,7 @@ // for all generations, this is equivalent to SPI3_HOST in the lower level driver // For ESP32-C2, the only externally usable HW SPI controller is SPI2, its signal names // being prefixed with FSPI. -#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #define SPI_NRF HSPI #elif CONFIG_IDF_TARGET_ESP32C3 #define SPI_NRF FSPI diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp index d5b29faf..a8829166 100644 --- a/src/MqttSettings.cpp +++ b/src/MqttSettings.cpp @@ -3,8 +3,8 @@ * Copyright (C) 2022 Thomas Basler and others */ #include "MqttSettings.h" -#include "MessageOutput.h" #include "Configuration.h" +#include "MessageOutput.h" MqttSettingsClass::MqttSettingsClass() { diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp index e43c69c9..68e5751c 100644 --- a/src/NetworkSettings.cpp +++ b/src/NetworkSettings.cpp @@ -159,8 +159,7 @@ void NetworkSettingsClass::loop() setStaticIp(); setHostname(); } - } else - if (_networkMode != network_mode::WiFi) { + } else if (_networkMode != network_mode::WiFi) { // Do stuff when switching to Ethernet mode MessageOutput.println("Switch to WiFi mode"); _networkMode = network_mode::WiFi; @@ -249,8 +248,7 @@ void NetworkSettingsClass::setHostname() WiFi.mode(WIFI_MODE_APSTA); WiFi.mode(WIFI_MODE_STA); setupMode(); - } - else if (_networkMode == network_mode::Ethernet) { + } else if (_networkMode == network_mode::Ethernet) { if (ETH.setHostname(getHostname().c_str())) { MessageOutput.println("done"); } else { @@ -276,8 +274,7 @@ void NetworkSettingsClass::setStaticIp() IPAddress(Configuration.get().WiFi_Dns2)); MessageOutput.println("done"); } - } - else if (_networkMode == network_mode::Ethernet) { + } else if (_networkMode == network_mode::Ethernet) { if (Configuration.get().WiFi_Dhcp) { MessageOutput.print("Configuring Ethernet DHCP IP... "); ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp index 495b5fac..120fac33 100644 --- a/src/WebApi_inverter.cpp +++ b/src/WebApi_inverter.cpp @@ -443,7 +443,7 @@ void WebApiInverterClass::onInverterOrder(AsyncWebServerRequest* request) // The order array contains list or id in the right order JsonArray orderArray = root["order"].as(); uint8_t order = 0; - for(JsonVariant id : orderArray) { + for (JsonVariant id : orderArray) { uint8_t inverter_id = id.as(); if (inverter_id < INV_MAX_COUNT) { INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[inverter_id]; diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp index 62e54e72..2ab426d1 100644 --- a/src/WebApi_mqtt.cpp +++ b/src/WebApi_mqtt.cpp @@ -221,8 +221,8 @@ void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request) } if (root["mqtt_root_ca_cert"].as().length() > MQTT_MAX_CERT_STRLEN - || root["mqtt_client_cert"].as().length() > MQTT_MAX_CERT_STRLEN - || root["mqtt_client_key"].as().length() > MQTT_MAX_CERT_STRLEN) { + || root["mqtt_client_cert"].as().length() > MQTT_MAX_CERT_STRLEN + || root["mqtt_client_key"].as().length() > MQTT_MAX_CERT_STRLEN) { retMsg["message"] = "Certificates must not be longer than " STR(MQTT_MAX_CERT_STRLEN) " characters!"; retMsg["code"] = WebApiError::MqttCertificateLength; retMsg["param"]["max"] = MQTT_MAX_CERT_STRLEN; diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp index 28b00331..18664946 100644 --- a/src/WebApi_prometheus.cpp +++ b/src/WebApi_prometheus.cpp @@ -143,8 +143,7 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se idx, inv->name(), channel, - config.Inverter[idx].channel[channel].Name - ); + config.Inverter[idx].channel[channel].Name); if (printHelp) { stream->print("# HELP opendtu_MaxPower panel maximum output power\n"); @@ -155,8 +154,7 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se idx, inv->name(), channel, - config.Inverter[idx].channel[channel].MaxChannelPower - ); + config.Inverter[idx].channel[channel].MaxChannelPower); if (printHelp) { stream->print("# HELP opendtu_YieldTotalOffset panel yield offset (for used inverters)\n"); @@ -167,6 +165,5 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se idx, inv->name(), channel, - config.Inverter[idx].channel[channel].YieldTotalOffset - ); + config.Inverter[idx].channel[channel].YieldTotalOffset); } diff --git a/src/WebApi_webapp.cpp b/src/WebApi_webapp.cpp index fd42da5c..90516ad6 100644 --- a/src/WebApi_webapp.cpp +++ b/src/WebApi_webapp.cpp @@ -58,7 +58,7 @@ void WebApiWebappClass::init(AsyncWebServer* server) #ifdef AUTO_GIT_HASH // check client If-None-Match header vs ETag/AUTO_GIT_HASH bool eTagMatch = false; - if(request->hasHeader("If-None-Match")){ + if (request->hasHeader("If-None-Match")) { AsyncWebHeader* h = request->getHeader("If-None-Match"); if (strncmp(AUTO_GIT_HASH, h->value().c_str(), strlen(AUTO_GIT_HASH)) == 0) { eTagMatch = true; diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp index 0213cc94..8b7c6a2e 100644 --- a/src/WebApi_ws_live.cpp +++ b/src/WebApi_ws_live.cpp @@ -169,9 +169,7 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root) JsonObject hintObj = root.createNestedObject("hints"); struct tm timeinfo; hintObj["time_sync"] = !getLocalTime(&timeinfo, 5); - hintObj["radio_problem"] = - (Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) || - (Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected())); + hintObj["radio_problem"] = (Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) || (Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected())); if (!strcmp(Configuration.get().Security_Password, ACCESS_POINT_PASSWORD)) { hintObj["default_password"] = true; } else {