EATON HID: add missing usages and paths - ECO Mode #2637

masterwishx · 2024-09-23T18:37:58Z

Adding HE/ECO mode, Bypass On/Off for Eaton USB UPS Online Models + Adding Missing usages and paths

Continue work for #2636
Fixes #2485
Ref #2495

Added:

Variables: 

battery.charger.status: discharging
device.usb.version: 01.29
input.eco.switchable: normal
outlet.1.designator: AC OUTPUT
outlet.1.protect.status: protected
input.transfer.forced: enabled
input.eco.switchable: ECO
input.bypass.switch.on: off
etc ...

R/W variables:

input.eco.switchable
input.bypass.switch.on
etc ..

Commands: 

ecomode.disable - Take the UPS out of High Efficiency (aka ECO) mode
ecomode.enable - Put UPS in High Efficiency (aka ECO) mode
essmode.disable - Take the UPS out of Energy Saver System (aka ESS) mode
essmode.enable - Put UPS in Energy Saver System (aka ESS) mode
bypass.start - Put the UPS in bypass mode
bypass.stop - Take the UPS out of bypass mode

Signed-off-by: Arnaud Quette <arnaudquette@eaton.com>

Signed-off-by: DaRK AnGeL <masterwishx@gmail.com>

arnaudquette-eaton · 2024-09-24T06:46:42Z

drivers/mge-hid.c

-	/* { "device.usb.version", ST_FLAG_STRING, 20, "UPS.System.USB.iVersion", NULL, NULL, HU_FLAG_STATIC, stringid_conversion },*/
-
+	{ "device.usb.version", ST_FLAG_STRING, 20, "UPS.System.USB.iVersion", NULL, NULL, HU_FLAG_STATIC, stringid_conversion }, /* FIXME */
+	{ "device.usb.mode", ST_FLAG_STRING, 20, "UPS.System.USB.Mode", NULL, NULL, HU_FLAG_STATIC, stringid_conversion }, /* FIXME */


I don't think this one is useful, and not a string (1 to set in bootloader )

arnaudquette-eaton · 2024-09-24T06:48:45Z

drivers/mge-hid.c

-
+	{ "device.usb.version", ST_FLAG_STRING, 20, "UPS.System.USB.iVersion", NULL, NULL, HU_FLAG_STATIC, stringid_conversion }, /* FIXME */
+	{ "device.usb.mode", ST_FLAG_STRING, 20, "UPS.System.USB.Mode", NULL, NULL, HU_FLAG_STATIC, stringid_conversion }, /* FIXME */
+	{ "device.gateway.power.rate", ST_FLAG_STRING, 20, "UPS.System.Gateway.PowerRate", NULL, NULL, HU_FLAG_STATIC, stringid_conversion }, /* FIXME */


ditto above, don't think it's useful, and not a string (level of power provided by the UPS to the network card

arnaudquette-eaton · 2024-09-24T06:49:53Z

drivers/mge-hid.c

@@ -1292,7 +1294,7 @@ static hid_info_t mge_hid2nut[] =
 	/* Refer to Note 1 (This point will need more clarification!)
 	{ "battery.charger.status", 0, 0, "UPS.BatterySystem.Charger.PresentStatus.Used", NULL, "%.0f", HU_FLAG_QUICK_POLL, eaton_abm_enabled_legacy_info }, */
 	/* This data is the actual ABM status information */
-	{ "battery.charger.status", 0, 0, "UPS.BatterySystem.Charger.Mode", NULL, "%.0f", HU_FLAG_QUICK_POLL, eaton_abm_status_info },
+	{ "battery.charger.status", 0, 0, "UPS.BatterySystem.Charger.Status", NULL, "%.0f", HU_FLAG_QUICK_POLL, eaton_abm_status_info },


to be tested, may be avail on some units, not others. May need both Mode and Status

Unified charger info,bitmap with :
Status on bit 0-3:
0x0: Off
0x1: Charging
0x2: Floating
0x3: On, not charging
0x4: Discharging
0x5-0xF : Reserved
Mode on bit 4-6:
0: CC
1: ABM
2-7 : Reserved
Error on bit 7:
0: Good
1: In error

Also ABM table commented needs to be changes?

arnaudquette-eaton · 2024-09-24T06:51:06Z

drivers/mge-hid.c

@@ -1482,8 +1484,9 @@ static hid_info_t mge_hid2nut[] =
 	{ "outlet.1.id", 0, 0, "UPS.OutletSystem.Outlet.[2].OutletID", NULL, "%.0f", HU_FLAG_STATIC, NULL },
 	{ "outlet.1.desc", ST_FLAG_RW | ST_FLAG_STRING, 20, "UPS.OutletSystem.Outlet.[2].OutletID", NULL, "PowerShare Outlet 1", HU_FLAG_ABSENT, NULL },
 	{ "outlet.1.switchable", 0, 0, "UPS.OutletSystem.Outlet.[2].PresentStatus.Switchable", NULL, "%s", HU_FLAG_STATIC, yes_no_info },
-	{ "outlet.1.status", 0, 0, "UPS.OutletSystem.Outlet.[2].PresentStatus.SwitchOn/Off", NULL, "%s", 0, on_off_info },
+	{ "outlet.1.status", 0, 0, "UPS.OutletSystem.Outlet.[1].Status", NULL, "%s", 0, on_off_info },	


ditto, may need both.... this one provides more than just on/off

Global status of the load segment :
0 : Not powered
1 : Not protected
2 : Protected

so to leave { "outlet.2.status", 0, 0, "UPS.OutletSystem.Outlet.[3].PresentStatus.SwitchOn/Off", NULL, "%s", 0, on_off_info }, ?

0,1,2 thius mean = NULL, "%.2f", 0, NULL }, or NULL, "%.0f", HU_FLAG_STATIC, NULL },

