Skip to content

Commit

Permalink
Merge pull request #2184 from EchterAgo/apc_modbus_updates
Browse files Browse the repository at this point in the history
apc_modbus: Updates, command, writable variables and outlet group support
  • Loading branch information
jimklimov authored Mar 2, 2024
2 parents d074d16 + fda7f3e commit 39b8b56
Show file tree
Hide file tree
Showing 6 changed files with 694 additions and 83 deletions.
10 changes: 9 additions & 1 deletion configure.ac
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
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

0 comments on commit 39b8b56

Please sign in to comment.