Merge pull request #5 from lategoodbye/master
Better multi-telegram support
This commit is contained in:
commit
93ca82781c
@ -15,7 +15,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src
|
|||||||
noinst_HEADERS =
|
noinst_HEADERS =
|
||||||
bin_PROGRAMS = mbus-tcp-scan mbus-tcp-request-data mbus-tcp-request-data-multi-reply \
|
bin_PROGRAMS = mbus-tcp-scan mbus-tcp-request-data mbus-tcp-request-data-multi-reply \
|
||||||
mbus-tcp-select-secondary mbus-tcp-scan-secondary \
|
mbus-tcp-select-secondary mbus-tcp-scan-secondary \
|
||||||
mbus-serial-scan mbus-serial-request-data \
|
mbus-serial-scan mbus-serial-request-data mbus-serial-request-data-multi-reply \
|
||||||
mbus-serial-select-secondary mbus-serial-scan-secondary \
|
mbus-serial-select-secondary mbus-serial-scan-secondary \
|
||||||
mbus-serial-switch-baudrate
|
mbus-serial-switch-baudrate
|
||||||
|
|
||||||
@ -49,6 +49,10 @@ mbus_serial_request_data_LDFLAGS = -L$(top_builddir)/mbus
|
|||||||
mbus_serial_request_data_LDADD = -lmbus
|
mbus_serial_request_data_LDADD = -lmbus
|
||||||
mbus_serial_request_data_SOURCES = mbus-serial-request-data.c
|
mbus_serial_request_data_SOURCES = mbus-serial-request-data.c
|
||||||
|
|
||||||
|
mbus_serial_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
|
mbus_serial_request_data_multi_reply_LDADD = -lmbus
|
||||||
|
mbus_serial_request_data_multi_reply_SOURCES = mbus-serial-request-data-multi-reply.c
|
||||||
|
|
||||||
mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
mbus_serial_select_secondary_LDADD = -lmbus
|
mbus_serial_select_secondary_LDADD = -lmbus
|
||||||
mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c
|
mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c
|
||||||
|
@ -40,8 +40,10 @@ bin_PROGRAMS = mbus-tcp-scan$(EXEEXT) mbus-tcp-request-data$(EXEEXT) \
|
|||||||
mbus-tcp-select-secondary$(EXEEXT) \
|
mbus-tcp-select-secondary$(EXEEXT) \
|
||||||
mbus-tcp-scan-secondary$(EXEEXT) mbus-serial-scan$(EXEEXT) \
|
mbus-tcp-scan-secondary$(EXEEXT) mbus-serial-scan$(EXEEXT) \
|
||||||
mbus-serial-request-data$(EXEEXT) \
|
mbus-serial-request-data$(EXEEXT) \
|
||||||
|
mbus-serial-request-data-multi-reply$(EXEEXT) \
|
||||||
mbus-serial-select-secondary$(EXEEXT) \
|
mbus-serial-select-secondary$(EXEEXT) \
|
||||||
mbus-serial-scan-secondary$(EXEEXT)
|
mbus-serial-scan-secondary$(EXEEXT) \
|
||||||
|
mbus-serial-switch-baudrate$(EXEEXT)
|
||||||
subdir = bin
|
subdir = bin
|
||||||
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
|
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
|
||||||
$(srcdir)/Makefile.in
|
$(srcdir)/Makefile.in
|
||||||
@ -66,6 +68,16 @@ mbus_serial_request_data_DEPENDENCIES =
|
|||||||
mbus_serial_request_data_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
mbus_serial_request_data_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||||
$(mbus_serial_request_data_LDFLAGS) $(LDFLAGS) -o $@
|
$(mbus_serial_request_data_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
am_mbus_serial_request_data_multi_reply_OBJECTS = \
|
||||||
|
mbus-serial-request-data-multi-reply.$(OBJEXT)
|
||||||
|
mbus_serial_request_data_multi_reply_OBJECTS = \
|
||||||
|
$(am_mbus_serial_request_data_multi_reply_OBJECTS)
|
||||||
|
mbus_serial_request_data_multi_reply_DEPENDENCIES =
|
||||||
|
mbus_serial_request_data_multi_reply_LINK = $(LIBTOOL) --tag=CC \
|
||||||
|
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||||
|
$(AM_CFLAGS) $(CFLAGS) \
|
||||||
|
$(mbus_serial_request_data_multi_reply_LDFLAGS) $(LDFLAGS) -o \
|
||||||
|
$@
|
||||||
am_mbus_serial_scan_OBJECTS = mbus-serial-scan.$(OBJEXT)
|
am_mbus_serial_scan_OBJECTS = mbus-serial-scan.$(OBJEXT)
|
||||||
mbus_serial_scan_OBJECTS = $(am_mbus_serial_scan_OBJECTS)
|
mbus_serial_scan_OBJECTS = $(am_mbus_serial_scan_OBJECTS)
|
||||||
mbus_serial_scan_DEPENDENCIES =
|
mbus_serial_scan_DEPENDENCIES =
|
||||||
@ -90,6 +102,15 @@ mbus_serial_select_secondary_LINK = $(LIBTOOL) --tag=CC \
|
|||||||
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||||
$(AM_CFLAGS) $(CFLAGS) $(mbus_serial_select_secondary_LDFLAGS) \
|
$(AM_CFLAGS) $(CFLAGS) $(mbus_serial_select_secondary_LDFLAGS) \
|
||||||
$(LDFLAGS) -o $@
|
$(LDFLAGS) -o $@
|
||||||
|
am_mbus_serial_switch_baudrate_OBJECTS = \
|
||||||
|
mbus-serial-switch-baudrate.$(OBJEXT)
|
||||||
|
mbus_serial_switch_baudrate_OBJECTS = \
|
||||||
|
$(am_mbus_serial_switch_baudrate_OBJECTS)
|
||||||
|
mbus_serial_switch_baudrate_DEPENDENCIES =
|
||||||
|
mbus_serial_switch_baudrate_LINK = $(LIBTOOL) --tag=CC \
|
||||||
|
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||||
|
$(AM_CFLAGS) $(CFLAGS) $(mbus_serial_switch_baudrate_LDFLAGS) \
|
||||||
|
$(LDFLAGS) -o $@
|
||||||
am_mbus_tcp_request_data_OBJECTS = mbus-tcp-request-data.$(OBJEXT)
|
am_mbus_tcp_request_data_OBJECTS = mbus-tcp-request-data.$(OBJEXT)
|
||||||
mbus_tcp_request_data_OBJECTS = $(am_mbus_tcp_request_data_OBJECTS)
|
mbus_tcp_request_data_OBJECTS = $(am_mbus_tcp_request_data_OBJECTS)
|
||||||
mbus_tcp_request_data_DEPENDENCIES =
|
mbus_tcp_request_data_DEPENDENCIES =
|
||||||
@ -142,17 +163,21 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|||||||
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||||
$(LDFLAGS) -o $@
|
$(LDFLAGS) -o $@
|
||||||
SOURCES = $(mbus_serial_request_data_SOURCES) \
|
SOURCES = $(mbus_serial_request_data_SOURCES) \
|
||||||
|
$(mbus_serial_request_data_multi_reply_SOURCES) \
|
||||||
$(mbus_serial_scan_SOURCES) \
|
$(mbus_serial_scan_SOURCES) \
|
||||||
$(mbus_serial_scan_secondary_SOURCES) \
|
$(mbus_serial_scan_secondary_SOURCES) \
|
||||||
$(mbus_serial_select_secondary_SOURCES) \
|
$(mbus_serial_select_secondary_SOURCES) \
|
||||||
|
$(mbus_serial_switch_baudrate_SOURCES) \
|
||||||
$(mbus_tcp_request_data_SOURCES) \
|
$(mbus_tcp_request_data_SOURCES) \
|
||||||
$(mbus_tcp_request_data_multi_reply_SOURCES) \
|
$(mbus_tcp_request_data_multi_reply_SOURCES) \
|
||||||
$(mbus_tcp_scan_SOURCES) $(mbus_tcp_scan_secondary_SOURCES) \
|
$(mbus_tcp_scan_SOURCES) $(mbus_tcp_scan_secondary_SOURCES) \
|
||||||
$(mbus_tcp_select_secondary_SOURCES)
|
$(mbus_tcp_select_secondary_SOURCES)
|
||||||
DIST_SOURCES = $(mbus_serial_request_data_SOURCES) \
|
DIST_SOURCES = $(mbus_serial_request_data_SOURCES) \
|
||||||
|
$(mbus_serial_request_data_multi_reply_SOURCES) \
|
||||||
$(mbus_serial_scan_SOURCES) \
|
$(mbus_serial_scan_SOURCES) \
|
||||||
$(mbus_serial_scan_secondary_SOURCES) \
|
$(mbus_serial_scan_secondary_SOURCES) \
|
||||||
$(mbus_serial_select_secondary_SOURCES) \
|
$(mbus_serial_select_secondary_SOURCES) \
|
||||||
|
$(mbus_serial_switch_baudrate_SOURCES) \
|
||||||
$(mbus_tcp_request_data_SOURCES) \
|
$(mbus_tcp_request_data_SOURCES) \
|
||||||
$(mbus_tcp_request_data_multi_reply_SOURCES) \
|
$(mbus_tcp_request_data_multi_reply_SOURCES) \
|
||||||
$(mbus_tcp_scan_SOURCES) $(mbus_tcp_scan_secondary_SOURCES) \
|
$(mbus_tcp_scan_SOURCES) $(mbus_tcp_scan_secondary_SOURCES) \
|
||||||
@ -311,12 +336,18 @@ mbus_serial_scan_SOURCES = mbus-serial-scan.c
|
|||||||
mbus_serial_request_data_LDFLAGS = -L$(top_builddir)/mbus
|
mbus_serial_request_data_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
mbus_serial_request_data_LDADD = -lmbus
|
mbus_serial_request_data_LDADD = -lmbus
|
||||||
mbus_serial_request_data_SOURCES = mbus-serial-request-data.c
|
mbus_serial_request_data_SOURCES = mbus-serial-request-data.c
|
||||||
|
mbus_serial_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
|
mbus_serial_request_data_multi_reply_LDADD = -lmbus
|
||||||
|
mbus_serial_request_data_multi_reply_SOURCES = mbus-serial-request-data-multi-reply.c
|
||||||
mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
mbus_serial_select_secondary_LDADD = -lmbus
|
mbus_serial_select_secondary_LDADD = -lmbus
|
||||||
mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c
|
mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c
|
||||||
mbus_serial_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
mbus_serial_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
mbus_serial_scan_secondary_LDADD = -lmbus
|
mbus_serial_scan_secondary_LDADD = -lmbus
|
||||||
mbus_serial_scan_secondary_SOURCES = mbus-serial-scan-secondary.c
|
mbus_serial_scan_secondary_SOURCES = mbus-serial-scan-secondary.c
|
||||||
|
mbus_serial_switch_baudrate_LDFLAGS = -L$(top_builddir)/mbus
|
||||||
|
mbus_serial_switch_baudrate_LDADD = -lmbus
|
||||||
|
mbus_serial_switch_baudrate_SOURCES = mbus-serial-switch-baudrate.c
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@ -397,6 +428,9 @@ clean-binPROGRAMS:
|
|||||||
mbus-serial-request-data$(EXEEXT): $(mbus_serial_request_data_OBJECTS) $(mbus_serial_request_data_DEPENDENCIES)
|
mbus-serial-request-data$(EXEEXT): $(mbus_serial_request_data_OBJECTS) $(mbus_serial_request_data_DEPENDENCIES)
|
||||||
@rm -f mbus-serial-request-data$(EXEEXT)
|
@rm -f mbus-serial-request-data$(EXEEXT)
|
||||||
$(mbus_serial_request_data_LINK) $(mbus_serial_request_data_OBJECTS) $(mbus_serial_request_data_LDADD) $(LIBS)
|
$(mbus_serial_request_data_LINK) $(mbus_serial_request_data_OBJECTS) $(mbus_serial_request_data_LDADD) $(LIBS)
|
||||||
|
mbus-serial-request-data-multi-reply$(EXEEXT): $(mbus_serial_request_data_multi_reply_OBJECTS) $(mbus_serial_request_data_multi_reply_DEPENDENCIES)
|
||||||
|
@rm -f mbus-serial-request-data-multi-reply$(EXEEXT)
|
||||||
|
$(mbus_serial_request_data_multi_reply_LINK) $(mbus_serial_request_data_multi_reply_OBJECTS) $(mbus_serial_request_data_multi_reply_LDADD) $(LIBS)
|
||||||
mbus-serial-scan$(EXEEXT): $(mbus_serial_scan_OBJECTS) $(mbus_serial_scan_DEPENDENCIES)
|
mbus-serial-scan$(EXEEXT): $(mbus_serial_scan_OBJECTS) $(mbus_serial_scan_DEPENDENCIES)
|
||||||
@rm -f mbus-serial-scan$(EXEEXT)
|
@rm -f mbus-serial-scan$(EXEEXT)
|
||||||
$(mbus_serial_scan_LINK) $(mbus_serial_scan_OBJECTS) $(mbus_serial_scan_LDADD) $(LIBS)
|
$(mbus_serial_scan_LINK) $(mbus_serial_scan_OBJECTS) $(mbus_serial_scan_LDADD) $(LIBS)
|
||||||
@ -406,6 +440,9 @@ mbus-serial-scan-secondary$(EXEEXT): $(mbus_serial_scan_secondary_OBJECTS) $(mbu
|
|||||||
mbus-serial-select-secondary$(EXEEXT): $(mbus_serial_select_secondary_OBJECTS) $(mbus_serial_select_secondary_DEPENDENCIES)
|
mbus-serial-select-secondary$(EXEEXT): $(mbus_serial_select_secondary_OBJECTS) $(mbus_serial_select_secondary_DEPENDENCIES)
|
||||||
@rm -f mbus-serial-select-secondary$(EXEEXT)
|
@rm -f mbus-serial-select-secondary$(EXEEXT)
|
||||||
$(mbus_serial_select_secondary_LINK) $(mbus_serial_select_secondary_OBJECTS) $(mbus_serial_select_secondary_LDADD) $(LIBS)
|
$(mbus_serial_select_secondary_LINK) $(mbus_serial_select_secondary_OBJECTS) $(mbus_serial_select_secondary_LDADD) $(LIBS)
|
||||||
|
mbus-serial-switch-baudrate$(EXEEXT): $(mbus_serial_switch_baudrate_OBJECTS) $(mbus_serial_switch_baudrate_DEPENDENCIES)
|
||||||
|
@rm -f mbus-serial-switch-baudrate$(EXEEXT)
|
||||||
|
$(mbus_serial_switch_baudrate_LINK) $(mbus_serial_switch_baudrate_OBJECTS) $(mbus_serial_switch_baudrate_LDADD) $(LIBS)
|
||||||
mbus-tcp-request-data$(EXEEXT): $(mbus_tcp_request_data_OBJECTS) $(mbus_tcp_request_data_DEPENDENCIES)
|
mbus-tcp-request-data$(EXEEXT): $(mbus_tcp_request_data_OBJECTS) $(mbus_tcp_request_data_DEPENDENCIES)
|
||||||
@rm -f mbus-tcp-request-data$(EXEEXT)
|
@rm -f mbus-tcp-request-data$(EXEEXT)
|
||||||
$(mbus_tcp_request_data_LINK) $(mbus_tcp_request_data_OBJECTS) $(mbus_tcp_request_data_LDADD) $(LIBS)
|
$(mbus_tcp_request_data_LINK) $(mbus_tcp_request_data_OBJECTS) $(mbus_tcp_request_data_LDADD) $(LIBS)
|
||||||
@ -428,10 +465,12 @@ mostlyclean-compile:
|
|||||||
distclean-compile:
|
distclean-compile:
|
||||||
-rm -f *.tab.c
|
-rm -f *.tab.c
|
||||||
|
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-request-data-multi-reply.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-request-data.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-request-data.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-scan-secondary.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-scan-secondary.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-scan.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-scan.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-select-secondary.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-select-secondary.Po@am__quote@
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-serial-switch-baudrate.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-request-data-multi-reply.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-request-data-multi-reply.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-request-data.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-request-data.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-scan-secondary.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbus-tcp-scan-secondary.Po@am__quote@
|
||||||
|
142
bin/mbus-serial-request-data-multi-reply.c
Normal file
142
bin/mbus-serial-request-data-multi-reply.c
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// Copyright (C) 2011, Robert Johansson, Raditex AB
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// rSCADA
|
||||||
|
// http://www.rSCADA.se
|
||||||
|
// info@rscada.se
|
||||||
|
//
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <mbus/mbus.h>
|
||||||
|
|
||||||
|
static int debug = 0;
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// Scan for devices using secondary addressing.
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
int
|
||||||
|
main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
mbus_frame reply;
|
||||||
|
mbus_frame_data reply_data;
|
||||||
|
mbus_handle *handle = NULL;
|
||||||
|
|
||||||
|
char *device, *addr_str, matching_addr[16];
|
||||||
|
int address, baudrate = 9600;
|
||||||
|
|
||||||
|
memset((void *)&reply, 0, sizeof(mbus_frame));
|
||||||
|
memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
|
||||||
|
|
||||||
|
if (argc == 3)
|
||||||
|
{
|
||||||
|
device = argv[1];
|
||||||
|
addr_str = argv[2];
|
||||||
|
}
|
||||||
|
else if (argc == 4 && strcmp(argv[1], "-d") == 0)
|
||||||
|
{
|
||||||
|
device = argv[2];
|
||||||
|
addr_str = argv[3];
|
||||||
|
debug = 1;
|
||||||
|
}
|
||||||
|
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
|
||||||
|
{
|
||||||
|
baudrate = atoi(argv[2]);
|
||||||
|
device = argv[3];
|
||||||
|
addr_str = argv[4];
|
||||||
|
}
|
||||||
|
else if (argc == 6 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
|
||||||
|
{
|
||||||
|
baudrate = atoi(argv[3]);
|
||||||
|
device = argv[4];
|
||||||
|
addr_str = argv[5];
|
||||||
|
debug = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr, "usage: %s [-d] [-b BAUDRATE] device mbus-address\n", argv[0]);
|
||||||
|
fprintf(stderr, " optional flag -d for debug printout\n");
|
||||||
|
fprintf(stderr, " optional flag -b for selecting baudrate\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((handle = mbus_connect_serial(device)) == NULL)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Failed to setup connection to M-bus gateway\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mbus_serial_set_baudrate(handle->m_serial_handle, baudrate) == -1)
|
||||||
|
{
|
||||||
|
printf("Failed to set baud rate.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (strlen(addr_str) == 16)
|
||||||
|
{
|
||||||
|
// secondary addressing
|
||||||
|
|
||||||
|
int probe_ret;
|
||||||
|
|
||||||
|
probe_ret = mbus_probe_secondary_address(handle, addr_str, matching_addr);
|
||||||
|
|
||||||
|
if (probe_ret == MBUS_PROBE_COLLISION)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: Error: The address mask [%s] matches more than one device.\n", __PRETTY_FUNCTION__, addr_str);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
else if (probe_ret == MBUS_PROBE_NOTHING)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: Error: The selected secondary address does not match any device [%s].\n", __PRETTY_FUNCTION__, addr_str);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
else if (probe_ret == MBUS_PROBE_ERROR)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: Error: Failed to probe secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
// else MBUS_PROBE_SINGLE
|
||||||
|
|
||||||
|
address = 253;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// primary addressing
|
||||||
|
address = atoi(addr_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
// instead of the send and recv, use this sendrecv function that
|
||||||
|
// takes care of the possibility of multi-telegram replies
|
||||||
|
if (mbus_sendrecv_request(handle, address, &reply, -1) == -1)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Failed to send/receive M-Bus request.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// dump hex data if debug is true
|
||||||
|
//
|
||||||
|
if (debug)
|
||||||
|
{
|
||||||
|
mbus_frame_print(&reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// generate XML and print to standard output
|
||||||
|
//
|
||||||
|
printf("%s", mbus_frame_xml(&reply));
|
||||||
|
|
||||||
|
mbus_disconnect(handle);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1369,9 +1369,44 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
frame->control = MBUS_CONTROL_MASK_REQ_UD2 | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCV;
|
//
|
||||||
|
// init slave to get really the beginning of the records
|
||||||
|
//
|
||||||
|
|
||||||
|
frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
|
||||||
frame->address = address;
|
frame->address = address;
|
||||||
|
|
||||||
|
if (debug)
|
||||||
|
printf("%s: debug: sending init frame\n", __PRETTY_FUNCTION__);
|
||||||
|
|
||||||
|
if (mbus_send_frame(handle, frame) == -1)
|
||||||
|
{
|
||||||
|
MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
|
||||||
|
mbus_frame_free(frame);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mbus_recv_frame(handle, reply) == -1)
|
||||||
|
{
|
||||||
|
MBUS_ERROR("%s: Failed to receive M-Bus response frame.\n", __PRETTY_FUNCTION__);
|
||||||
|
mbus_frame_free(frame);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mbus_frame_type(reply) != MBUS_FRAME_TYPE_ACK)
|
||||||
|
{
|
||||||
|
MBUS_ERROR("%s: Unknown reply.\n", __PRETTY_FUNCTION__);
|
||||||
|
mbus_frame_free(frame);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
frame->control = MBUS_CONTROL_MASK_REQ_UD2 |
|
||||||
|
MBUS_CONTROL_MASK_DIR_M2S |
|
||||||
|
MBUS_CONTROL_MASK_FCV |
|
||||||
|
MBUS_CONTROL_MASK_FCB;
|
||||||
|
|
||||||
|
frame->address = address;
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
printf("%s: debug: sending request frame\n", __PRETTY_FUNCTION__);
|
printf("%s: debug: sending request frame\n", __PRETTY_FUNCTION__);
|
||||||
|
|
||||||
@ -1379,7 +1414,7 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
|
|||||||
{
|
{
|
||||||
MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
|
MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
|
||||||
mbus_frame_free(frame);
|
mbus_frame_free(frame);
|
||||||
retval = -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
74
xsl/html.xsl
Normal file
74
xsl/html.xsl
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<xsl:stylesheet version="1.0"
|
||||||
|
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
|
||||||
|
|
||||||
|
<!-- Sample XSL to convert XML in HTML -->
|
||||||
|
|
||||||
|
<xsl:template match ="/" >
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title> MBus Data </title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<xsl:apply-templates />
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<xsl:template match="MBusData" >
|
||||||
|
|
||||||
|
<xsl:apply-templates select="SlaveInformation"/>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<table border="1" cellspacing="0" cellpadding="5">
|
||||||
|
<tr bgcolor = "#e0e0e0" >
|
||||||
|
<td>Unit</td>
|
||||||
|
<td>Value</td>
|
||||||
|
<td>Function</td>
|
||||||
|
</tr>
|
||||||
|
<xsl:for-each select="DataRecord" >
|
||||||
|
<tr>
|
||||||
|
<td><xsl:value-of select="Unit" /></td>
|
||||||
|
<td><xsl:value-of select="Value" /></td>
|
||||||
|
<td><xsl:value-of select="Function" /></td>
|
||||||
|
</tr>
|
||||||
|
</xsl:for-each>
|
||||||
|
</table>
|
||||||
|
</xsl:template >
|
||||||
|
|
||||||
|
<xsl:template match="SlaveInformation" >
|
||||||
|
<table border="1" cellspacing="0" cellpadding="5">
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Id</td>
|
||||||
|
<td><xsl:value-of select="Id" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Manufacturer</td>
|
||||||
|
<td><xsl:value-of select="Manufacturer" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Version</td>
|
||||||
|
<td><xsl:value-of select="Version" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Medium</td>
|
||||||
|
<td><xsl:value-of select="Medium" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >AccessNumber</td>
|
||||||
|
<td><xsl:value-of select="AccessNumber" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Status</td>
|
||||||
|
<td><xsl:value-of select="Status" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor = "#e0e0e0" >Signature</td>
|
||||||
|
<td><xsl:value-of select="Signature" /></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</xsl:template >
|
||||||
|
|
||||||
|
|
||||||
|
</xsl:stylesheet >
|
Loading…
x
Reference in New Issue
Block a user