means a lookup function, something like:

static info_lkp_t eaton_enable_disable_info[] = {
{ 0, "not powered", NULL, NULL },
{ 1, "not protected", NULL, NULL },
{ 2, "protected", NULL, NULL },
{ 0, NULL, NULL, NULL }
};

arnaudquette-eaton · 2024-09-24T06:51:59Z

drivers/mge-hid.c

 	/* FIXME: should better use UPS.OutletSystem.Outlet.[1].Status? */
+	{ "outlet.1.idesignator", 0, 0, "UPS.OutletSystem.Outlet.[1].iDesignator", NULL, "%s", 0, on_off_info }, /* needs to check  */


stringid_conversion (thats an iValue, so indexed string), not on_off ;)

arnaudquette-eaton · 2024-09-24T06:52:56Z

drivers/mge-hid.c

-	/* 0: The outlet is not ECO controlled. / 1 : The outlet is ECO controlled. => Readonly! use some yes_no_info
-		{ "outlet.1.ecocontrol", 0, 0, "UPS.OutletSystem.Outlet.[2].ECOControl", NULL, "%.2f", 0, NULL },*/
+	/* 0: The outlet is not ECO controlled. / 1 : The outlet is ECO controlled. => Readonly! use some yes_no_info */
+	{ "outlet.1.ecocontrol", 0, 0, "UPS.OutletSystem.Outlet.[2].ECOControl", NULL, "%.2f", 0, NULL },


nut suitable name to be found!
need a lookup function, like on_off, but for:
0 : The outlet is not ECO controlled.
1 : The outlet is ECO controlled.

added function

Signed-off-by: DaRK AnGeL <masterwishx@gmail.com>

arnaudquette-eaton · 2024-09-24T07:05:14Z

Ref: #2495

2nding @jimklimov comment to base of master, and include my base PR in yours

masterwishx

to be tested, may be avail on some units, not others. May need both Mode and Status

Unified charger info,bitmap with :
Status on bit 0-3:
0x0: Off
0x1: Charging
0x2: Floating
0x3: On, not charging
0x4: Discharging
0x5-0xF : Reserved
Mode on bit 4-6:
0: CC
1: ABM
2-7 : Reserved
Error on bit 7:
0: Good
1: In error

So this is not right table? and needs to change as you wrote above?

Charger ABM mode | Charging | Floating | Resting | Discharging | Disabled | Disabled
UPS.BatterySystem.Charger.Mode | 1 | 3 | 4 | 2 | 6 | 6

Signed-off-by: DaRK AnGeL <28630321+masterwishx@users.noreply.github.com>

jimklimov · 2024-09-24T11:36:03Z

Found that "Editing" a PR now allows to change the target branch, so this instance is now the main one of the flock.

masterwishx · 2024-09-24T12:06:50Z

@arnaudquette-eaton @jimklimov I made some changes from comments, please check when you have time

masterwishx · 2024-09-24T12:40:49Z

drivers/mge-hid.c

@@ -689,6 +689,12 @@ static info_lkp_t pegasus_yes_no_info[] = {
 	{ 0, NULL, NULL, NULL }
 };



Added function like yes_no

masterwishx · 2024-09-24T12:41:15Z

drivers/mge-hid.c

@@ -864,17 +870,25 @@ static info_lkp_t eaton_converter_online_info[] = {
 	{ 0, NULL, NULL, NULL }
 };

