From e7e607ce6f5da368fbba4f8a3725be99d5d8b36e Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Fri, 7 Feb 2025 22:57:01 +0100 Subject: [PATCH] Apply automatic code formatting --- include/Configuration.h | 4 ++-- include/MqttHandleHass.h | 1 - include/WebApi_webapp.h | 2 +- include/__compiled_constants.h | 5 ++--- lib/CMT2300a/cmt2300a_hal.h | 2 +- lib/CMT2300a/cmt_spi3.cpp | 11 ++++++----- lib/Hoymiles/src/Hoymiles.cpp | 4 ++-- .../src/commands/ActivePowerControlCommand.cpp | 6 +++--- lib/Hoymiles/src/commands/ChannelChangeCommand.h | 2 +- lib/Hoymiles/src/commands/CommandAbstract.cpp | 4 ++-- lib/Hoymiles/src/commands/CommandAbstract.h | 2 +- lib/Hoymiles/src/commands/MultiDataCommand.cpp | 4 ++-- lib/Hoymiles/src/parser/StatisticsParser.h | 1 + lib/ThreadSafeQueue/src/ThreadSafeQueue.h | 2 +- src/Configuration.cpp | 13 +++++++++---- src/MqttHandleDtu.cpp | 4 ++-- src/MqttHandleHass.cpp | 6 +++--- src/WebApi_gridprofile.cpp | 6 +++--- src/WebApi_prometheus.cpp | 4 ++-- src/WebApi_sysstatus.cpp | 6 ++++-- src/WebApi_webapp.cpp | 6 +++--- src/WebApi_ws_console.cpp | 6 ++++-- src/WebApi_ws_live.cpp | 8 +++++--- 23 files changed, 60 insertions(+), 49 deletions(-) diff --git a/include/Configuration.h b/include/Configuration.h index a21b05be..938fed08 100644 --- a/include/Configuration.h +++ b/include/Configuration.h @@ -2,10 +2,10 @@ #pragma once #include "PinMapping.h" -#include #include -#include #include +#include +#include #define CONFIG_FILENAME "/config.json" #define CONFIG_VERSION 0x00011d00 // 0.1.29 // make sure to clean all after change diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h index c0a22c70..fe5785e2 100644 --- a/include/MqttHandleHass.h +++ b/include/MqttHandleHass.h @@ -37,7 +37,6 @@ enum CategoryType { }; const char* const category_name[] = { 0, "config", "diagnostic" }; - typedef struct { FieldId_t fieldId; // field id DeviceClassType deviceClsId; // device class diff --git a/include/WebApi_webapp.h b/include/WebApi_webapp.h index 5330fbdf..bf18a799 100644 --- a/include/WebApi_webapp.h +++ b/include/WebApi_webapp.h @@ -9,5 +9,5 @@ public: void init(AsyncWebServer& server, Scheduler& scheduler); private: - void responseBinaryDataWithETagCache(AsyncWebServerRequest* request, const String &contentType, const String &contentEncoding, const uint8_t *content, size_t len); + void responseBinaryDataWithETagCache(AsyncWebServerRequest* request, const String& contentType, const String& contentEncoding, const uint8_t* content, size_t len); }; diff --git a/include/__compiled_constants.h b/include/__compiled_constants.h index a00caf6d..62e43add 100644 --- a/include/__compiled_constants.h +++ b/include/__compiled_constants.h @@ -3,7 +3,6 @@ // The referenced values are generated by pio-scripts/auto_firmware_version.py - -extern const char *__COMPILED_GIT_HASH__; -extern const char *__COMPILED_GIT_BRANCH__; +extern const char* __COMPILED_GIT_HASH__; +extern const char* __COMPILED_GIT_BRANCH__; // extern const char *__COMPILED_DATE_TIME_UTC_STR__; diff --git a/lib/CMT2300a/cmt2300a_hal.h b/lib/CMT2300a/cmt2300a_hal.h index a465b149..4f3cda76 100644 --- a/lib/CMT2300a/cmt2300a_hal.h +++ b/lib/CMT2300a/cmt2300a_hal.h @@ -21,8 +21,8 @@ #ifndef __CMT2300A_HAL_H #define __CMT2300A_HAL_H -#include #include +#include #ifdef __cplusplus extern "C" { diff --git a/lib/CMT2300a/cmt_spi3.cpp b/lib/CMT2300a/cmt_spi3.cpp index 28fdc8ae..18f2aaed 100644 --- a/lib/CMT2300a/cmt_spi3.cpp +++ b/lib/CMT2300a/cmt_spi3.cpp @@ -1,7 +1,7 @@ #include "cmt_spi3.h" #include -#include #include +#include SemaphoreHandle_t paramLock = NULL; #define SPI_PARAM_LOCK() \ @@ -9,11 +9,13 @@ SemaphoreHandle_t paramLock = NULL; } while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS) #define SPI_PARAM_UNLOCK() xSemaphoreGive(paramLock) -static void IRAM_ATTR pre_cb(spi_transaction_t *trans) { +static void IRAM_ATTR pre_cb(spi_transaction_t* trans) +{ gpio_set_level(*reinterpret_cast(trans->user), 0); } -static void IRAM_ATTR post_cb(spi_transaction_t *trans) { +static void IRAM_ATTR post_cb(spi_transaction_t* trans) +{ gpio_set_level(*reinterpret_cast(trans->user), 1); } @@ -27,8 +29,7 @@ void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin auto bus_config = std::make_shared( static_cast(pin_sdio), GPIO_NUM_NC, - static_cast(pin_clk) - ); + static_cast(pin_clk)); spi_device_interface_config_t device_config { .command_bits = 0, // set by transactions individually diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp index 806a4733..ace96523 100644 --- a/lib/Hoymiles/src/Hoymiles.cpp +++ b/lib/Hoymiles/src/Hoymiles.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "Hoymiles.h" #include "Utils.h" @@ -119,7 +119,7 @@ void HoymilesClass::loop() iv->sendGridOnProFileParaRequest(); } - _messageOutput->printf("Queue size - NRF: %" PRId32 " CMT: %" PRId32 "\r\n", _radioNrf->getQueueSize(), _radioCmt->getQueueSize()); + _messageOutput->printf("Queue size - NRF: %" PRId32 " CMT: %" PRId32 "\r\n", _radioNrf->getQueueSize(), _radioCmt->getQueueSize()); _lastPoll = millis(); } diff --git a/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp b/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp index 4ceb69ab..7f8fe3f7 100644 --- a/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp +++ b/lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ /* @@ -61,11 +61,11 @@ void ActivePowerControlCommand::setActivePowerLimit(const float limit, const Pow // 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/commands/ChannelChangeCommand.h b/lib/Hoymiles/src/commands/ChannelChangeCommand.h index 70b5f64c..62d0e880 100644 --- a/lib/Hoymiles/src/commands/ChannelChangeCommand.h +++ b/lib/Hoymiles/src/commands/ChannelChangeCommand.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "CommandAbstract.h" #include "../HoymilesRadio_CMT.h" +#include "CommandAbstract.h" class ChannelChangeCommand : public CommandAbstract { public: diff --git a/lib/Hoymiles/src/commands/CommandAbstract.cpp b/lib/Hoymiles/src/commands/CommandAbstract.cpp index 6196a96f..195ab055 100644 --- a/lib/Hoymiles/src/commands/CommandAbstract.cpp +++ b/lib/Hoymiles/src/commands/CommandAbstract.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ /* @@ -27,9 +27,9 @@ Source Address: 80 12 23 04 Target Addr Source Addr CRC8 */ #include "CommandAbstract.h" +#include "../inverters/InverterAbstract.h" #include "crc.h" #include -#include "../inverters/InverterAbstract.h" CommandAbstract::CommandAbstract(InverterAbstract* inv, const uint64_t router_address) { diff --git a/lib/Hoymiles/src/commands/CommandAbstract.h b/lib/Hoymiles/src/commands/CommandAbstract.h index 64c0bcd4..3a0b9548 100644 --- a/lib/Hoymiles/src/commands/CommandAbstract.h +++ b/lib/Hoymiles/src/commands/CommandAbstract.h @@ -13,7 +13,7 @@ class InverterAbstract; enum class QueueInsertType { AllowMultiple, - // Remove from beginning of the queue + // Remove from beginning of the queue RemoveOldest, // Don't insert command if it already exist diff --git a/lib/Hoymiles/src/commands/MultiDataCommand.cpp b/lib/Hoymiles/src/commands/MultiDataCommand.cpp index dd5d72ea..0413fc84 100644 --- a/lib/Hoymiles/src/commands/MultiDataCommand.cpp +++ b/lib/Hoymiles/src/commands/MultiDataCommand.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ /* @@ -111,7 +111,7 @@ bool MultiDataCommand::handleResponse(const fragment_t fragment[], const uint8_t void MultiDataCommand::udpateCRC() { - const uint16_t crc = crc16(&_payload[10], 14); // From data_type till password + const uint16_t crc = crc16(&_payload[10], 14); // From data_type till password _payload[24] = static_cast(crc >> 8); _payload[25] = static_cast(crc); } diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h index 90b9a5a9..d931b0a1 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.h +++ b/lib/Hoymiles/src/parser/StatisticsParser.h @@ -153,6 +153,7 @@ public: bool getYieldDayCorrection() const; void setYieldDayCorrection(const bool enabled); + private: void zeroFields(const FieldId_t* fields); diff --git a/lib/ThreadSafeQueue/src/ThreadSafeQueue.h b/lib/ThreadSafeQueue/src/ThreadSafeQueue.h index 2569e630..b5867247 100644 --- a/lib/ThreadSafeQueue/src/ThreadSafeQueue.h +++ b/lib/ThreadSafeQueue/src/ThreadSafeQueue.h @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once +#include #include #include -#include template class ThreadSafeQueue { diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 62480c9d..5b922002 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "Configuration.h" #include "MessageOutput.h" @@ -489,7 +489,9 @@ void ConfigurationClass::deleteInverterById(const uint8_t id) void ConfigurationClass::loop() { std::unique_lock lock(sWriterMutex); - if (sWriterCount == 0) { return; } + if (sWriterCount == 0) { + return; + } sWriterCv.notify_all(); sWriterCv.wait(lock, [] { return sWriterCount == 0; }); @@ -507,9 +509,12 @@ ConfigurationClass::WriteGuard::WriteGuard() sWriterCv.wait(_lock); } -ConfigurationClass::WriteGuard::~WriteGuard() { +ConfigurationClass::WriteGuard::~WriteGuard() +{ sWriterCount--; - if (sWriterCount == 0) { sWriterCv.notify_all(); } + if (sWriterCount == 0) { + sWriterCv.notify_all(); + } } ConfigurationClass Configuration; diff --git a/src/MqttHandleDtu.cpp b/src/MqttHandleDtu.cpp index 63aec7e1..83c40738 100644 --- a/src/MqttHandleDtu.cpp +++ b/src/MqttHandleDtu.cpp @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "MqttHandleDtu.h" #include "Configuration.h" #include "MqttSettings.h" #include "NetworkSettings.h" -#include #include +#include MqttHandleDtuClass MqttHandleDtu; diff --git a/src/MqttHandleHass.cpp b/src/MqttHandleHass.cpp index c39485dd..59abcc07 100644 --- a/src/MqttHandleHass.cpp +++ b/src/MqttHandleHass.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "MqttHandleHass.h" #include "MqttHandleInverter.h" @@ -70,7 +70,7 @@ void MqttHandleHassClass::publishConfig() publishDtuSensor("Yield Total", "ac/yieldtotal", "kWh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE); publishDtuSensor("Yield Day", "ac/yieldday", "Wh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE); publishDtuSensor("AC Power", "ac/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE); - publishDtuSensor("DC Power", "dc/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE); + publishDtuSensor("DC Power", "dc/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE); publishDtuBinarySensor("Status", config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online, config.Mqtt.Lwt.Value_Offline, DEVICE_CLS_CONNECTIVITY, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC); @@ -324,7 +324,7 @@ void MqttHandleHassClass::addCommonMetadata( doc["dev_cla"] = deviceClass_name[device_class]; } if (state_class != STATE_CLS_NONE) { - doc["stat_cla"] = stateClass_name[state_class];; + doc["stat_cla"] = stateClass_name[state_class]; } if (category != CATEGORY_NONE) { doc["ent_cat"] = category_name[category]; diff --git a/src/WebApi_gridprofile.cpp b/src/WebApi_gridprofile.cpp index 9fc05b03..d77612a4 100644 --- a/src/WebApi_gridprofile.cpp +++ b/src/WebApi_gridprofile.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_gridprofile.h" #include "WebApi.h" @@ -33,13 +33,13 @@ void WebApiGridProfileClass::onGridProfileStatus(AsyncWebServerRequest* request) auto jsonSections = root["sections"].to(); auto profSections = inv->GridProfile()->getProfile(); - for (auto &profSection : profSections) { + for (auto& profSection : profSections) { auto jsonSection = jsonSections.add(); jsonSection["name"] = profSection.SectionName; auto jsonItems = jsonSection["items"].to(); - for (auto &profItem : profSection.items) { + for (auto& profItem : profSection.items) { auto jsonItem = jsonItems.add(); jsonItem["n"] = profItem.Name; diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp index 9a79466a..9f9c3eba 100644 --- a/src/WebApi_prometheus.cpp +++ b/src/WebApi_prometheus.cpp @@ -1,15 +1,15 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_prometheus.h" #include "Configuration.h" #include "MessageOutput.h" #include "NetworkSettings.h" #include "WebApi.h" -#include #include "__compiled_constants.h" +#include void WebApiPrometheusClass::init(AsyncWebServer& server, Scheduler& scheduler) { diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 097319cc..8c843895 100644 --- a/src/WebApi_sysstatus.cpp +++ b/src/WebApi_sysstatus.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_sysstatus.h" #include "Configuration.h" @@ -59,7 +59,9 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request) }; for (char const* task_name : task_names) { TaskHandle_t const handle = xTaskGetHandle(task_name); - if (!handle) { continue; } + if (!handle) { + continue; + } JsonObject task = taskDetails.add(); task["name"] = task_name; task["stack_watermark"] = uxTaskGetStackHighWaterMark(handle); diff --git a/src/WebApi_webapp.cpp b/src/WebApi_webapp.cpp index b5335b02..0a118f76 100644 --- a/src/WebApi_webapp.cpp +++ b/src/WebApi_webapp.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_webapp.h" #include @@ -19,11 +19,11 @@ extern const uint8_t file_zones_json_end[] asm("_binary_webapp_dist_zones_json_g extern const uint8_t file_app_js_end[] asm("_binary_webapp_dist_js_app_js_gz_end"); extern const uint8_t file_site_webmanifest_end[] asm("_binary_webapp_dist_site_webmanifest_end"); -void WebApiWebappClass::responseBinaryDataWithETagCache(AsyncWebServerRequest *request, const String &contentType, const String &contentEncoding, const uint8_t *content, size_t len) +void WebApiWebappClass::responseBinaryDataWithETagCache(AsyncWebServerRequest* request, const String& contentType, const String& contentEncoding, const uint8_t* content, size_t len) { auto md5 = MD5Builder(); md5.begin(); - md5.add(const_cast(content), len); + md5.add(const_cast(content), len); md5.calculate(); String expectedEtag; diff --git a/src/WebApi_ws_console.cpp b/src/WebApi_ws_console.cpp index 51035f6f..44d5e2e0 100644 --- a/src/WebApi_ws_console.cpp +++ b/src/WebApi_ws_console.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_ws_console.h" #include "Configuration.h" @@ -34,7 +34,9 @@ void WebApiWsConsoleClass::reload() auto const& config = Configuration.get(); - if (config.Security.AllowReadonly) { return; } + if (config.Security.AllowReadonly) { + return; + } _ws.enable(false); _simpleDigestAuth.setPassword(config.Security.Password); diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp index c24a77f0..8b7518a5 100644 --- a/src/WebApi_ws_live.cpp +++ b/src/WebApi_ws_live.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include "WebApi_ws_live.h" #include "Datastore.h" @@ -11,7 +11,7 @@ #include #ifndef PIN_MAPPING_REQUIRED - #define PIN_MAPPING_REQUIRED 0 +#define PIN_MAPPING_REQUIRED 0 #endif WebApiWsLiveClass::WebApiWsLiveClass() @@ -52,7 +52,9 @@ void WebApiWsLiveClass::reload() auto const& config = Configuration.get(); - if (config.Security.AllowReadonly) { return; } + if (config.Security.AllowReadonly) { + return; + } _ws.enable(false); _simpleDigestAuth.setPassword(config.Security.Password);