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.

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

drivers/mge-hid.c, NEWS.adoc: try to recognize Eaton 9E model and info #2562

Merged
merged 4 commits into from
Aug 11, 2024
Merged

drivers/mge-hid.c, NEWS.adoc: try to recognize Eaton 9E model and info #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cd226a
drivers/mge-hid.c, NEWS.adoc: try to recognize Eaton 9E model and inf…
jimklimov Jul 28, 2024
7130c98
drivers/mge-hid.c: rephrase the presumed 9E2000*i* model [#2562]
jimklimov Jul 31, 2024
57906c8
drivers/mge-hid.c: add Eaton 9E1000* models, and "ir" suffix for rack…
jimklimov Jul 31, 2024
c4bea54
drivers/mge-hid.c: add Eaton 9En000 models "iau" suffix, and 9E3000 "…
jimklimov Jul 31, 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
2 changes: 1 addition & 1 deletion NEWS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ https://github.com/networkupstools/nut/milestone/11
* General suggestion from `possibly_supported()` message method for devices
with VendorID=`0x06da` (Phoenixtec), seen in some models supported by
MGE HID or Liebert HID, updated to suggest trying `nutdrv_qx`. [#334]
* MGE HID list of `mge_model_names[]` was extended for Eaton 5PX and 5SC
* MGE HID list of `mge_model_names[]` was extended for Eaton 9E, 5PX and 5SC
series (largely guessing, feedback and PRs for adaptation to actual
string values reported by devices via USB are welcome), so these devices
would now report `battery.voltage` and `battery.voltage.nominal`. [#2380]
Expand Down
1 change: 1 addition & 0 deletions data/driver.list.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@
"Eaton" "ups" "5" "5S" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "5SC" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "5P" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "9E" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "9SX" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "9PX" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "9PX Split Phase 6/8/10 kVA" "USB port" "usbhid-ups"
Expand Down
35 changes: 33 additions & 2 deletions drivers/mge-hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# endif
#endif

#define MGE_HID_VERSION "MGE HID 1.47"
#define MGE_HID_VERSION "MGE HID 1.48"

/* (prev. MGE Office Protection Systems, prev. MGE UPS SYSTEMS) */
/* Eaton */
Expand Down Expand Up @@ -131,7 +131,8 @@ typedef enum {
MGE_PULSAR_M_2200,
MGE_PULSAR_M_3000,
MGE_PULSAR_M_3000_XL,
EATON_5P = 0x500 /* Eaton 5P / 5PX / 5SC series */
EATON_5P = 0x500, /* Eaton 5P / 5PX / 5SC series */
EATON_9E = 0x900 /* Eaton 9E entry-level series */
} models_type_t;

/* Default to line-interactive or online (ie, not offline).
Expand Down Expand Up @@ -489,6 +490,7 @@ static const char *mge_battery_voltage_nominal_fun(double value)

case MGE_PULSAR_M:
case EATON_5P:
case EATON_9E: /* Presumably per https://github.com/networkupstools/nut/issues/1925#issuecomment-1562342854 */
break;

default:
Expand All @@ -514,6 +516,7 @@ static const char *mge_battery_voltage_fun(double value)
case MGE_EVOLUTION:
case MGE_PULSAR_M:
case EATON_5P:
case EATON_9E: /* Presumably per https://github.com/networkupstools/nut/issues/1925#issuecomment-1562342854 */
break;

default:
Expand Down Expand Up @@ -1144,6 +1147,34 @@ static models_name_t mge_model_names [] =
{ "Eaton 5SC", "2200", EATON_5P, NULL },
{ "Eaton 5SC", "3000", EATON_5P, NULL },

/* Eaton 9E entry-level series per discussions in
* https://github.com/networkupstools/nut/issues/1925
* https://github.com/networkupstools/nut/issues/2380
* https://github.com/networkupstools/nut/issues/2492
*/
{ "Eaton 9E", "1000", EATON_9E, "9E1000" },
{ "Eaton 9E", "1000i", EATON_9E, "9E1000i" },
{ "Eaton 9E", "1000iau", EATON_9E, "9E1000iau" },
{ "Eaton 9E", "1000ir", EATON_9E, "9E1000ir" },
{ "Eaton 9E", "2000", EATON_9E, "9E2000" },
{ "Eaton 9E", "2000i", EATON_9E, "9E2000i" },
{ "Eaton 9E", "2000iau", EATON_9E, "9E2000iau" },
{ "Eaton 9E", "2000ir", EATON_9E, "9E2000ir" },
{ "Eaton 9E", "3000", EATON_9E, "9E3000" },
{ "Eaton 9E", "3000i", EATON_9E, "9E3000i" },
{ "Eaton 9E", "3000iau", EATON_9E, "9E3000iau" },
{ "Eaton 9E", "3000ir", EATON_9E, "9E3000ir" },
{ "Eaton 9E", "3000ixl", EATON_9E, "9E3000ixl" },
{ "Eaton 9E", "3000ixlau", EATON_9E, "9E3000ixlau" },

/* https://github.com/networkupstools/nut/issues/1925#issuecomment-1609262963
* if we failed to get iManufacturer, iProduct and iSerialNumber but saw
* the UPS.Flow.[4].ConfigApparentPower (the "2000" or "3000" part here)
*/
{ "unknown", "1000", EATON_9E, "9E1000i (presumed)" },
{ "unknown", "2000", EATON_9E, "9E2000i (presumed)" },
{ "unknown", "3000", EATON_9E, "9E3000i (presumed)" },

/* Pulsar M models */
{ "PULSAR M", "2200", MGE_PULSAR_M_2200, NULL },
{ "PULSAR M", "3000", MGE_PULSAR_M_3000, NULL },
Expand Down
Loading