Skip to content

Commit

Permalink
resolve merge conflict with upstream/master
Browse files Browse the repository at this point in the history
  • Loading branch information
helgeerbe committed Jul 24, 2023
1 parent 2440028 commit 43e836a
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions include/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,6 @@ struct CONFIG_T {
bool Vedirect_Enabled;
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_VerboseLogging;
uint32_t PowerMeter_Interval;
Expand Down

0 comments on commit 43e836a

Please sign in to comment.