Skip to content

apc_modbus: Updates, command, writable variables and outlet group support #2184

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

Merged
merged 15 commits into from
Mar 2, 2024
Merged

apc_modbus: Updates, command, writable variables and outlet group support #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7a8430d
apc_modbus: Updates, command, writable variables and outlet group sup…
EchterAgo Nov 13, 2023
16ce370
drivers/Makefile.am: dist the apc_modbus.h file
jimklimov Nov 16, 2023
8ee9cbc
apc_modbus: Add ups.test.result
EchterAgo Nov 22, 2023
0df06e9
apc_modbus: Fix re-read of values at the end of setvar
EchterAgo Nov 22, 2023
b66881a
build: Add a fallback for timegm on Windows / MINGW
EchterAgo Nov 24, 2023
1594898
apc_modbus: Always store times in UTC
EchterAgo Nov 22, 2023
e52658c
apc_modbus: Add target outlet group to load.* and shutdown.* commands
EchterAgo Nov 22, 2023
a6341f2
Merge branch 'master' into apc_modbus_updates
jimklimov Nov 24, 2023
489fe45
Merge branch 'master' into apc_modbus_updates
jimklimov Jan 13, 2024
9999a09
Merge branch 'master' into apc_modbus_updates
jimklimov Jan 19, 2024
384d77f
Merge branch 'master' into apc_modbus_updates
jimklimov Jan 21, 2024
c1a755d
Merge branch 'master' into apc_modbus_updates
jimklimov Jan 31, 2024
aba14dc
Merge branch 'master' into apc_modbus_updates
jimklimov Feb 12, 2024
3f818c5
Merge branch 'master' into apc_modbus_updates
jimklimov Feb 17, 2024
fda7f3e
Merge branch 'master' into apc_modbus_updates
jimklimov Feb 27, 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
10 changes: 9 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ AC_CHECK_FUNCS(strtok_r fileno sigemptyset sigaction,
dnl For these we have a fallback implementation via the other,
dnl if at least one is available, so initial check is quiet.
dnl This typically pops up in POSIX vs. Windows builds:
AC_CHECK_FUNCS(localtime_r localtime_s gmtime_r gmtime_s,
AC_CHECK_FUNCS(localtime_r localtime_s gmtime_r gmtime_s timegm _mkgmtime,
[], [])

AC_MSG_CHECKING([for at least one gmtime implementation])
Expand All @@ -838,6 +838,14 @@ AS_IF([test x"${ac_cv_func_localtime_s}-${ac_cv_func_localtime_r}" = "xno-no"],
AC_MSG_RESULT([yes])
])

AC_MSG_CHECKING([for at least one timegm implementation])
AS_IF([test x"${ac_cv_func_timegm}-${ac_cv_func__mkgmtime}" = "xno-no"], [
AC_MSG_RESULT([no])
AC_MSG_WARN([Required C library routine timegm nor _mkgmtime was not found])
],[
AC_MSG_RESULT([yes])
])

AC_LANG_PUSH([C])

AC_CHECK_HEADER([string.h],
Expand Down
3 changes: 2 additions & 1 deletion drivers/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ nutdrv_qx_SOURCES += $(NUTDRV_QX_SUBDRIVERS)
# tracking (which is automatic), but to ensure these files are
# distributed by "make dist".

dist_noinst_HEADERS = apc-mib.h apc-iem-mib.h apc-hid.h arduino-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h \
dist_noinst_HEADERS = \
apc_modbus.h apc-mib.h apc-iem-mib.h apc-hid.h arduino-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h \
bcmxcp_io.h belkin.h belkin-hid.h bestpower-mib.h blazer.h cps-hid.h dstate.h \
dummy-ups.h explore-hid.h gamatronic.h genericups.h \
generic_gpio_common.h generic_gpio_libgpiod.h \
Expand Down
Loading