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

resolve merge conflict with upstream/master

Browse Source
This commit is contained in:
helgeerbe 2023-07-24 13:23:50 +02:00
parent 2440028d38
commit 43e836ac41
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Configuration.h
View File

@ -129,14 +129,6 @@ struct CONFIG_T {
bool Vedirect_Enabled; bool Vedirect_Enabled;
bool Vedirect_UpdatesOnly; bool Vedirect_UpdatesOnly;
INVERTER_CONFIG_T Inverter[INV_MAX_COUNT];
uint64_t Dtu_Serial;
uint32_t Dtu_PollInterval;
uint8_t Dtu_NrfPaLevel;
int8_t Dtu_CmtPaLevel;
uint32_t Dtu_CmtFrequency;
bool PowerMeter_Enabled; bool PowerMeter_Enabled;
bool PowerMeter_VerboseLogging; bool PowerMeter_VerboseLogging;
uint32_t PowerMeter_Interval; uint32_t PowerMeter_Interval;