patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply code formatter without functional changes

Browse Source
This commit is contained in:
Thomas Basler 2023-07-22 18:00:41 +02:00
parent a06a56a490
commit 658a42db80
14 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/WebApi.h
View File

@ -2,11 +2,11 @@
#pragma once #pragma once
#include "WebApi_config.h" #include "WebApi_config.h"
#include "WebApi_device.h"
#include "WebApi_devinfo.h" #include "WebApi_devinfo.h"
#include "WebApi_dtu.h" #include "WebApi_dtu.h"
#include "WebApi_eventlog.h" #include "WebApi_eventlog.h"
#include "WebApi_firmware.h" #include "WebApi_firmware.h"
#include "WebApi_device.h"
#include "WebApi_inverter.h" #include "WebApi_inverter.h"
#include "WebApi_limit.h" #include "WebApi_limit.h"
#include "WebApi_maintenance.h" #include "WebApi_maintenance.h"

2
lib/Hoymiles/src/Hoymiles.h
View File

@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include "HoymilesRadio_NRF.h"
#include "HoymilesRadio_CMT.h" #include "HoymilesRadio_CMT.h"
#include "HoymilesRadio_NRF.h"
#include "inverters/InverterAbstract.h" #include "inverters/InverterAbstract.h"
#include "types.h" #include "types.h"
#include <Print.h> #include <Print.h>

2
lib/Hoymiles/src/parser/AlarmLogParser.h
View File

@ -2,8 +2,8 @@
#pragma once #pragma once
#include "Parser.h" #include "Parser.h"
#include <Arduino.h> #include <Arduino.h>
#include <cstdint>
#include <array> #include <array>
#include <cstdint>
#define ALARM_LOG_ENTRY_COUNT 15 #define ALARM_LOG_ENTRY_COUNT 15
#define ALARM_LOG_ENTRY_SIZE 12 #define ALARM_LOG_ENTRY_SIZE 12

2
src/MqttSettings.cpp
View File

@ -3,8 +3,8 @@
* Copyright (C) 2022 Thomas Basler and others * Copyright (C) 2022 Thomas Basler and others
*/ */
#include "MqttSettings.h" #include "MqttSettings.h"
#include "MessageOutput.h"
#include "Configuration.h" #include "Configuration.h"
#include "MessageOutput.h"
MqttSettingsClass::MqttSettingsClass() MqttSettingsClass::MqttSettingsClass()
{ {

9
src/NetworkSettings.cpp
View File

@ -159,8 +159,7 @@ void NetworkSettingsClass::loop()
setStaticIp(); setStaticIp();
setHostname(); setHostname();
} }
} else } else if (_networkMode != network_mode::WiFi) {
if (_networkMode != network_mode::WiFi) {
// Do stuff when switching to Ethernet mode // Do stuff when switching to Ethernet mode
MessageOutput.println("Switch to WiFi mode"); MessageOutput.println("Switch to WiFi mode");
_networkMode = network_mode::WiFi; _networkMode = network_mode::WiFi;
@ -249,8 +248,7 @@ void NetworkSettingsClass::setHostname()
WiFi.mode(WIFI_MODE_APSTA); WiFi.mode(WIFI_MODE_APSTA);
WiFi.mode(WIFI_MODE_STA); WiFi.mode(WIFI_MODE_STA);
setupMode(); setupMode();
} } else if (_networkMode == network_mode::Ethernet) {
else if (_networkMode == network_mode::Ethernet) {
if (ETH.setHostname(getHostname().c_str())) { if (ETH.setHostname(getHostname().c_str())) {
MessageOutput.println("done"); MessageOutput.println("done");
} else { } else {
@ -276,8 +274,7 @@ void NetworkSettingsClass::setStaticIp()
IPAddress(Configuration.get().WiFi_Dns2)); IPAddress(Configuration.get().WiFi_Dns2));
MessageOutput.println("done"); MessageOutput.println("done");
} }
} } else if (_networkMode == network_mode::Ethernet) {
else if (_networkMode == network_mode::Ethernet) {
if (Configuration.get().WiFi_Dhcp) { if (Configuration.get().WiFi_Dhcp) {
MessageOutput.print("Configuring Ethernet DHCP IP... "); MessageOutput.print("Configuring Ethernet DHCP IP... ");
ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);

9
src/WebApi_prometheus.cpp
View File

@ -143,8 +143,7 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se
idx, idx,
inv->name(), inv->name(),
channel, channel,
config.Inverter[idx].channel[channel].Name config.Inverter[idx].channel[channel].Name);
);
if (printHelp) { if (printHelp) {
stream->print("# HELP opendtu_MaxPower panel maximum output power\n"); stream->print("# HELP opendtu_MaxPower panel maximum output power\n");
@ -155,8 +154,7 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se
idx, idx,
inv->name(), inv->name(),
channel, channel,
config.Inverter[idx].channel[channel].MaxChannelPower config.Inverter[idx].channel[channel].MaxChannelPower);
);
if (printHelp) { if (printHelp) {
stream->print("# HELP opendtu_YieldTotalOffset panel yield offset (for used inverters)\n"); stream->print("# HELP opendtu_YieldTotalOffset panel yield offset (for used inverters)\n");
@ -167,6 +165,5 @@ void WebApiPrometheusClass::addPanelInfo(AsyncResponseStream* stream, String& se
idx, idx,
inv->name(), inv->name(),
channel, channel,
config.Inverter[idx].channel[channel].YieldTotalOffset config.Inverter[idx].channel[channel].YieldTotalOffset);
);
} }

4
src/WebApi_ws_live.cpp
View File

@ -169,9 +169,7 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
JsonObject hintObj = root.createNestedObject("hints"); JsonObject hintObj = root.createNestedObject("hints");
struct tm timeinfo; struct tm timeinfo;
hintObj["time_sync"] = !getLocalTime(&timeinfo, 5); hintObj["time_sync"] = !getLocalTime(&timeinfo, 5);
hintObj["radio_problem"] = hintObj["radio_problem"] = (Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) || (Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected()));
(Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) ||
(Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected()));
if (!strcmp(Configuration.get().Security_Password, ACCESS_POINT_PASSWORD)) { if (!strcmp(Configuration.get().Security_Password, ACCESS_POINT_PASSWORD)) {
hintObj["default_password"] = true; hintObj["default_password"] = true;
} else { } else {