wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source 
Conflicts:
	mbus/mbus-serial.c
This commit is contained in:
Stefan Wahren
2012-05-14 00:09:05 +02:00
parent 8f48d75fb0 7d482e47f7
commit 5a7e69f90d
12 changed files with 166 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
autom4te.cache/requests
View File

@ -1,4 +1,4 @@
# This file was generated by Autom4te Sun May 1 09:53:53 UTC 2011. # This file was generated.
# It contains the lists of macros which have been traced. # It contains the lists of macros which have been traced.
# It can be safely removed. # It can be safely removed.
@ -14,55 +14,55 @@
'configure.ac' 'configure.ac'
], ],
{ {
'AM_PROG_F77_C_O' => 1,
'_LT_AC_TAGCONFIG' => 1, '_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1, 'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1, 'AC_INIT' => 1,
'_AM_COND_IF' => 1, 'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1, 'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1, '_AM_COND_IF' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1, 'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1, 'AC_CANONICAL_HOST' => 1,
'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1, 'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1, 'AM_INIT_AUTOMAKE' => 1,
'AM_PATH_GUILE' => 1,
'AC_CONFIG_SUBDIRS' => 1, 'AC_CONFIG_SUBDIRS' => 1,
'AM_PATH_GUILE' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1, 'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1, 'AC_CONFIG_LINKS' => 1,
'LT_SUPPORTED_TAG' => 1, 'AC_REQUIRE_AUX_FILE' => 1,
'm4_sinclude' => 1, 'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1, 'AM_MAINTAINER_MODE' => 1,
'AM_NLS' => 1, 'AM_NLS' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'_m4_warn' => 1, '_m4_warn' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AM_PROG_CXX_C_O' => 1, 'AM_PROG_CXX_C_O' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'_AM_COND_ENDIF' => 1, '_AM_COND_ENDIF' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'AM_ENABLE_MULTILIB' => 1, 'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_MOC' => 1, 'AM_PROG_MOC' => 1,
'AM_SILENT_RULES' => 1, 'AM_SILENT_RULES' => 1,
'AC_CONFIG_FILES' => 1, 'AC_CONFIG_FILES' => 1,
'LT_INIT' => 1,
'include' => 1, 'include' => 1,
'AM_PROG_AR' => 1, 'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1, 'AM_GNU_GETTEXT' => 1,
'AM_PROG_AR' => 1,
'AC_LIBSOURCE' => 1, 'AC_LIBSOURCE' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_BUILD' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_FC_FREEFORM' => 1, 'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1, 'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1, 'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1, '_AM_SUBST_NOTMAKE' => 1,
'sinclude' => 1,
'AM_PROG_CC_C_O' => 1, 'AM_PROG_CC_C_O' => 1,
'AM_XGETTEXT_OPTION' => 1, 'sinclude' => 1,
'AC_CANONICAL_SYSTEM' => 1, 'm4_pattern_allow' => 1,
'AM_CONDITIONAL' => 1, 'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_CONFIG_HEADERS' => 1, 'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_POT_TOOLS' => 1, 'AM_POT_TOOLS' => 1,
@ -123,8 +123,8 @@
'_m4_warn' => 1, '_m4_warn' => 1,
'AC_LIBTOOL_OBJDIR' => 1, 'AC_LIBTOOL_OBJDIR' => 1,
'gl_FUNC_ARGZ' => 1, 'gl_FUNC_ARGZ' => 1,
'LTOBSOLETE_VERSION' => 1,
'AM_SANITY_CHECK' => 1, 'AM_SANITY_CHECK' => 1,
'LTOBSOLETE_VERSION' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'LT_LIB_M' => 1, 'LT_LIB_M' => 1,
@ -138,19 +138,19 @@
'_LT_WITH_SYSROOT' => 1, '_LT_WITH_SYSROOT' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_SYS_DLOPEN_DEPLIBS' => 1,
'LT_FUNC_DLSYM_USCORE' => 1, 'LT_FUNC_DLSYM_USCORE' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'_LT_AC_LANG_F77' => 1, '_LT_AC_LANG_F77' => 1,
'_AM_SUBST_NOTMAKE' => 1, 'AC_LIBTOOL_CONFIG' => 1,
'AC_LTDL_DLLIB' => 1, 'AC_LTDL_DLLIB' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_AUTOCONF_VERSION' => 1, '_AM_AUTOCONF_VERSION' => 1,
'AM_DISABLE_SHARED' => 1, 'AM_DISABLE_SHARED' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1,
'_LTDL_SETUP' => 1, '_LTDL_SETUP' => 1,
'AM_PROG_LIBTOOL' => 1,
'_LT_AC_LANG_CXX' => 1, '_LT_AC_LANG_CXX' => 1,
'AC_LIB_LTDL' => 1, 'AM_PROG_LIBTOOL' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_PROG_LD' => 1, 'AM_PROG_LD' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AC_LIB_LTDL' => 1,
'AU_DEFUN' => 1, 'AU_DEFUN' => 1,
'AC_PROG_NM' => 1, 'AC_PROG_NM' => 1,
'AC_LIBTOOL_DLOPEN' => 1, 'AC_LIBTOOL_DLOPEN' => 1,
@ -175,33 +175,33 @@
'AC_LTDL_OBJDIR' => 1, 'AC_LTDL_OBJDIR' => 1,
'_LT_PATH_TOOL_PREFIX' => 1, '_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_RC' => 1, 'AC_LIBTOOL_RC' => 1,
'AM_SILENT_RULES' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1, 'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1, 'AM_SILENT_RULES' => 1,
'include' => 1, 'include' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'LT_AC_PROG_SED' => 1, 'LT_AC_PROG_SED' => 1,
'AM_ENABLE_SHARED' => 1, 'AM_ENABLE_SHARED' => 1,
'LTDL_INSTALLABLE' => 1, 'LTDL_INSTALLABLE' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1, '_LT_AC_LANG_GCJ_CONFIG' => 1,
'AC_ENABLE_SHARED' => 1, 'AC_ENABLE_SHARED' => 1,
'AC_ENABLE_STATIC' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_ENABLE_STATIC' => 1,
'_LT_AC_TAGVAR' => 1, '_LT_AC_TAGVAR' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AM_CONDITIONAL' => 1, 'AM_CONDITIONAL' => 1,
'LT_LIB_DLLOAD' => 1, 'LT_LIB_DLLOAD' => 1,
'LTDL_INIT' => 1,
'_LT_PROG_F77' => 1,
'_LT_PROG_CXX' => 1,
'LTVERSION_VERSION' => 1, 'LTVERSION_VERSION' => 1,
'AM_PROG_INSTALL_SH' => 1, '_LT_PROG_CXX' => 1,
'_LT_PROG_F77' => 1,
'LTDL_INIT' => 1,
'm4_include' => 1, 'm4_include' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AC_PROG_EGREP' => 1, 'AC_PROG_EGREP' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_PATH_MAGIC' => 1, 'AC_PATH_MAGIC' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1,
'AM_MAKE_INCLUDE' => 1, 'AM_MAKE_INCLUDE' => 1,
'LT_CMD_MAX_LEN' => 1, 'LT_CMD_MAX_LEN' => 1,
@ -235,11 +235,11 @@
'_AC_PROG_LIBTOOL' => 1, '_AC_PROG_LIBTOOL' => 1,
'_AM_IF_OPTION' => 1, '_AM_IF_OPTION' => 1,
'AC_PATH_TOOL_PREFIX' => 1, 'AC_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_F77' => 1,
'm4_pattern_allow' => 1, 'm4_pattern_allow' => 1,
'AC_LIBTOOL_F77' => 1,
'AM_SET_LEADING_DOT' => 1, 'AM_SET_LEADING_DOT' => 1,
'LT_AC_PROG_EGREP' => 1,
'_LT_PROG_FC' => 1, '_LT_PROG_FC' => 1,
'LT_AC_PROG_EGREP' => 1,
'_AM_DEPENDENCIES' => 1, '_AM_DEPENDENCIES' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'LTOPTIONS_VERSION' => 1, 'LTOPTIONS_VERSION' => 1,
@ -247,11 +247,11 @@
'AM_PROG_NM' => 1, 'AM_PROG_NM' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1, 'AC_LIBLTDL_INSTALLABLE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'LT_PROG_GCJ' => 1, 'LT_PROG_GCJ' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'AM_INIT_AUTOMAKE' => 1, 'AM_INIT_AUTOMAKE' => 1,
'AC_DISABLE_STATIC' => 1, 'AC_DISABLE_STATIC' => 1,
'LT_PATH_NM' => 1, 'LT_PATH_NM' => 1,
@ -259,25 +259,25 @@
'_LT_AC_LOCK' => 1, '_LT_AC_LOCK' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1, '_LT_AC_LANG_RC_CONFIG' => 1,
'LT_SYS_MODULE_PATH' => 1, 'LT_SYS_MODULE_PATH' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'LT_WITH_LTDL' => 1, 'LT_WITH_LTDL' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'AC_LTDL_SHLIBPATH' => 1, 'AC_LTDL_SHLIBPATH' => 1,
'AM_AUX_DIR_EXPAND' => 1, 'AM_AUX_DIR_EXPAND' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_AM_SET_OPTIONS' => 1, '_LT_AC_LANG_F77_CONFIG' => 1,
'_LT_COMPILER_OPTION' => 1, '_LT_COMPILER_OPTION' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_SET_OPTIONS' => 1,
'AM_RUN_LOG' => 1, 'AM_RUN_LOG' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LIBTOOL_PICMODE' => 1, 'AC_LIBTOOL_PICMODE' => 1,
'LT_PATH_LD' => 1, 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
'AC_CHECK_LIBM' => 1, 'AC_CHECK_LIBM' => 1,
'LT_PATH_LD' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_AM_MANGLE_OPTION' => 1, '_AM_MANGLE_OPTION' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'AM_SET_DEPDIR' => 1, 'AM_SET_DEPDIR' => 1,
'_LT_CC_BASENAME' => 1, '_LT_CC_BASENAME' => 1,
'_LT_LIBOBJ' => 1 '_LT_LIBOBJ' => 1
@ -295,55 +295,55 @@
'configure.ac' 'configure.ac'
], ],
{ {
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1, 'AM_PROG_F77_C_O' => 1,
'm4_pattern_forbid' => 1, '_LT_AC_TAGCONFIG' => 1,
'AC_INIT' => 1, 'AC_INIT' => 1,
'_AM_COND_IF' => 1, 'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1, 'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1, '_AM_COND_IF' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1, 'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1, 'AC_CANONICAL_HOST' => 1,
'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1, 'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1, 'AM_INIT_AUTOMAKE' => 1,
'AM_PATH_GUILE' => 1,
'AC_CONFIG_SUBDIRS' => 1, 'AC_CONFIG_SUBDIRS' => 1,
'AM_PATH_GUILE' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1, 'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1, 'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1, 'AC_REQUIRE_AUX_FILE' => 1,
'LT_SUPPORTED_TAG' => 1, 'LT_SUPPORTED_TAG' => 1,
'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1, 'AM_MAINTAINER_MODE' => 1,
'AM_NLS' => 1, 'AM_NLS' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'_m4_warn' => 1, '_m4_warn' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AM_PROG_CXX_C_O' => 1, 'AM_PROG_CXX_C_O' => 1,
'_AM_COND_ENDIF' => 1,
'_AM_MAKEFILE_INCLUDE' => 1, '_AM_MAKEFILE_INCLUDE' => 1,
'_AM_COND_ENDIF' => 1,
'AM_ENABLE_MULTILIB' => 1, 'AM_ENABLE_MULTILIB' => 1,
'AM_SILENT_RULES' => 1, 'AM_SILENT_RULES' => 1,
'AM_PROG_MOC' => 1, 'AM_PROG_MOC' => 1,
'AC_CONFIG_FILES' => 1, 'AC_CONFIG_FILES' => 1,
'LT_INIT' => 1,
'include' => 1, 'include' => 1,
'AM_PROG_AR' => 1, 'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1, 'AM_GNU_GETTEXT' => 1,
'AM_PROG_AR' => 1,
'AC_LIBSOURCE' => 1, 'AC_LIBSOURCE' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_BUILD' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_FC_FREEFORM' => 1, 'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1, 'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1, 'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1, '_AM_SUBST_NOTMAKE' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_pattern_allow' => 1, 'm4_pattern_allow' => 1,
'AM_XGETTEXT_OPTION' => 1, 'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1, 'sinclude' => 1,
'AM_CONDITIONAL' => 1, 'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_CONFIG_HEADERS' => 1, 'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_POT_TOOLS' => 1, 'AM_POT_TOOLS' => 1,

13
bin/mbus-serial-request-data-multi-reply.c
View File

@ -29,7 +29,7 @@ main(int argc, char **argv)
mbus_frame_data reply_data; mbus_frame_data reply_data;
mbus_handle *handle = NULL; mbus_handle *handle = NULL;
char *device, *addr_str, matching_addr[16]; char *device, *addr_str, matching_addr[16], *xml_result;
int address, baudrate = 9600; int address, baudrate = 9600;
memset((void *)&reply, 0, sizeof(mbus_frame)); memset((void *)&reply, 0, sizeof(mbus_frame));
@ -114,8 +114,8 @@ main(int argc, char **argv)
} }
// instead of the send and recv, use this sendrecv function that // instead of the send and recv, use this sendrecv function that
// takes care of the possibility of multi-telegram replies // takes care of the possibility of multi-telegram replies (limit = 16 frames)
if (mbus_sendrecv_request(handle, address, &reply, -1) == -1) if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
{ {
fprintf(stderr, "Failed to send/receive M-Bus request.\n"); fprintf(stderr, "Failed to send/receive M-Bus request.\n");
return 1; return 1;
@ -132,7 +132,12 @@ main(int argc, char **argv)
// //
// generate XML and print to standard output // generate XML and print to standard output
// //
printf("%s", mbus_frame_xml(&reply)); if ((xml_result = mbus_frame_xml(&reply)) == NULL)
{
fprintf(stderr, "Failed to generate XML representation of MBUS frames: %s\n", mbus_error_str());
return 1;
}
printf("%s", xml_result);
mbus_disconnect(handle); mbus_disconnect(handle);
return 0; return 0;

26
bin/mbus-serial-scan.c
View File

@ -25,20 +25,31 @@ main(int argc, char **argv)
{ {
mbus_handle *handle; mbus_handle *handle;
char *device; char *device;
int address, baudrate = 9600; int address, baudrate = 9600, debug = 0;
if (argc == 2) if (argc == 2)
{ {
device = argv[1]; device = argv[1];
} }
else if (argc == 3 && strcmp(argv[1], "-d") == 0)
{
debug = 1;
device = argv[2];
}
else if (argc == 4 && strcmp(argv[1], "-b") == 0) else if (argc == 4 && strcmp(argv[1], "-b") == 0)
{ {
baudrate = atoi(argv[2]); baudrate = atoi(argv[2]);
device = argv[3]; device = argv[3];
} }
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
debug = 1;
baudrate = atoi(argv[3]);
device = argv[4];
}
else else
{ {
fprintf(stderr, "usage: %s [-b BAUDRATE] device\n", argv[0]); fprintf(stderr, "usage: %s [-d] [-b BAUDRATE] device\n", argv[0]);
return 0; return 0;
} }
@ -54,6 +65,8 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (debug)
printf("Scanning primary addresses:\n");
for (address = 0; address < 254; address++) for (address = 0; address < 254; address++)
{ {
@ -61,6 +74,12 @@ main(int argc, char **argv)
memset((void *)&reply, 0, sizeof(mbus_frame)); memset((void *)&reply, 0, sizeof(mbus_frame));
if (debug)
{
printf("%d ", address);
fflush(stdout);
}
if (mbus_send_ping_frame(handle, address) == -1) if (mbus_send_ping_frame(handle, address) == -1)
{ {
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
@ -74,6 +93,9 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{ {
if (debug)
printf("\n");
printf("Found a M-Bus device at address %d\n", address); printf("Found a M-Bus device at address %d\n", address);
} }
} }

9
bin/mbus-tcp-request-data-multi-reply.c
View File

@ -29,7 +29,7 @@ main(int argc, char **argv)
mbus_frame_data reply_data; mbus_frame_data reply_data;
mbus_handle *handle = NULL; mbus_handle *handle = NULL;
char *host, *addr_str, matching_addr[16]; char *host, *addr_str, matching_addr[16], *xml_result;
int port, address; int port, address;
memset((void *)&reply, 0, sizeof(mbus_frame)); memset((void *)&reply, 0, sizeof(mbus_frame));
@ -114,7 +114,12 @@ main(int argc, char **argv)
// //
// generate XML and print to standard output // generate XML and print to standard output
// //
printf("%s", mbus_frame_xml(&reply)); if ((xml_result = mbus_frame_xml(&reply)) == NULL)
{
fprintf(stderr, "Failed to generate XML representation of MBUS frames: %s\n", mbus_error_str());
return 1;
}
printf("%s", xml_result);
mbus_disconnect(handle); mbus_disconnect(handle);
return 0; return 0;

32
bin/mbus-tcp-scan.c
View File

@ -26,16 +26,24 @@ main(int argc, char **argv)
{ {
mbus_handle *handle; mbus_handle *handle;
char *host; char *host;
int port, address; int port, address, debug = 0;
if (argc != 3) if (argc == 3)
{ {
printf("usage: %s host port\n", argv[0]);
return 0;
}
host = argv[1]; host = argv[1];
port = atoi(argv[2]); port = atoi(argv[2]);
}
else if (argc == 4 && strcmp(argv[1], "-d") == 0)
{
debug = 1;
host = argv[2];
port = atoi(argv[3]);
}
else
{
printf("usage: %s [-d] host port\n", argv[0]);
return 0;
}
if ((handle = mbus_connect_tcp(host, port)) == NULL) if ((handle = mbus_connect_tcp(host, port)) == NULL)
{ {
@ -43,10 +51,19 @@ main(int argc, char **argv)
return 1; return 1;
} }
if (debug)
printf("Scanning primary addresses:\n");
for (address = 0; address < 254; address++) for (address = 0; address < 254; address++)
{ {
mbus_frame reply; mbus_frame reply;
if (debug)
{
printf("%d ", address);
fflush(stdout);
}
if (mbus_send_ping_frame(handle, address) == -1) if (mbus_send_ping_frame(handle, address) == -1)
{ {
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
@ -60,6 +77,9 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{ {
if (debug)
printf("\n");
printf("Found a M-Bus device at address %d\n", address); printf("Found a M-Bus device at address %d\n", address);
} }
} }

12
mbus/mbus-protocol-aux.c
View File

@ -24,7 +24,7 @@
#define MBUS_DEBUG(...) #define MBUS_DEBUG(...)
#endif #endif
static int debug = 1; static int debug = 0;
typedef struct _mbus_variable_vif { typedef struct _mbus_variable_vif {
unsigned vif; unsigned vif;
@ -1558,13 +1558,6 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
{ {
frame_count++; frame_count++;
if ((max_frames > 0) &&
(frame_count > max_frames))
{
// only readout max_frames
break;
}
if (debug) if (debug)
printf("%s: debug: receiving response frame #%d\n", __PRETTY_FUNCTION__, frame_count); printf("%s: debug: receiving response frame #%d\n", __PRETTY_FUNCTION__, frame_count);
@ -1601,7 +1594,8 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
{ {
more_frames = 0; more_frames = 0;
if (reply_data.data_var.more_records_follow) if (reply_data.data_var.more_records_follow &&
((max_frames > 0) && (frame_count < max_frames))) // only readout max_frames
{ {
if (debug) if (debug)
printf("%s: debug: expecting more frames\n", __PRETTY_FUNCTION__); printf("%s: debug: expecting more frames\n", __PRETTY_FUNCTION__);

14
mbus/mbus-protocol.c
View File

@ -2768,27 +2768,29 @@ mbus_parse_set_debug(int debug)
int int
mbus_frame_print(mbus_frame *frame) mbus_frame_print(mbus_frame *frame)
{ {
mbus_frame *iter;
u_char data_buff[256]; u_char data_buff[256];
int len, i; int len, i;
if (frame) if (frame == NULL)
return -1;
for (iter = frame; iter; iter = iter->next)
{ {
if ((len = mbus_frame_pack(frame, data_buff, sizeof(data_buff))) == -1) if ((len = mbus_frame_pack(iter, data_buff, sizeof(data_buff))) == -1)
{ {
return -2; return -2;
} }
printf("%s: Dumping M-Bus frame [type %d, %d bytes]: ", __PRETTY_FUNCTION__, frame->type, len); printf("%s: Dumping M-Bus frame [type %d, %d bytes]: ", __PRETTY_FUNCTION__, iter->type, len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
printf("%.2X ", data_buff[i]); printf("%.2X ", data_buff[i]);
} }
printf("\n"); printf("\n");
return 0;
} }
return -1; return 0;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

10
mbus/mbus-serial.c
View File

@ -167,6 +167,16 @@ mbus_serial_send_frame(mbus_serial_handle *handle, mbus_frame *frame)
return -1; return -1;
} }
#ifdef MBUS_SERIAL_DEBUG
// if debug, dump in HEX form to stdout what we write to the serial port
printf("%s: Dumping M-Bus frame [%d bytes]: ", __PRETTY_FUNCTION__, len);
for (i = 0; i < len; i++)
{
printf("%.2X ", buff[i]);
}
printf("\n");
#endif
if ((ret = write(handle->fd, buff, len)) == len) if ((ret = write(handle->fd, buff, len)) == len)
{ {
// //

3
test/mbus_parse_hex.c
View File

@ -89,7 +89,8 @@ main(int argc, char *argv[])
//mbus_frame_print(&reply); //mbus_frame_print(&reply);
//mbus_frame_data_print(&frame_data); //mbus_frame_data_print(&frame_data);
printf("%s", mbus_frame_data_xml(&frame_data)); printf("%s", mbus_frame_data_xml_normalized(&frame_data));
// printf("%s", mbus_frame_data_xml(&frame_data));
return 0; return 0;
} }

1
test/test-frames/frame1.xml
View File

@ -12,6 +12,7 @@
<DataRecord id="0"> <DataRecord id="0">
<Function>Manufacturer specific</Function> <Function>Manufacturer specific</Function>
<Value>5F 42 01 11 FF FF FF FF 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</Value>
</DataRecord> </DataRecord>
</MBusData> </MBusData>

3
test/test-frames/kamstrup_multical_601.xml
View File

@ -4,7 +4,7 @@
<Id>6855817</Id> <Id>6855817</Id>
<Manufacturer>KAM</Manufacturer> <Manufacturer>KAM</Manufacturer>
<Version>8</Version> <Version>8</Version>
<Medium>Heat</Medium> <Medium>Heat: Outlet</Medium>
<AccessNumber>4</AccessNumber> <AccessNumber>4</AccessNumber>
<Status>00</Status> <Status>00</Status>
<Signature>0000</Signature> <Signature>0000</Signature>
@ -174,6 +174,7 @@
<DataRecord id="27"> <DataRecord id="27">
<Function>Manufacturer specific</Function> <Function>Manufacturer specific</Function>
<Value>00 00 00 00 E7 E4 00 00 63 66 00 00 00 00 00 00 00 00 00 00 00 00 00 00 5B C9 A5 02 34 53 00 00 E0 B2 03 00 89 9C 68 00 00 00 00 00 01 00 01 07 07 09 01 03 00 00 00 00 00</Value>
</DataRecord> </DataRecord>
</MBusData> </MBusData>

5
test/test-frames/svm_f22_telegram1.xml
View File

@ -4,7 +4,7 @@
<Id>1006089</Id> <Id>1006089</Id>
<Manufacturer>SVM</Manufacturer> <Manufacturer>SVM</Manufacturer>
<Version>9</Version> <Version>9</Version>
<Medium>Heat (Volume measured at flow temperature: inlet)</Medium> <Medium>Heat: Inlet</Medium>
<AccessNumber>148</AccessNumber> <AccessNumber>148</AccessNumber>
<Status>70</Status> <Status>70</Status>
<Signature>0000</Signature> <Signature>0000</Signature>
@ -89,7 +89,8 @@
</DataRecord> </DataRecord>
<DataRecord id="13"> <DataRecord id="13">
<Function>Manufacturer specific</Function> <Function>More records follow</Function>
<Value></Value>
</DataRecord> </DataRecord>
</MBusData> </MBusData>