Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-11 01:10:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

InverterSettings: Optimize init function

Browse Source 
Also replace all print and println by printf
This commit is contained in:
Thomas Basler
2025-04-13 11:41:57 +02:00
parent 6c4d3f47c7
commit 52961ed5a6
1 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/InverterSettings.cpp
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2023-2024 Thomas Basler and others
* Copyright (C) 2023-2025 Thomas Basler and others
*/
#include "InverterSettings.h"
#include "Configuration.h"
@@ -24,13 +24,18 @@ void InverterSettingsClass::init(Scheduler& scheduler)
const PinMapping_t& pin = PinMapping.get();
// Initialize inverter communication
MessageOutput.print("Initialize Hoymiles interface... ");
MessageOutput.printf("Initialize Hoymiles interface...\r\n");
Hoymiles.setMessageOutput(&MessageOutput);
Hoymiles.init();
if (PinMapping.isValidNrf24Config() || PinMapping.isValidCmt2300Config()) {
if (!PinMapping.isValidNrf24Config() && !PinMapping.isValidCmt2300Config()) {
MessageOutput.printf("Invalid pin config\r\n");
return;
}
// Initialize NRF24 if configured
if (PinMapping.isValidNrf24Config()) {
MessageOutput.printf("NRF: Initialize communication\r\n");
auto spi_bus = SpiManagerInst.claim_bus_arduino();
ESP_ERROR_CHECK(spi_bus ? ESP_OK : ESP_FAIL);
@@ -39,53 +44,59 @@ void InverterSettingsClass::init(Scheduler& scheduler)
Hoymiles.initNRF(spiClass, pin.nrf24_en, pin.nrf24_irq);
}
// Initialize CMT2300 if configured
if (PinMapping.isValidCmt2300Config()) {
MessageOutput.printf("CMT2300A: Initialize communication\r\n");
Hoymiles.initCMT(pin.cmt_sdio, pin.cmt_clk, pin.cmt_cs, pin.cmt_fcs, pin.cmt_gpio2, pin.cmt_gpio3);
MessageOutput.println(" Setting country mode... ");
MessageOutput.printf("CMT2300A: Setting country mode...\r\n");
Hoymiles.getRadioCmt()->setCountryMode(static_cast<CountryModeId_t>(config.Dtu.Cmt.CountryMode));
MessageOutput.println(" Setting CMT target frequency... ");
MessageOutput.printf("CMT2300A: Setting CMT target frequency...\r\n");
Hoymiles.getRadioCmt()->setInverterTargetFrequency(config.Dtu.Cmt.Frequency);
}
MessageOutput.println(" Setting radio PA level... ");
// Configure common radio settings
MessageOutput.printf("RF: Setting radio PA level...\r\n");
Hoymiles.getRadioNrf()->setPALevel((rf24_pa_dbm_e)config.Dtu.Nrf.PaLevel);
Hoymiles.getRadioCmt()->setPALevel(config.Dtu.Cmt.PaLevel);
MessageOutput.println(" Setting DTU serial... ");
MessageOutput.printf("RF: Setting DTU serial...\r\n");
Hoymiles.getRadioNrf()->setDtuSerial(config.Dtu.Serial);
Hoymiles.getRadioCmt()->setDtuSerial(config.Dtu.Serial);
MessageOutput.println(" Setting poll interval... ");
MessageOutput.printf("RF: Setting poll interval...\r\n");
Hoymiles.setPollInterval(config.Dtu.PollInterval);
// Configure inverters
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
if (config.Inverter[i].Serial > 0) {
MessageOutput.printf(" Adding inverter: %0" PRIx32 "%08" PRIx32 " - %s",
static_cast<uint32_t>((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF),
static_cast<uint32_t>(config.Inverter[i].Serial & 0xFFFFFFFF),
config.Inverter[i].Name);
auto inv = Hoymiles.addInverter(
config.Inverter[i].Name,
config.Inverter[i].Serial);
const auto& inv_cfg = config.Inverter[i];
if (inv_cfg.Serial == 0) {
continue;
}
if (inv != nullptr) {
inv->setReachableThreshold(config.Inverter[i].ReachableThreshold);
inv->setZeroValuesIfUnreachable(config.Inverter[i].ZeroRuntimeDataIfUnrechable);
inv->setZeroYieldDayOnMidnight(config.Inverter[i].ZeroYieldDayOnMidnight);
inv->setClearEventlogOnMidnight(config.Inverter[i].ClearEventlogOnMidnight);
inv->Statistics()->setYieldDayCorrection(config.Inverter[i].YieldDayCorrection);
MessageOutput.printf("Adding inverter: %0" PRIx32 "%08" PRIx32 " - %s\r\n",
static_cast<uint32_t>((inv_cfg.Serial >> 32) & 0xFFFFFFFF),
static_cast<uint32_t>(inv_cfg.Serial & 0xFFFFFFFF),
inv_cfg.Name);
auto inv = Hoymiles.addInverter(inv_cfg.Name, inv_cfg.Serial);
if (inv == nullptr) {
MessageOutput.printf("Adding inverter failed: Unsupported type\r\n");
continue;
}
inv->setReachableThreshold(inv_cfg.ReachableThreshold);
inv->setZeroValuesIfUnreachable(inv_cfg.ZeroRuntimeDataIfUnrechable);
inv->setZeroYieldDayOnMidnight(inv_cfg.ZeroYieldDayOnMidnight);
inv->setClearEventlogOnMidnight(inv_cfg.ClearEventlogOnMidnight);
inv->Statistics()->setYieldDayCorrection(inv_cfg.YieldDayCorrection);
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
inv->Statistics()->setStringMaxPower(c, config.Inverter[i].channel[c].MaxChannelPower);
inv->Statistics()->setChannelFieldOffset(TYPE_DC, static_cast<ChannelNum_t>(c), FLD_YT, config.Inverter[i].channel[c].YieldTotalOffset);
inv->Statistics()->setStringMaxPower(c, inv_cfg.channel[c].MaxChannelPower);
inv->Statistics()->setChannelFieldOffset(TYPE_DC, static_cast<ChannelNum_t>(c), FLD_YT, inv_cfg.channel[c].YieldTotalOffset);
}
MessageOutput.printf("Adding complete\r\n");
}
MessageOutput.println(" done");
}
}
MessageOutput.println("done");
} else {
MessageOutput.println("Invalid pin config");
}
MessageOutput.printf("Initialization complete\r\n");
scheduler.addTask(_hoyTask);
_hoyTask.enable();