Skip to content
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.

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

EATON HID: add missing usages and paths #2637

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
52ccc91
EATON HID: add missing usages and paths
arnaudquette-eaton Sep 23, 2024
7d1082c
EATON HID: completion on examples
arnaudquette-eaton Sep 23, 2024
e5463b7
first trying to add values
masterwishx Sep 23, 2024
57604b2
some typo fix
masterwishx Sep 24, 2024
97603cd
some of the fixes
masterwishx Sep 24, 2024
4dbd3ab
fix typo in comments
masterwishx Sep 24, 2024
408d5fd
add 'eco_pegasus_yes_no_info' func to uotlet.2.ecocontrol
masterwishx Sep 24, 2024
4a04f3b
Merge branch 'master' into work/2495
jimklimov Sep 24, 2024
e7145d7
eaton_outlet_protection_status_info + outlet_eco_yes_no_info fix
masterwishx Sep 24, 2024
3028e77
outlet_eco_yes_no_info move to mge-xml.c
masterwishx Sep 24, 2024
f8583b1
intoduce input.eco.switchable
masterwishx Sep 24, 2024
878c41b
added `info_lkp_t outlet_eco_yes_no_info` and `valtab_t outlet_eco_y…
masterwishx Sep 24, 2024
dbc8a32
try to fix definition of `outlet_eco_yes_no_info[] error`
masterwishx Sep 24, 2024
e3ad8b4
remove `*outlet_eco_yes_no_info` from mgr-hid.c
masterwishx Sep 24, 2024
50ddcb9
outlet.1.ecocontrol added to mge-xml to fix undefined
masterwishx Sep 24, 2024
e84dcc0
outlet_eco_yes_no_info defined in upshid-ups.h
masterwishx Sep 24, 2024
ca26f21
remove `outlet_eco_yes_no_info[]` from powerp-bin.c
masterwishx Sep 24, 2024
af90cc4
remove also from mge-xml.c
masterwishx Sep 24, 2024
a9865c0
remove typo space
masterwishx Sep 24, 2024
0159aa3
move `info_lkp_t outlet_eco_yes_no_info[]` to mge-hid.c
masterwishx Sep 25, 2024
ef37e06
added `info_lkp_t eaton_input_mode_info[]` for input.eco.switchable
masterwishx Sep 25, 2024
b79dd34
adding `input.eco.switchable,outlet.n.ecocontrol` to cmdvartab and /d…
masterwishx Sep 25, 2024
1bf083a
comment on ESS mode
masterwishx Sep 25, 2024
f8915f1
change to `switch (0-2)` for input.eco.switchable in nut-names.txt
masterwishx Sep 25, 2024
eda403f
`outlet.1.switch.status` rename back to `outlet.1.status`
masterwishx Sep 25, 2024
6e63a97
`outlet.n.status` back and new one move to intro `outlet.1.protect.s…
masterwishx Sep 25, 2024
02f74fb
change outlet.2 ... Outlet.[1] to Outlet.[3]
masterwishx Sep 25, 2024
0fb27ae
Fix typo in "Outlet [P] -> [p]rotection status"
masterwishx Sep 25, 2024
c89b245
add eco_mode info
masterwishx Sep 30, 2024
f1c2135
fix info_lkp_t eco_mode_info[]
masterwishx Sep 30, 2024
9cebd2e
fix typo
masterwishx Sep 30, 2024
c839e57
define info_lkp_t eco_mode_info[] in usbhid-ups.h
masterwishx Sep 30, 2024
74a3ed2
delete typo space
masterwishx Sep 30, 2024
b2271d0
eco_mode_info[] back 3 values + UPS.PowerConverter.Input.[5].PresentS…
masterwishx Oct 1, 2024
c457a18
fix typo ups_status
masterwishx Oct 1, 2024
7b3a1d0
info_lkp_t eaton_input_mode_info[] format spaces
masterwishx Oct 1, 2024
5ac8c4b
change ecomode to high-efficiency in status_info
masterwishx Oct 1, 2024
6660f3b
add ecomode commands
masterwishx Oct 1, 2024
3c4e96d
Merge branch 'master' into work/2495
masterwishx Oct 2, 2024
85919bc
Merge branch 'master' into work/2495
jimklimov Oct 2, 2024
88000b8
add bypass commands for test
masterwishx Oct 3, 2024
fbce60a
eaton_input_bypass_mode_info[] added
masterwishx Oct 3, 2024
acb1182
spaces typo fixes
masterwishx Oct 3, 2024
799c1f8
rename to `bypassauto` in info_lkp_t eaton_input_bypass_mode_info[]
masterwishx Oct 3, 2024
06f0f25
change he to ecomode
masterwishx Oct 4, 2024
633c0b7
change back to ecomode
masterwishx Oct 4, 2024
3a4a150
input.transfer.forced.enabled added + input.bypass.switch.on/off for …
masterwishx Oct 7, 2024
65ae02e
remove nfo_lkp_t eaton_input_transfer_on_off_info as eaton_enable_dis…
masterwishx Oct 7, 2024
9a83044
comment added for ...forced
masterwishx Oct 7, 2024
19e4405
rename to ECO(HE) mode! fix comments
masterwishx Oct 9, 2024
517bcf0
add values to cmdvartab + change to bypass.sart/stop instead bypass.o…
masterwishx Oct 9, 2024
a2ecd22
added values to nut-names
masterwishx Oct 9, 2024
b0d0b30
input.bypass.switch.off up to 12 becose return 11 bytes
masterwishx Oct 10, 2024
59c4bc7
docs/nut.dict: update for changes in docs/nut-names.txt [#2495, #2637]
jimklimov Oct 11, 2024
11e6f72
clients/status.h: add an entry for ECO status [#2367]
jimklimov Oct 11, 2024
1746ec9
upsmon (sources, docs, config samples, C++ nutconf support): add trac…
jimklimov Oct 11, 2024
816074b
scripts/python/app/NUT-Monitor-*: add reporting for ECO status [#2367]
jimklimov Oct 11, 2024
f76af4d
NEWS.adoc: announce ECO mode concept support [issue #2495, PR #2637]
jimklimov Oct 11, 2024
cb2bb25
add eaton_check_bypass_range() for check bypass limit
masterwishx Oct 11, 2024
3362bd6
Merge branch 'work/2495' of https://github.com/masterwishx/nut into w…
masterwishx Oct 11, 2024
53557f2
fix for eaton_check_bypass_range()
masterwishx Oct 11, 2024
9260798
fix eaton_check_bypass_range()
masterwishx Oct 11, 2024
30ce796
rename to eaton_input_bypass_check_range()
masterwishx Oct 11, 2024
465ae24
disable eco alarm
masterwishx Oct 11, 2024
7390b6b
fix2 eaton_input_bypass_check_range()
masterwishx Oct 11, 2024
dcd1358
fix3 eaton_input_bypass_check_range()
masterwishx Oct 11, 2024
a5a51c0
add define values
masterwishx Oct 11, 2024
cb6c601
fix3 eaton_input_bypass_check_range()
masterwishx Oct 11, 2024
3669d38
function to up for definition
masterwishx Oct 11, 2024
8a938bb
fix for upsdebugx
masterwishx Oct 11, 2024
ff208db
fix2 debugx
masterwishx Oct 11, 2024
5c3dbc7
more details for debugx + move declaration up
masterwishx Oct 11, 2024
fa611ec
fix typo
masterwishx Oct 11, 2024
df37871
fix again upsdebugx
masterwishx Oct 11, 2024
c96069e
move declaration uppper
masterwishx Oct 11, 2024
34c3b3f
add frequency range check to eaton_input_bypass_check_range()
masterwishx Oct 11, 2024
0598e24
Merge branch 'master' into work/2495
masterwishx Oct 11, 2024
575ac63
add freq to function comment
masterwishx Oct 11, 2024
26ad39a
add frequency default in case no value
masterwishx Oct 12, 2024
02f8f87
change comments sign
masterwishx Oct 12, 2024
c65be09
add function for check eco range
masterwishx Oct 12, 2024
fd6e8e5
check freq limit in separate block in eco mode
masterwishx Oct 12, 2024
5937a42
check freq limit in separate block for eaton_input_bypass_check_range()
masterwishx Oct 12, 2024
deb59b6
fix upsdebugx
masterwishx Oct 12, 2024
cacc516
add comment
masterwishx Oct 12, 2024
54e02ad
change eco/bypass values to avoid `ERR TOO-LONG`
masterwishx Oct 13, 2024
392d7cc
change nut-names.txt also
masterwishx Oct 13, 2024
7339c66
`ecocontrol` change description
masterwishx Oct 13, 2024
d119492
change some values for bypass/eco
masterwishx Oct 14, 2024
e0056e9
change to `on` in nut-names.txt also
masterwishx Oct 14, 2024
00d5a9e
Merge remote-tracking branch 'upstream/master' as of 2024-10-21 into …
jimklimov Oct 21, 2024
8ec6885
Merge branch 'master' into work/2495
masterwishx Oct 23, 2024
6f63b35
Merge branch 'master' into work/2495
masterwishx Nov 11, 2024
eeaa4c5
Merge branch 'master' into work/2495
masterwishx Nov 12, 2024
662bc6d
Merge branch 'master' into work/2495
jimklimov Nov 13, 2024
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
18 changes: 9 additions & 9 deletions drivers/mge-hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,13 +753,13 @@ static const char *eaton_input_eco_mode_check_range(double value)
if ((eco_low > 0 && eco_high > 0) &&
(bypass_voltage >= eco_low && bypass_voltage <= eco_high) &&
(bypass_frequency >= lower_frequency_limit && bypass_frequency <= upper_frequency_limit)) {
return "ecoModeOn"; /* Enter Eco mode */
return "ecoMode"; /* Enter Eco mode */
masterwishx marked this conversation as resolved.
Show resolved Hide resolved
}

/* Default values if user-defined limits are not available or out of range */
if ((bypass_voltage >= out_nominal * 0.95 && bypass_voltage <= out_nominal * 1.05) &&
(bypass_frequency >= lower_frequency_limit && bypass_frequency <= upper_frequency_limit)) {
return "ecoModeOn"; /* Enter Eco mode */
return "ecoMode"; /* Enter Eco mode */
} else {
return NULL; /* Do not enter Eco mode */
}
Expand All @@ -768,7 +768,7 @@ static const char *eaton_input_eco_mode_check_range(double value)
/* High Efficiency (aka ECO) mode */
static info_lkp_t eaton_input_mode_info[] = {
{ 0, "normal", NULL, NULL },
{ 1, "ecoModeOn", eaton_input_eco_mode_check_range, NULL }, /* NOTE: "ecomode" = checked and working fine */
{ 1, "ecoMode", eaton_input_eco_mode_check_range, NULL }, /* NOTE: "ecomode" = checked and working fine */
{ 2, "ESS", NULL, NULL }, /* Energy Saver System, makes sense for UPS that implements this mode */
{ 0, NULL, NULL, NULL }
};
Expand Down Expand Up @@ -832,28 +832,28 @@ static const char *eaton_input_bypass_check_range(double value)
if ((bypass_low > 0 && bypass_high > 0) &&
(bypass_voltage >= bypass_low && bypass_voltage <= bypass_high) &&
(bypass_frequency >= lower_frequency_limit && bypass_frequency <= upper_frequency_limit)) {
return "bypassOn"; /* Enter bypass mode */
return "On"; /* Enter bypass mode */
masterwishx marked this conversation as resolved.
Show resolved Hide resolved
}

if ((bypass_voltage >= out_nominal * 0.8 && bypass_voltage <= out_nominal * 1.15) &&
(bypass_frequency >= lower_frequency_limit && bypass_frequency <= upper_frequency_limit)) {
return "bypassOn"; /* Enter bypass mode */
return "On"; /* Enter bypass mode */
} else {
return NULL; /* Do not enter bypass mode */
}
}

/* Automatic Bypass mode On */
static info_lkp_t eaton_input_bypass_mode_on_info[] = {
{ 0, "not used", NULL, NULL },
{ 1, "bypassOn", eaton_input_bypass_check_range, NULL },
{ 0, "disabled", NULL, NULL },
{ 1, "On", eaton_input_bypass_check_range, NULL },
{ 0, NULL, NULL, NULL }
};

/* Automatic Bypass mode Off */
static info_lkp_t eaton_input_bypass_mode_off_info[] = {
{ 0, "not used", NULL, NULL },
{ 1, "bypassOff", NULL, NULL },
{ 0, "disabled", NULL, NULL },
{ 1, "Off", NULL, NULL },
{ 0, NULL, NULL, NULL }
};

Expand Down