Merge 5dbd082 into 8f4340a

Author: masterwishx

data/cmdvartab

@@ -260,6 +260,8 @@ 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.bypass.ecomode.start "Put UPS in Bypass mode then High Efficiency (aka ECO) mode"
+CMDDESC experimental.bypass.ecomode.stop "Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass 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"

docs/nut-names.txt

@@ -1059,6 +1059,10 @@ 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.bypass.ecomode.start   | usbhid-ups => mge-hid (Eaton/MGE)
+    | Put UPS in Bypass mode then High Efficiency (aka ECO) mode
+| experimental.bypass.ecomode.stop   | usbhid-ups => mge-hid (Eaton/MGE)
+    | Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass mode
 | experimental.essmode.enable       | usbhid-ups => mge-hid (Eaton/MGE)
     | Put UPS in Energy Saver System (aka ESS) mode
 | experimental.essmode.disable      | usbhid-ups => mge-hid (Eaton/MGE)

drivers/mge-hid.c

@@ -991,10 +991,10 @@ static const char *eaton_input_eco_mode_check_range(double value)
 	} else {
 		/* Condensed debug messages for out of range voltage and frequency */
 		if (bypass_voltage < lower_voltage_limit || bypass_voltage > upper_voltage_limit) {
-			upsdebugx(1, "Input Bypass voltage is outside ECO transfer limits: %.1f V", bypass_voltage);
+			upsdebugx(1, "%s: Input Bypass voltage is outside ECO transfer limits: %.1f V", __func__, bypass_voltage);
 		}
 		if (bypass_frequency < lower_frequency_limit || bypass_frequency > upper_frequency_limit) {
-			upsdebugx(1, "Input Bypass frequency is outside ECO transfer limits: %.1f Hz", bypass_frequency);
+			upsdebugx(1, "%s: Input Bypass frequency is outside ECO transfer limits: %.1f Hz", __func__, bypass_frequency);
 		}
 		/* Disable ECO mode switching, do not enter ECO mode */
 		dstate_setinfo("input.eco.switchable", "normal");
@@ -1125,10 +1125,10 @@ static const char *eaton_input_bypass_check_range(double value)
 	} else {
 		/* Condensed debug messages for out of range voltage and frequency */
 		if (bypass_voltage < lower_voltage_limit || bypass_voltage > upper_voltage_limit) {
-			upsdebugx(1, "Input Bypass voltage is outside Bypass transfer limits: %.1f V", bypass_voltage);
+			upsdebugx(1, "%s: Input Bypass voltage is outside Bypass transfer limits: %.1f V", __func__, bypass_voltage);
 		}
 		if (bypass_frequency < lower_frequency_limit || bypass_frequency > upper_frequency_limit) {
-			upsdebugx(1, "Input Bypass frequency is outside Bypass transfer limits: %.1f Hz", bypass_frequency);
+			upsdebugx(1, "%s: Input Bypass frequency is outside Bypass transfer limits: %.1f Hz", __func__, bypass_frequency);
 		}
 		/* Disable Bypass mode switching, do not enter Bypass mode */
 		dstate_setinfo("input.bypass.switch.off", "off");
@@ -1151,6 +1151,76 @@ static info_lkp_t eaton_input_bypass_mode_off_info[] = {
 	{ 0, NULL, NULL, NULL }
 };
 
+
+/* Function to start ECO(HE) Mode automatically instead of manually starting Bypass and then ECO(HE) Mode */
+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;
+
+	/* 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")) {
+		bypass_switch_on_str = eaton_input_bypass_check_range(value);
+	} else {
+		upsdebugx(1, "%s: Bypass switch on state is: %s , must be disabled before switching on", __func__, bypass_switch_on_str);
+		return NULL;
+	}
+
+	/* 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")) {
+		eco_switchable_str = eaton_input_eco_mode_check_range(value);
+	} else {
+		upsdebugx(1, "%s: ECO switch state is: %s , must be normal before switching to ECO", __func__, eco_switchable_str);
+		return NULL;
+	}
+
+	upsdebugx(1, "%s: ECO Mode was enabled after switching to Bypass Mode", __func__);
+	return eco_switchable_str;
+}
+
+/* Function to stop ECO(HE) Mode automatically instead of manually stoping Bypass and then Online Mode */
+static const char *eaton_input_eco_mode_auto_off_fun(double value)
+{
+	const char *bypass_switch_off_str = NULL;
+	const char *eco_switchable_str = NULL;
+
+	NUT_UNUSED_VARIABLE(value);
+
+	/* Check if input.bypass.switch.off is disabled and set it to 'off' */
+	bypass_switch_off_str = dstate_getinfo("input.bypass.switch.off");
+	if (!strcmp(bypass_switch_off_str, "disabled")) {
+		setvar("input.bypass.switch.off", "off");
+	} else {
+		upsdebugx(1, "%s: Bypass switch off state is: %s , must be disabled before switching off", __func__, bypass_switch_off_str);
+		return NULL;
+	}
+
+	/* Check if input.eco.switchable is 'ECO' and set it to normal */
+	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");
+		/* Get the updated value of input.eco.switchable after setting it to "normal */
+        eco_switchable_str = dstate_getinfo("input.eco.switchable");
+	} else {
+		upsdebugx(1, "%s: ECO switch state is: %s , must be ECO before switching to normal", __func__, eco_switchable_str);
+		return NULL;
+	}
+
+	upsdebugx(1, "%s: ECO Mode was disabled after switching from Bypass Mode", __func__);
+	return eco_switchable_str;
+}
+
+/* High Efficiency (aka ECO) mode for auto start/stop commands */
+static info_lkp_t eaton_input_eco_mode_auto_on_off_info[] = {
+	{ 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 }
+};
+
 /* Determine country using UPS.PowerSummary.Country.
  * If not present:
  * 		if PowerConverter.Output.Voltage >= 200 => "Europe"
@@ -2093,6 +2163,11 @@ static hid_info_t mge_hid2nut[] =
 	{ "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.bypass.ecomode.start", 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.bypass.ecomode.stop", 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, NULL },
 	{ "bypass.stop", 0, 0, "UPS.PowerConverter.Input.[2].SwitchOffControl", NULL, "1", HU_TYPE_CMD, NULL },