+static info_lkp_t eaton_outlet_status_enable_disable_info[] = {


Added func for outlet_status

…'work/2495' NOTE: ECO entries in code and docs go before the ALARM entries. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov · 2024-10-21T19:03:54Z

Bumped #2637 and #2660 against recent master changes (ALARM support landed into same spots almost everywhere).
NOTE: #2637 is still a strict subset of #2660.

So CI will spend some time re-checking them all...

AppVeyorBot · 2024-11-12T12:36:38Z

✅ Build nut 2.8.2.2340-master completed (commit 6afacfd52a by @masterwishx)

AppVeyorBot · 2024-11-14T01:37:55Z

✅ Build nut 2.8.2.2349-master completed (commit cbece0107f by @jimklimov)

…andard as around [networkupstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…upstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov · 2024-11-14T10:22:22Z

This PR is not as contended as the follow-up in #2660 with deeper changes into existing driver logic, so it was a good idea to separate the two :)

I intend to merge this one as soon as CI is satisfied with the recent revision.

drivers/mge-hid.c

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…ls#2637 (revised in later PR) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

…upstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

desertwitch · 2024-11-14T10:45:57Z

Just cross checked #2637 and #2660 branches against each other.
#2660 seems to introduce no more ECO-changes that would be relevant to this PR, only ABM - LGTM.
Might be worth renaming #2660 PR to reflect that those are ABM improvements rather than ECO-related.

masterwishx · 2024-11-14T10:50:03Z

Just cross checked #2637 and #2660 branches against each other. #2660 seems to introduce no more ECO-changes that would be relevant to this PR, only ABM - LGTM. Might be worth renaming #2660 PR to reflect that those are ABM improvements rather than ECO-related.

Confirm #2637 for ECO/bypass mode , #2660 added statuses for ABM , @jimklimov sorry again that not made a separate pr for ABM

jimklimov · 2024-11-14T16:12:22Z

Well, I hope to merge #2637 soon, and #2660 can then be rebased over the updated master branch or otherwise merged and reconciled, and renamed as fits the resulting change set.

arnaudquette-eaton and others added 3 commits September 23, 2024 14:12

EATON HID: add missing usages and paths

52ccc91

Signed-off-by: Arnaud Quette <arnaudquette@eaton.com>

EATON HID: completion on examples

7d1082c

Signed-off-by: Arnaud Quette <arnaudquette@eaton.com>

first trying to add values

e5463b7

Signed-off-by: DaRK AnGeL <masterwishx@gmail.com>

masterwishx mentioned this pull request Sep 23, 2024

EATON HID: add missing usages and paths (initial) #2636

Closed

masterwishx changed the title ~~first trying to add values~~ Ffirst trying to add values Sep 23, 2024

masterwishx changed the title ~~Ffirst trying to add values~~ First try to add values for #2636 Sep 23, 2024

arnaudquette-eaton reviewed Sep 24, 2024

View reviewed changes

some typo fix

57604b2

Signed-off-by: DaRK AnGeL <masterwishx@gmail.com>

masterwishx commented Sep 24, 2024

View reviewed changes

masterwishx added 3 commits September 24, 2024 13:14

some of the fixes

97603cd

Signed-off-by: DaRK AnGeL <28630321+masterwishx@users.noreply.github.com>

fix typo in comments

4dbd3ab

Signed-off-by: DaRK AnGeL <28630321+masterwishx@users.noreply.github.com>

add 'eco_pegasus_yes_no_info' func to uotlet.2.ecocontrol

408d5fd

Signed-off-by: DaRK AnGeL <28630321+masterwishx@users.noreply.github.com>

jimklimov marked this pull request as draft September 24, 2024 11:33

jimklimov mentioned this pull request Sep 24, 2024

Work/2495 #2639

Closed

jimklimov changed the base branch from work/2495-eaton-usb-ids to master September 24, 2024 11:38

jimklimov marked this pull request as ready for review September 24, 2024 11:38

Merge branch 'master' into work/2495

4a04f3b

jimklimov changed the title ~~First try to add values for #2636~~ EATON HID: add missing usages and paths Sep 24, 2024

jimklimov added this to the 2.8.4 milestone Sep 24, 2024

masterwishx commented Sep 24, 2024

View reviewed changes

jimklimov modified the milestones: 2.8.4, 2.8.3 Oct 20, 2024

Merge remote-tracking branch 'upstream/master' as of 2024-10-21 into …

00d5a9e

…'work/2495' NOTE: ECO entries in code and docs go before the ALARM entries. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

masterwishx added 3 commits October 23, 2024 16:33

Merge branch 'master' into work/2495

8ec6885

Merge branch 'master' into work/2495

6f63b35

Merge branch 'master' into work/2495

eeaa4c5

Merge branch 'master' into work/2495

662bc6d

drivers/mge-hid.c: reshuffle whitespace/markup of ECO code to same st…

c90b56f

…andard as around [networkupstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added a commit to masterwishx/nut that referenced this pull request Nov 14, 2024

drivers/mge-hid.c: bump subdriver version for added ECO code [network…

61b7932

…upstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added a commit to masterwishx/nut that referenced this pull request Nov 14, 2024

clients/status.h: lower severity of ECO state [networkupstools#2637]

f881d75

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov added the ready / gonna merge The PR is in final cycles leading to merge unless someone logs an objection before we hit the button label Nov 14, 2024

jimklimov mentioned this pull request Nov 14, 2024

Introduce NUT handling for "ECO Mode" (status, commands) #2495

Open

desertwitch reviewed Nov 14, 2024

View reviewed changes

drivers/mge-hid.c Outdated Show resolved Hide resolved

jimklimov added 3 commits November 14, 2024 11:37

clients/status.h: lower severity of ECO state [networkupstools#2637]

6d02cf7

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

drivers/mge-hid.c: drop ECO/ABM-related changes from PR networkupstoo…

9ccc207

…ls#2637 (revised in later PR) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

drivers/mge-hid.c: bump subdriver version for added ECO code [network…

b776990

…upstools#2637] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

jimklimov force-pushed the work/2495 branch from f881d75 to b776990 Compare November 14, 2024 10:37

jimklimov approved these changes Nov 14, 2024

View reviewed changes

jimklimov merged commit 7c4e55e into networkupstools:master Nov 15, 2024
30 checks passed

masterwishx deleted the work/2495 branch November 15, 2024 11:01

masterwishx changed the title ~~EATON HID: add missing usages and paths~~ EATON HID: add missing usages and paths - ECO Mode Nov 15, 2024

This was referenced Nov 15, 2024

Work247-ecomode_addon #2679

Closed

Work247-ecomode_addon #2680

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EATON HID: add missing usages and paths - ECO Mode #2637

EATON HID: add missing usages and paths - ECO Mode #2637

masterwishx commented Sep 23, 2024 •

edited

Loading

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton Sep 24, 2024

masterwishx Sep 24, 2024

arnaudquette-eaton commented Sep 24, 2024 •

edited

Loading

masterwishx left a comment

jimklimov commented Sep 24, 2024 •

edited

Loading

masterwishx commented Sep 24, 2024

masterwishx Sep 24, 2024

masterwishx Sep 24, 2024

jimklimov commented Oct 21, 2024

AppVeyorBot commented Nov 12, 2024

AppVeyorBot commented Nov 14, 2024

jimklimov commented Nov 14, 2024

desertwitch commented Nov 14, 2024

masterwishx commented Nov 14, 2024 •

edited

Loading

jimklimov commented Nov 14, 2024 •

edited

Loading

		/* FIXME: should better use UPS.OutletSystem.Outlet.[1].Status? */
		{ "outlet.1.idesignator", 0, 0, "UPS.OutletSystem.Outlet.[1].iDesignator", NULL, "%s", 0, on_off_info }, /* needs to check */

		@@ -689,6 +689,12 @@ static info_lkp_t pegasus_yes_no_info[] = {
		{ 0, NULL, NULL, NULL }
		};

EATON HID: add missing usages and paths - ECO Mode #2637

EATON HID: add missing usages and paths - ECO Mode #2637

Conversation

masterwishx commented Sep 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arnaudquette-eaton commented Sep 24, 2024 • edited Loading

masterwishx left a comment

Choose a reason for hiding this comment

jimklimov commented Sep 24, 2024 • edited Loading

masterwishx commented Sep 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jimklimov commented Oct 21, 2024

AppVeyorBot commented Nov 12, 2024

AppVeyorBot commented Nov 14, 2024

jimklimov commented Nov 14, 2024

desertwitch commented Nov 14, 2024

masterwishx commented Nov 14, 2024 • edited Loading

jimklimov commented Nov 14, 2024 • edited Loading

masterwishx commented Sep 23, 2024 •

edited

Loading

arnaudquette-eaton commented Sep 24, 2024 •

edited

Loading

jimklimov commented Sep 24, 2024 •

edited

Loading

masterwishx commented Nov 14, 2024 •

edited

Loading

jimklimov commented Nov 14, 2024 •

edited

Loading