Skip to content

Ecomode-auto-addon-todo #2949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 7 commits into from
May 13, 2025
Merged

Ecomode-auto-addon-todo #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5597cc7
experimental.ecomode.[start/stop].auto move to uprw + set NULL to las…
masterwishx May 8, 2025
6e5f92e
experimental.ecomode.[start/stop] to experimental.ecomode.auto
masterwishx May 9, 2025
1777d8e
change place of 0-1 in eaton_input_eco_mode_auto_on_off_info()
masterwishx May 9, 2025
c402c2c
input.bypass.switch.on", "disabled (useless, onlly on,off can be runn…
masterwishx May 10, 2025
b61c784
experimental.ecomode.stop/start.auto added as commands for test after…
masterwishx May 10, 2025
4fd9856
removed unused vars
masterwishx May 10, 2025
4c88b3c
Merge branch 'networkupstools:master' into fix-cmd-ecomode
masterwishx May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions data/cmdvartab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ CMDDESC bypass.start "Put the UPS in Bypass mode"
CMDDESC bypass.stop "Take the UPS out of Bypass mode"
CMDDESC experimental.ecomode.enable "Put UPS in High Efficiency (aka ECO) mode"
CMDDESC experimental.ecomode.disable "Take the UPS out of High Efficiency (aka ECO) mode"
CMDDESC experimental.ecomode.start.auto "Put UPS in Bypass mode then High Efficiency (aka ECO) mode"
CMDDESC experimental.ecomode.stop.auto "Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass mode"
CMDDESC experimental.ecomode.auto "Put UPS in Bypass mode then High Efficiency (aka ECO) mode"
CMDDESC experimental.essmode.enable "Put UPS in Energy Saver System (aka ESS) mode"
CMDDESC experimental.essmode.disable "Take the UPS out of Energy Saver System (aka ESS) mode"
CMDDESC experimental.test.beeper.start "Start testing the UPS beeper"
Expand Down
2 changes: 1 addition & 1 deletion docs/nut-names.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ to last as part of NUT standard protocol in the long run.
| Put UPS in High Efficiency (aka ECO) mode
| experimental.ecomode.disable | usbhid-ups => mge-hid (Eaton/MGE)
| Take the UPS out of High Efficiency (aka ECO) mode
| experimental.ecomode.start.auto | usbhid-ups => mge-hid (Eaton/MGE)
| experimental.ecomode.auto | usbhid-ups => mge-hid (Eaton/MGE)
| Put UPS in Bypass mode then High Efficiency (aka ECO) mode
| experimental.ecomode.stop.auto | usbhid-ups => mge-hid (Eaton/MGE)
| Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass mode
Expand Down
37 changes: 21 additions & 16 deletions drivers/mge-hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ static const char *eaton_input_bypass_check_range(double value)
NUT_STRARG(out_frequency_nominal_str));

/* Disable Bypass mode switching, do not enter Bypass mode */
dstate_setinfo("input.bypass.switch.on", "disabled");
dstate_setinfo("input.bypass.switch.off", "off");
upsdebugx(1, "%s: Disable Bypass mode due to missing input/output variables.", __func__);
return NULL;
}
Expand Down Expand Up @@ -1131,7 +1131,7 @@ static const char *eaton_input_bypass_check_range(double value)
upsdebugx(1, "Input Bypass frequency is outside Bypass transfer limits: %.1f Hz", bypass_frequency);
}
/* Disable Bypass mode switching, do not enter Bypass mode */
dstate_setinfo("input.bypass.switch.on", "disabled");
dstate_setinfo("input.bypass.switch.off", "off");
upsdebugx(1, "%s: Disable Bypass mode due to input conditions being outside the transfer limits.", __func__);
return NULL;
}
Expand All @@ -1157,12 +1157,10 @@ static const char *eaton_input_eco_mode_auto_on_fun(double value)
const char *bypass_switch_on_str = NULL;
const char *eco_switchable_str = NULL;

NUT_UNUSED_VARIABLE(value);

/* Check if input.bypass.switch.on is disabled and set it to 'on' */
bypass_switch_on_str = dstate_getinfo("input.bypass.switch.on");
if (!strcmp(bypass_switch_on_str, "disabled")) {
setvar("input.bypass.switch.on", "on");
bypass_switch_on_str = eaton_input_bypass_check_range(value);
} else {
upsdebugx(1, "Bypass switch on state is: %s , must be disabled before switching on", bypass_switch_on_str);
return NULL;
Expand All @@ -1171,14 +1169,14 @@ static const char *eaton_input_eco_mode_auto_on_fun(double value)
/* Check if input.eco.switchable is normal and set it to 'ECO' */
eco_switchable_str = dstate_getinfo("input.eco.switchable");
if (!strcmp(eco_switchable_str, "normal")) {
setvar("input.eco.switchable", "ECO");
eco_switchable_str = eaton_input_eco_mode_check_range(value);
} else {
upsdebugx(1, "ECO switch state is: %s , must be normal before switching to ECO", eco_switchable_str);
return NULL;
}

upsdebugx(1, "%s: ECO Mode was enabled after switching to Bypass Mode", __func__);
return NULL;
return eco_switchable_str;
}

