Skip to content

Commit 271446f

Browse files
committed
Remove obsolete SafePower commands
1 parent 96a45a6 commit 271446f

File tree

1 file changed

+1
-30
lines changed

1 file changed

+1
-30
lines changed

tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ const char kEnergyCommands[] PROGMEM = "|" // No prefix
6262
D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|"
6363
D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|"
6464
D_CMND_MAXPOWER "|" D_CMND_MAXPOWERHOLD "|" D_CMND_MAXPOWERWINDOW "|"
65-
D_CMND_SAFEPOWER "|" D_CMND_SAFEPOWERHOLD "|" D_CMND_SAFEPOWERWINDOW "|"
6665
D_CMND_ENERGYTODAY "|" D_CMND_ENERGYYESTERDAY "|" D_CMND_ENERGYTOTAL "|" D_CMND_ENERGYEXPORTACTIVE "|" D_CMND_ENERGYUSAGE "|" D_CMND_ENERGYEXPORT "|"
6766
D_CMND_TARIFF "|" D_CMND_ENERGYDISPLAY "|" D_CMND_ENERGYCOLS ;
6867

@@ -72,7 +71,6 @@ void (* const EnergyCommand[])(void) PROGMEM = {
7271
&CmndPowerDelta, &CmndPowerLow, &CmndPowerHigh, &CmndVoltageLow, &CmndVoltageHigh, &CmndCurrentLow, &CmndCurrentHigh,
7372
&CmndMaxEnergy, &CmndMaxEnergyStart,
7473
&CmndMaxPower, &CmndMaxPowerHold, &CmndMaxPowerWindow,
75-
&CmndSafePower, &CmndSafePowerHold, &CmndSafePowerWindow,
7674
&CmndEnergyToday, &CmndEnergyYesterday, &CmndEnergyTotal, &CmndEnergyExportActive, &CmndEnergyUsage, &CmndEnergyExport,
7775
&CmndTariff, &CmndEnergyDisplay, &CmndEnergyCols };
7876

@@ -117,9 +115,6 @@ typedef struct {
117115
uint16_t max_power_limit; // MaxPower
118116
uint16_t max_power_limit_hold; // MaxPowerHold
119117
uint16_t max_power_limit_window; // MaxPowerWindow
120-
uint16_t max_power_safe_limit; // SafePower
121-
uint16_t max_power_safe_limit_hold; // SafePowerHold
122-
uint16_t max_power_safe_limit_window; // SafePowerWindow
123118
uint16_t max_energy; // MaxEnergy
124119
uint16_t max_energy_start; // MaxEnergyStart
125120
} tPhase;
@@ -313,18 +308,15 @@ void EnergySettingsLoad(bool erase) {
313308
Energy->Settings.phase[i].max_power = Settings->energy_max_power;
314309
Energy->Settings.phase[i].max_power_limit_hold = Settings->energy_max_power_limit_hold;
315310
Energy->Settings.phase[i].max_power_limit_window = Settings->energy_max_power_limit_window;
316-
Energy->Settings.phase[i].max_power_safe_limit_hold = Settings->energy_max_power_safe_limit_hold;
317-
Energy->Settings.phase[i].max_power_safe_limit_window = Settings->energy_max_power_safe_limit_window;
311+
Energy->Settings.phase[i].max_energy_start = Settings->energy_max_energy_start;
318312
}
319313
Energy->Settings.power_calibration[1] = Settings->energy_power_calibration2;
320314
Energy->Settings.voltage_calibration[1] = Settings->energy_voltage_calibration2;
321315
Energy->Settings.current_calibration[1] = Settings->energy_current_calibration2;
322316

323317
// Only restore phase 1 for backward compatibility (all power off)
324318
Energy->Settings.phase[0].max_power_limit = Settings->energy_max_power_limit;
325-
Energy->Settings.phase[0].max_power_safe_limit = Settings->energy_max_power_safe_limit;
326319
Energy->Settings.phase[0].max_energy = Settings->energy_max_energy;
327-
Energy->Settings.phase[0].max_energy_start = Settings->energy_max_energy_start;
328320
/*
329321
RtcEnergySettings.energy_total_kWh[0] = 0;
330322
RtcEnergySettings.energy_total_kWh[1] = 0;
@@ -1459,27 +1451,6 @@ void CmndMaxPowerWindow(void) {
14591451
}
14601452
}
14611453

1462-
void CmndSafePower(void) {
1463-
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6000)) {
1464-
Settings->energy_max_power_safe_limit = XdrvMailbox.payload;
1465-
}
1466-
ResponseCmndNumber(Settings->energy_max_power_safe_limit);
1467-
}
1468-
1469-
void CmndSafePowerHold(void) {
1470-
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6000)) {
1471-
Settings->energy_max_power_safe_limit_hold = (1 == XdrvMailbox.payload) ? SAFE_POWER_HOLD : XdrvMailbox.payload;
1472-
}
1473-
ResponseCmndNumber(Settings->energy_max_power_safe_limit_hold);
1474-
}
1475-
1476-
void CmndSafePowerWindow(void) {
1477-
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 1440)) {
1478-
Settings->energy_max_power_safe_limit_window = (1 == XdrvMailbox.payload) ? SAFE_POWER_WINDOW : XdrvMailbox.payload;
1479-
}
1480-
ResponseCmndNumber(Settings->energy_max_power_safe_limit_window);
1481-
}
1482-
14831454
void CmndMaxEnergy(void) {
14841455
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= ENERGY_MAX_PHASES)) {
14851456
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6000)) {

0 commit comments

Comments
 (0)