-
-
Notifications
You must be signed in to change notification settings - Fork 395
apc_modbus: Add CHRG and DISCHRG status #3014
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
base: master
Are you sure you want to change the base?
Conversation
Converted to draft because it needs to check some more conditions. I'll need to test. |
@EchterAgo : offtopic question - did you ever hit issues like those discussed in #2609? Any idea if they are rooted in the device, NUT driver, libmodbus core (at least, other people did have issues with exceeded timeouts in its unit tests similar to what I saw, possibly linked to SMP systems), or (y)our libmodbus rtu_usb fork specifically?.. Also, do you develop/test against your variant of rtu_usb branch (probably same as https://github.com/networkupstools/libmodbus/tree/v3.1.10%2Brtu_usb-NUTv2.8.1 when you handed it off), or the current https://github.com/networkupstools/libmodbus/tree/rtu_usb we suggest NUT users use? |
We use the acceptable input flag and the current battery level to determine if the device status is charging or discharging. Signed-off-by: Axel Gembe <[email protected]>
737bef0
to
21a5af3
Compare
Signed-off-by: Jim Klimov <[email protected]>
@EchterAgo : FYI, I've updated the PR with a merge from master and another DRIVER_VERSION bump. If you have some development commits added locally since posting the PR, feel free to rebase them over this github version before pushing up :) |
❌ Build nut 2.8.3.3381-master failed (commit 97797af1c5 by @jimklimov) |
Un-drafting temporarily to let CI see the updated code base. |
Hm, CI did not update the status back for a draft PR. |
apc_modbus: Add CHRG and DISCHRG status
We use the acceptable input flag and the current battery level to
determine if the device status is charging or discharging.
Please merge #3013 first.
Signed-off-by: Axel Gembe [email protected]
General points
Described the changes in the PR submission or a separate issue, e.g.
known published or discovered protocols, applicable hardware (expected
compatible and actually tested/developed against), limitations, etc.
There may be multiple commits in the PR, aligned and commented with
a functional change. Notably, coding style changes better belong in a
separate PR, but certainly in a dedicated commit to simplify reviews
of "real" changes in the other commits. Similarly for typo fixes in
comments or text documents.
Please star NUT on GitHub, this helps with sponsorships! ;)
Frequent "underwater rocks" for driver addition/update PRs
Revised existing driver families and added a sub-driver if applicable
(
nutdrv_qx
,usbhid-ups
...) or added a brand new driver in the othercase.
Did not extend obsoleted drivers with new hardware support features
(notably
blazer
and other single-device family drivers for Qx protocols,except the new
nutdrv_qx
which should cover them all).For updated existing device drivers, bumped the
DRIVER_VERSION
macroor its equivalent.
For USB devices (HID or not), revised that the driver uses unique
VID/PID combinations, or raised discussions when this is not the case
(several vendors do use same interface chips for unrelated protocols).
For new USB devices, built and committed the changes for the
scripts/upower/95-upower-hid.hwdb
fileProposed NUT data mapping is aligned with existing
docs/nut-names.txt
file. If the device exposes useful data points not listed in the file, the
experimental.*
namespace can be used as documented there, and discussionshould be raised on the NUT Developers mailing list to standardize the new
concept.
Updated
data/driver.list.in
if applicable (new tested device info)Frequent "underwater rocks" for general C code PRs
structure layout and alignment in memory, endianness (layout of bytes and
bits in memory for multi-byte numeric types), or use of generic
int
wherelanguage or libraries dictate the use of
size_t
(orssize_t
sometimes).Progress and errors are handled with
upsdebugx()
,upslogx()
,fatalx()
and related methods, not with directprintf()
orexit()
.Similarly, NUT helpers are used for error-checked memory allocation and
string operations (except where customized error handling is needed,
such as unlocking device ports, etc.)
Coding style (including whitespace for indentations) follows precedent
in the code of the file, and examples/guide in
docs/developers.txt
file.For newly added files, the
Makefile.am
recipes were updated and themake distcheck
target passes.General documentation updates
Updated
docs/acknowledgements.txt
(for vendor-backed device support)Added or updated manual page information in
docs/man/*.txt
filesand corresponding recipe lists in
docs/man/Makefile.am
for new pagesPassed
make spellcheck
, updated spell-checking dictionary in thedocs/nut.dict
file if needed (did not remove any words -- themake
rule printout in case of changes suggests how to maintain it).
Additional work may be needed after posting this PR
Propose a PR for NUT DDL with detailed device data dumps from tests
against real hardware (the more models, the better).
Address NUT CI farm build failures for the PR: testing on numerous
platforms and toolkits can expose issues not seen on just one system.
the changed codebase.