/* Function to stop ECO(HE) Mode automatically instead of manually stoping Bypass and then Online Mode */
Expand All @@ -1202,6 +1200,7 @@ static const char *eaton_input_eco_mode_auto_off_fun(double value)
eco_switchable_str = dstate_getinfo("input.eco.switchable");
if (!strcmp(eco_switchable_str, "ECO")) {
setvar("input.eco.switchable", "normal");
buzzmode_set("vendor:mge-hid:normal");
} else {
upsdebugx(1, "ECO switch state is: %s , must be ECO before switching to normal", eco_switchable_str);
return NULL;
Expand All @@ -1213,8 +1212,9 @@ static const char *eaton_input_eco_mode_auto_off_fun(double value)

/* High Efficiency (aka ECO) mode for auto start/stop commands */
static info_lkp_t eaton_input_eco_mode_auto_on_off_info[] = {
{ 1, "dummy", eaton_input_eco_mode_auto_on_fun, NULL },
{ 0, "dummy", eaton_input_eco_mode_auto_off_fun, NULL },
{ 0, "normal", eaton_input_eco_mode_auto_off_fun, NULL },
{ 1, "ECO", eaton_input_eco_mode_auto_on_fun, NULL },
{ 2, "ESS", NULL, NULL },
{ 0, NULL, NULL, NULL }
};

Expand Down Expand Up @@ -2043,6 +2043,10 @@ static hid_info_t mge_hid2nut[] =
/* ECO(HE), ESS Mode switch, to use when 'input.bypass.switch.on' is on */
{ "input.eco.switchable", ST_FLAG_RW | ST_FLAG_STRING, 8, "UPS.PowerConverter.Input.[5].Switchable", NULL, "%.0f", HU_FLAG_SEMI_STATIC, eaton_input_eco_mode_on_off_info },

/* Needs to be Tested */
/* Command to switch ECO(HE) Mode on/off with switch to Automatic Bypass Mode on/off before */
{ "experimental.ecomode.auto", ST_FLAG_RW | ST_FLAG_STRING, 8, "UPS.PowerConverter.Input.[5].Switchable", NULL, "%.0f", HU_FLAG_SEMI_STATIC, eaton_input_eco_mode_auto_on_off_info },

/* Auto Bypass Mode on/off, to use when 'input.transfer.bypass.forced' is enabled */
{ "input.bypass.switch.on", ST_FLAG_RW | ST_FLAG_STRING, 8, "UPS.PowerConverter.Input.[2].SwitchOnControl", NULL, "%.0f", HU_FLAG_SEMI_STATIC, eaton_input_bypass_mode_on_info },
{ "input.bypass.switch.off", ST_FLAG_RW | ST_FLAG_STRING, 12, "UPS.PowerConverter.Input.[2].SwitchOffControl", NULL, "%.0f", HU_FLAG_SEMI_STATIC, eaton_input_bypass_mode_off_info },
Expand Down Expand Up @@ -2155,18 +2159,19 @@ static hid_info_t mge_hid2nut[] =
{ "outlet.2.load.on", 0, 0, "UPS.OutletSystem.Outlet.[3].DelayBeforeStartup", NULL, "0", HU_TYPE_CMD, NULL },

/* Command to switch ECO(HE), ESS Mode */
{ "experimental.ecomode.disable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "0", HU_TYPE_CMD, eaton_input_eco_mode_on_off_info },
{ "experimental.ecomode.enable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "1", HU_TYPE_CMD, eaton_input_eco_mode_on_off_info },
{ "experimental.essmode.enable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "2", HU_TYPE_CMD, eaton_input_eco_mode_on_off_info },
{ "experimental.essmode.disable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "0", HU_TYPE_CMD, eaton_input_eco_mode_on_off_info },
/* Command to switch ECO(HE) Mode with switch to Automatic Bypass Mode on before */
{ "experimental.ecomode.disable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "0", HU_TYPE_CMD, NULL },
{ "experimental.ecomode.enable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "1", HU_TYPE_CMD, NULL },
{ "experimental.essmode.enable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "2", HU_TYPE_CMD, NULL },
{ "experimental.essmode.disable", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "0", HU_TYPE_CMD, NULL },

/* Command to switch ECO(HE) Mode with switch to Automatic Bypass Mode on before */
{ "experimental.ecomode.start.auto", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "1", HU_TYPE_CMD, eaton_input_eco_mode_auto_on_off_info },
/* Command to switch from ECO(HE) Mode with switch from Automatic Bypass Mode on before */
{ "experimental.ecomode.stop.auto", 0, 0, "UPS.PowerConverter.Input.[5].Switchable", NULL, "0", HU_TYPE_CMD, eaton_input_eco_mode_auto_on_off_info },

/* Command to switch Automatic Bypass Mode on/off */
{ "bypass.start", 0, 0, "UPS.PowerConverter.Input.[2].SwitchOnControl", NULL, "1", HU_TYPE_CMD, eaton_input_bypass_mode_on_info },
{ "bypass.stop", 0, 0, "UPS.PowerConverter.Input.[2].SwitchOffControl", NULL, "1", HU_TYPE_CMD, eaton_input_bypass_mode_off_info },
{ "bypass.start", 0, 0, "UPS.PowerConverter.Input.[2].SwitchOnControl", NULL, "1", HU_TYPE_CMD, NULL },
{ "bypass.stop", 0, 0, "UPS.PowerConverter.Input.[2].SwitchOffControl", NULL, "1", HU_TYPE_CMD, NULL },

/* end of structure. */
{ NULL, 0, 0, NULL, NULL, NULL, 0, NULL }
Expand Down