nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup after merge of pull request #18.

Browse Source
This commit is contained in:
Roland Jax
2014-12-07 12:20:47 +01:00
parent 3b3a5f2e07
commit a5821dcadc
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -5
View File
@@ -16,14 +16,10 @@ Makefile.in
/src/tools/ebusfeed /src/tools/ebusfeed
/src/lib/utils/libutils.a /src/lib/utils/libutils.a
/src/lib/ebus/libebus.a /src/lib/ebus/libebus.a
/src/lib/ebus/test/test_bus
/src/lib/ebus/test/test_port /src/lib/ebus/test/test_port
/src/lib/ebus/test/test_configfile
/src/lib/ebus/test/test_commands
/src/lib/ebus/test/test_decode
/src/lib/ebus/test/test_encode
/src/lib/ebus/test/test_symbol /src/lib/ebus/test/test_symbol
/src/lib/ebus/test/test_data /src/lib/ebus/test/test_data
/src/lib/ebus/test/test_message
/docs/Doxyfile /docs/Doxyfile
/docs/doxyfile.stamp /docs/doxyfile.stamp
/docs/html /docs/html
src/ebusd/Makefile.am
+2 -1
View File
@@ -16,7 +16,8 @@ ebusd_SOURCES = bushandler.cpp \
ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \ ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \
$(top_srcdir)/src/lib/ebus/libebus.a \ $(top_srcdir)/src/lib/ebus/libebus.a \
-lpthread -lrt -lpthread
-lrt
distclean-local: distclean-local:
-rm -f Makefile.in -rm -f Makefile.in
src/tools/ebusfeed.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
} }
string dev(A.getOptVal<const char*>("device")); string dev(A.getOptVal<const char*>("device"));
Port port(dev, true); Port port(dev, true, false, NULL, false, "", 1);
port.open(); port.open();
if(port.isOpen() == true) { if(port.isOpen() == true) {