drivers: powercom-hid: use offdelay/ondelay config options for shutdown commands #3288
+48
−5
Conversation
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
…wn commands
The powercom_shutdown_nuf(), powercom_stayoff_nuf(), and
powercom_startup_nuf() functions were reading delay values from
dstate_getinfo("ups.delay.shutdown") and dstate_getinfo("ups.delay.start"),
which return the UPS's CURRENT delay values read via HID.
However, users configure their desired delays via the "offdelay" and
"ondelay" driver options in ups.conf. These were being ignored.
This patch changes the functions to:
1. First try the value passed directly to the instant command
2. Then try getval("offdelay")/getval("ondelay") from driver config
3. Then try dstate_getinfo() for current UPS values
4. Finally fall back to sensible defaults (60s shutdown, 120s startup)
This ensures that user configuration is respected.
Tested on Powercom RPT-800AP (VendorID: 0x0d9f, ProductID: 0x0004).
Signed-off-by: Vladyslav Andreichykov <vladdrako007@gmail.com>
Member
|
Thanks for the change and for testing it! I'll update the news entry and some comments. |
… INSTCMDs [networkupstools#3288] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…networkupstools#3288] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The powercom_shutdown_nuf(), powercom_stayoff_nuf(), and powercom_startup_nuf() functions were reading delay values from dstate_getinfo("ups.delay.shutdown") and dstate_getinfo("ups.delay.start"), which return the UPS's CURRENT delay values read via HID.
However, users configure their desired delays via the "offdelay" and "ondelay" driver options in ups.conf. These were being ignored.
This patch changes the functions to:
This ensures that user configuration is respected.
Tested on Powercom RPT-800AP (VendorID: 0x0d9f, ProductID: 0x0004).
Prevents daemon.crit usbhid-ups[10112]: instcmd: attempting a power state change operation [shutdown.return] [(null) (21504.000000)] on [powercom] with broken 21504 value