tools: feed renamed to ebusd_feed.

This commit is contained in:
Roland Jax
2014-06-02 14:53:22 +02:00
parent f77e6d215c
commit 9e6ba69f70
4 changed files with 8 additions and 10 deletions
+1 -1
View File
@@ -12,4 +12,4 @@
.deps/
*.o
*.dirstamp
/feed
/ebusd_feed
+4 -6
View File
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CXXFLAGS = $(LIBEBUS_CFLAGS) -I$(top_srcdir)/utils -fpic -Wall -Wextra
bin_PROGRAMS = ebusd
bin_PROGRAMS = ebusd ebusd_feed
ebusd_SOURCES = src/main.cpp \
src/baseloop.cpp \
@@ -22,9 +22,7 @@ ebusd_LDADD = $(LIBEBUS_LIBS) \
dist_noinst_SCRIPTS = autogen.sh
noinst_PROGRAMS = feed
ebusd_feed_SOURCES = tools/ebusd_feed.cpp \
utils/appl.cpp
feed_SOURCES = tools/feed.cpp \
utils/appl.cpp
feed_LDADD = $(LIBEBUS_LIBS)
ebusd_feed_LDADD = $(LIBEBUS_LIBS)
Binary file not shown.
+3 -3
View File
@@ -33,11 +33,11 @@ Appl& A = Appl::Instance();
void define_args()
{
A.addItem("p_device", Appl::Param("/dev/ttyUSB60"), "d", "device",
"dummy serial device (default: /dev/ttyUSB60)\n\t\t(socat -d -d pty,raw,echo=0 pty,raw,echo=0)",
"dummy serial device (default: /dev/ttyUSB60)\n\t\t(hint: socat -d -d pty,raw,echo=0 pty,raw,echo=0)",
Appl::type_string, Appl::opt_mandatory);
A.addItem("p_file", Appl::Param("test/ebus_dump.bin"), "f", "file",
"dump file with raw data (default: test/ebus_dump.bin)",
A.addItem("p_file", Appl::Param(""), "f", "file",
"dump file with raw data",
Appl::type_string, Appl::opt_mandatory);
A.addItem("p_time", Appl::Param(10000), "t", "time",