mge-hid: add Eaton 5P Gen2 models to mge_model_names - #3617
Open
setnicka wants to merge 1 commit into
Open
Conversation
The Gen2 units report iModel strings like "650iR G2", which match no entry in mge_model_names[], so mge_type stays MGE_DEFAULT. Both mge_battery_voltage_fun() and mge_battery_voltage_nominal_fun() return NULL for unknown types, so battery.voltage and battery.voltage.nominal are dropped although their UPS.PowerSummary.Voltage and .ConfigVoltage source paths are parsed fine. Names are assumed per the VA numbers and form factors of the Gen2 range, as was done before for the 5PX and 5SC series. Bump the subdriver version so driver.version.data reflects the extended mapping table. Signed-off-by: Jiří Setnička <setnicka@seznam.cz>
|
A ZIP file with standard source tarball and another tarball with pre-built docs for commit 10ee119 is temporarily available: NUT-tarballs-PR-3617.zip. |
Member
|
Thanks! CCing @arnaudquette-eaton for cross-check or more ideas |
jimklimov
added
Eaton
USB
MGE
|
✅ Build nut 2.8.5.5216-master completed (commit bfff731d6e by @setnicka)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds the Eaton 5P Gen2 model strings to
mge_model_names[].The Gen2 units report
iModelstrings like "650iR G2", which match no entry in the table, somge_typestaysMGE_DEFAULT. Bothmge_battery_voltage_fun()andmge_battery_voltage_nominal_fun()return NULL for unknown types, sobattery.voltageandbattery.voltage.nominalare dropped althoughUPS.PowerSummary.Voltageand.ConfigVoltageare parsed fine. Same mechanism as #2380, different models.Tested against an Eaton 5P 650iR G2 (
0463:ffff, iProduct "Eaton 5P", firmware 00.04.0015). Before the change:so
upscshoweddevice.model: Eaton 5P 650iR G2(the concatenation fallback, i.e. nothing matched) and nobattery.voltage. After the change bothbattery.voltageandbattery.voltage.nominalare reported.Only "650iR G2" is confirmed from hardware. The other entries are guesses at the VA ratings and the rack ("iR") / tower ("i") form factors of the Gen2 range, similarly as the existing 5PX and 5SC blocks. Corrections from anyone with other Gen2 units are welcome. Names are left NULL so
ups.modelkeeps theiProduct+iModelconcatenation.Checklist notes:
MGE_HID_VERSIONbumped to "MGE HID 1.61".NEWS.adocbullet added;make spellcheckclean, nodocs/nut.dictchange.data/driver.list.inuntouched: Eaton "5P" / "USB port" /usbhid-upsis already listed at series level.scripts/upower/95-upower-hid.hwdbuntouched:usb:v0463pFFFF*is already covered.Happy to post a NUT DDL dump for this unit if that is useful.
AI disclosure per the template: the initial debug (why the voltage isn't showing) also as the initial draft of the patch was done using Claude Code (Claude Opus 5) and reviewed and tuned manually. The hardware evidence above is from my own unit.