Skip to content

Comments

[pull] master from networkupstools:master#382

Merged
pull[bot] merged 38 commits intopthis:masterfrom
networkupstools:master
Jan 29, 2026
Merged

[pull] master from networkupstools:master#382
pull[bot] merged 38 commits intopthis:masterfrom
networkupstools:master

Conversation

@pull
Copy link

@pull pull bot commented Jan 29, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

timn and others added 30 commits January 23, 2026 23:58
Enables to read UPS data from UPower. This is useful if a UPS
connected to a desktop system should be exposed over the network.
It can also be used to expose laptop batteries.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
Required to also test upower_dbus driver.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
Signed-off-by: Tim Niemueller <tim@niemueller.de>
Signed-off-by: Tim Niemueller <tim@niemueller.de>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Add missing terms.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
…ut.voltage`, `output.voltage` for e.g. Ugreen US3000 [#3281]

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

Some devices are slow to respond to a first query and fail detection.
Maybe delaying by a bit over 1 second would help?

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…query was OK and second was invalid [#3282]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…tfix GLIB_CFLAGS with -isystem options to reduce CLANG (mostly) compiler warnings [#3279]

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

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…des and their errnos [#3276]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… query retry to errno==EINVAL for now [#3276]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…r ENABLE_SHARED_PRIVATE_LIBS setting [#2800]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…o honour ENABLE_SHARED_PRIVATE_LIBS and match tools/nutconf/Makefile.am [#2800]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… qx_process_answer(): set errno=ETIMEDOUT (not EINVAL) if raised by caller or we had a zero-length read; use this in voltronic_claim() [#3276, #3283]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… a careless `git clean -fdX`

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…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>
…ags to use a separate OBS template (tweaked to change the dash into tilde for packaging versions) [#1209]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…setup [#1209]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…cies to honour ENABLE_SHARED_PRIVATE_LIBS [#2800]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… INSTCMDs [#3288]

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

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…hellish syntax to compare two semvers" [#3055]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ut "==" comparator [#3055]

Co-authored-by: Greg Troxel <gdt@lexort.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
CI: Honour `ENABLE_SHARED_PRIVATE_LIBS` option for C++ libs
Longer timeout after serial port init in nutdrv_qx
drivers: powercom-hid: use offdelay/ondelay config options for shutdown commands
arduino-hid: add `ups.load`, `input.voltage`, `output.voltage`…
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@pull pull bot locked and limited conversation to collaborators Jan 29, 2026
@pull pull bot added the ⤵️ pull label Jan 29, 2026
@pull pull bot merged commit 5258b8f into pthis:master Jan 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants