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

switched to absolute include dirs, formatting

Browse Source
This commit is contained in:
john30
2017-02-04 19:28:31 +01:00
parent cc21321ad8
commit bbc29bdb2f
48 changed files with 143 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/Makefile.am
+2 -1
View File
@@ -1,4 +1,5 @@
AM_CXXFLAGS = -Wconversion -Wno-unused-parameter \
AM_CXXFLAGS = -I$(top_srcdir)/src \
-Wconversion -Wno-unused-parameter \
-isystem$(top_srcdir)/src/lib/utils \
-isystem$(top_srcdir)/src/lib/ebus \
-DSYSCONFDIR=\"$(sysconfdir)\" \
src/ebusd/bushandler.cpp
+6 -6
View File
@@ -20,7 +20,7 @@
# include <config.h>
#endif
#include "bushandler.h"
#include "ebusd/bushandler.h"
#include <unistd.h>
#include <time.h>
#include <string>
@@ -28,11 +28,11 @@
#include <deque>
#include <cstring>
#include <iomanip>
#include "message.h"
#include "data.h"
#include "result.h"
#include "symbol.h"
#include "log.h"
#include "lib/ebus/message.h"
#include "lib/ebus/data.h"
#include "lib/ebus/result.h"
#include "lib/ebus/symbol.h"
#include "lib/utils/log.h"
namespace ebusd {
src/ebusd/bushandler.h
+7 -7
View File
@@ -25,13 +25,13 @@
#include <vector>
#include <map>
#include <deque>
#include "message.h"
#include "data.h"
#include "symbol.h"
#include "result.h"
#include "device.h"
#include "queue.h"
#include "thread.h"
#include "lib/ebus/message.h"
#include "lib/ebus/data.h"
#include "lib/ebus/symbol.h"
#include "lib/ebus/result.h"
#include "lib/ebus/device.h"
#include "lib/utils/queue.h"
#include "lib/utils/thread.h"
/** @file bushandler.h
* Classes, functions, and constants related to handling of symbols on the eBUS.
src/ebusd/datahandler.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
# include <config.h>
#endif
#include "datahandler.h"
#include "ebusd/datahandler.h"
#include <list>
#include <string>
#ifdef HAVE_MQTT
# include "mqtthandler.h"
# include "ebusd/mqtthandler.h"
#endif
namespace ebusd {
src/ebusd/datahandler.h
+2 -2
View File
@@ -22,8 +22,8 @@
#include <argp.h>
#include <map>
#include <list>
#include "bushandler.h"
#include "message.h"
#include "ebusd/bushandler.h"
#include "lib/ebus/message.h"
/** @file datahandler.h
* Classes and functions for implementing and registering generic data sinks
src/ebusd/main.cpp
+13 -10
View File
@@ -20,7 +20,7 @@
# include <config.h>
#endif
#include "main.h"
#include "ebusd/main.h"
#include <dirent.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -33,10 +33,10 @@
#include <map>
#include <string>
#include <vector>
#include "mainloop.h"
#include "bushandler.h"
#include "log.h"
#include "rotatefile.h"
#include "ebusd/mainloop.h"
#include "ebusd/bushandler.h"
#include "lib/utils/log.h"
#include "lib/utils/rotatefile.h"
namespace ebusd {
@@ -849,21 +849,24 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
out.str("");
offset = (unsigned char)(offset+(*identFields)[field++]->getLength(partType));
result = (*identFields)[field]->read(partType, data, offset, sw, 0); // software version number
if (result==RESULT_ERR_OUT_OF_RANGE) {
sw = (data[(partType==pt_masterData ? 5 : 1)+offset]<<16)|data[(partType==pt_masterData ? 5 : 1)+offset+1];
if (result == RESULT_ERR_OUT_OF_RANGE) {
sw = (data[(partType == pt_masterData ? 5 : 1)+offset] << 16)
| data[(partType == pt_masterData ? 5 : 1)+offset+1];
result = RESULT_OK;
}
}
if (result == RESULT_OK) {
offset = (unsigned char)(offset+(*identFields)[field++]->getLength(partType));
result = (*identFields)[field]->read(partType, data, offset, hw, 0); // hardware version number
if (result==RESULT_ERR_OUT_OF_RANGE) {
hw = (data[(partType==pt_masterData ? 5 : 1)+offset]<<16)|data[(partType==pt_masterData ? 5 : 1)+offset+1];
if (result == RESULT_ERR_OUT_OF_RANGE) {
hw = (data[(partType == pt_masterData ? 5 : 1)+offset] << 16)
| data[(partType == pt_masterData ? 5 : 1)+offset+1];
result = RESULT_OK;
}
}
if (result != RESULT_OK) {
logError(lf_main, "unable to load scan config %2.2x: decode field %s %s", address, identFields->getName(field).c_str(), getResultCode(result));
logError(lf_main, "unable to load scan config %2.2x: decode field %s %s", address,
identFields->getName(field).c_str(), getResultCode(result));
return result;
}
vector<string> files;
src/ebusd/main.h
+6 -4
View File
@@ -21,11 +21,13 @@
#include <stdint.h>
#include <string>
#include "data.h"
#include "message.h"
#include "result.h"
#include "lib/ebus/data.h"
#include "lib/ebus/message.h"
#include "lib/ebus/result.h"
/** \file main.h */
/** \file main.h
* The main entry method doing all the startup handling.
*/
namespace ebusd {
src/ebusd/mainloop.cpp
+4 -4
View File
@@ -20,12 +20,12 @@
# include <config.h>
#endif
#include "mainloop.h"
#include "ebusd/mainloop.h"
#include <iomanip>
#include <deque>
#include "main.h"
#include "log.h"
#include "data.h"
#include "ebusd/main.h"
#include "lib/utils/log.h"
#include "lib/ebus/data.h"
namespace ebusd {
src/ebusd/mainloop.h
+8 -6
View File
@@ -22,13 +22,15 @@
#include <string>
#include <list>
#include <vector>
#include "bushandler.h"
#include "datahandler.h"
#include "network.h"
#include "message.h"
#include "rotatefile.h"
#include "ebusd/bushandler.h"
#include "ebusd/datahandler.h"
#include "ebusd/network.h"
#include "lib/ebus/message.h"
#include "lib/utils/rotatefile.h"
/** \file mainloop.h */
/** \file mainloop.h
* The main loop for the TCP client interface and regular tasks such as resolving scanned data.
*/
namespace ebusd {
src/ebusd/mqtthandler.cpp
+16 -18
View File
@@ -20,9 +20,9 @@
# include <config.h>
#endif
#include "mqtthandler.h"
#include "ebusd/mqtthandler.h"
#include <csignal>
#include "log.h"
#include "lib/utils/log.h"
namespace ebusd {
@@ -48,17 +48,17 @@ static const struct argp_option g_mqtt_argp_options[] = {
};
static const char* g_host = "localhost"; //!< host name of MQTT broker [localhost]
static uint16_t g_port = 0; //!< optional port of MQTT broker, 0 to disable [0]
static const char* g_username = NULL; //!< optional user name for MQTT broker (no default)
static const char* g_password = NULL; //!< optional password for MQTT broker (no default)
static const char* g_topic = PACKAGE; //!< MQTT topic to use (prefix if without wildcards) [ebusd]
static uint16_t g_port = 0; //!< optional port of MQTT broker, 0 to disable [0]
static const char* g_username = NULL; //!< optional user name for MQTT broker (no default)
static const char* g_password = NULL; //!< optional password for MQTT broker (no default)
static const char* g_topic = PACKAGE; //!< MQTT topic to use (prefix if without wildcards) [ebusd]
#if (LIBMOSQUITTO_MAJOR >= 1)
static const char* g_cafile = NULL; //!< CA file for TLS
static const char* g_capath = NULL; //!< CA path for TLS
static const char* g_certfile = NULL; //!< client certificate file for TLS
static const char* g_keyfile = NULL; //!< client key file for TLS
static const char* g_keypass = NULL; //!< client key file password for TLS
static const char* g_cafile = NULL; //!< CA file for TLS
static const char* g_capath = NULL; //!< CA path for TLS
static const char* g_certfile = NULL; //!< client certificate file for TLS
static const char* g_keyfile = NULL; //!< client key file for TLS
static const char* g_keypass = NULL; //!< client key file password for TLS
#endif
@@ -232,7 +232,7 @@ int on_keypassword(char *buf, int size, int rwflag, void *userdata) {
if (!g_keypass) {
return 0;
}
int len = (int)strlen(g_keypass);
int len = static_cast<int>(strlen(g_keypass));
if (len > size) {
len = size;
}
@@ -251,8 +251,7 @@ void on_connect(
} else {
if (rc >= 1 && rc <= 3) {
logOtherError("mqtt", "connection refused: %s",
rc == 1 ? "wrong protocol" : (rc == 2 ? "wrong username/password" : "broker down")
);
rc == 1 ? "wrong protocol" : (rc == 2 ? "wrong username/password" : "broker down"));
} else {
logOtherError("mqtt", "connection refused: %d", rc);
}
@@ -303,7 +302,7 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages)
if (mosquitto_lib_init() != MOSQ_ERR_SUCCESS) {
logOtherError("mqtt", "unable to initialize");
} else {
signal(SIGPIPE, SIG_IGN); // needed before libmosquitto v. 1.1.3
signal(SIGPIPE, SIG_IGN); // needed before libmosquitto v. 1.1.3
ostringstream clientId;
clientId << PACKAGE_NAME << '_' << PACKAGE_VERSION << '_' << static_cast<unsigned>(getpid());
#if (LIBMOSQUITTO_MAJOR >= 1)
@@ -357,7 +356,7 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages)
mosquitto_destroy(m_mosquitto);
m_mosquitto = NULL;
} else {
m_connected = true; // assume success until connect_callback says otherwise
m_connected = true; // assume success until connect_callback says otherwise
logOtherDebug("mqtt", "connection requested");
}
}
@@ -556,8 +555,7 @@ void MqttHandler::handleTraffic() {
}
if (ret == MOSQ_ERR_NO_CONN || ret == MOSQ_ERR_CONN_LOST || ret == MOSQ_ERR_CONN_REFUSED) {
logOtherError("mqtt", "communication error: %s", ret == MOSQ_ERR_NO_CONN ? "not connected"
: (ret == MOSQ_ERR_CONN_LOST ? "connection lost" : "connection refused")
);
: (ret == MOSQ_ERR_CONN_LOST ? "connection lost" : "connection refused"));
m_connected = false;
} else {
logOtherError("mqtt", "communication error: %d", ret);
src/ebusd/mqtthandler.h
+3 -3
View File
@@ -23,9 +23,9 @@
#include <map>
#include <string>
#include <vector>
#include "datahandler.h"
#include "bushandler.h"
#include "message.h"
#include "ebusd/datahandler.h"
#include "ebusd/bushandler.h"
#include "lib/ebus/message.h"
/** @file mqtthandler.h
* A data handler enabling MQTT support via mosquitto.
src/ebusd/network.cpp
+2 -2
View File
@@ -20,12 +20,12 @@
# include <config.h>
#endif
#include "network.h"
#include "ebusd/network.h"
#ifdef HAVE_PPOLL
# include <poll.h>
#endif
#include <cstring>
#include "log.h"
#include "lib/utils/log.h"
namespace ebusd {
src/ebusd/network.h
+7 -5
View File
@@ -23,12 +23,14 @@
#include <cstdio>
#include <algorithm>
#include <list>
#include "tcpsocket.h"
#include "queue.h"
#include "notify.h"
#include "thread.h"
#include "lib/utils/tcpsocket.h"
#include "lib/utils/queue.h"
#include "lib/utils/notify.h"
#include "lib/utils/thread.h"
/** \file network.h */
/** \file network.h
* The TCP and HTTP client request handling.
*/
namespace ebusd {
src/lib/ebus/Makefile.am
+2 -1
View File
@@ -1,4 +1,5 @@
AM_CXXFLAGS = -Wconversion -Wno-unused-parameter
AM_CXXFLAGS = -I$(top_srcdir)/src \
-Wconversion -Wno-unused-parameter
noinst_LIBRARIES = libebus.a
src/lib/ebus/contrib/Makefile.am
+2 -2
View File
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -Wno-unused-parameter \
-isystem$(top_srcdir)/src/lib/ebus
AM_CXXFLAGS = -I$(top_srcdir)/src \
-Wno-unused-parameter
noinst_LIBRARIES = libebuscontrib.a
src/lib/ebus/contrib/contrib.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "contrib.h"
#include "tem.h"
#include "lib/ebus/contrib/contrib.h"
#include "lib/ebus/contrib/tem.h"
namespace ebusd {
src/lib/ebus/contrib/tem.cpp
+2 -2
View File
@@ -20,14 +20,14 @@
# include <config.h>
#endif
#include "tem.h"
#include "lib/ebus/contrib/tem.h"
#include <math.h>
#include <iostream>
#include <sstream>
#include <iomanip>
#include <vector>
#include <cstring>
#include "datatype.h"
#include "lib/ebus/datatype.h"
namespace ebusd {
src/lib/ebus/contrib/tem.h
+3 -3
View File
@@ -26,9 +26,9 @@
#include <vector>
#include <list>
#include <map>
#include "symbol.h"
#include "result.h"
#include "datatype.h"
#include "lib/ebus/symbol.h"
#include "lib/ebus/result.h"
#include "lib/ebus/datatype.h"
/** @file tem.h
* Contributed data types for TEM devices not part of regular releases.
src/lib/ebus/contrib/test/Makefile.am
+2 -2
View File
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -Wno-unused-parameter \
-isystem$(top_srcdir)/src/lib/ebus -isystem../
AM_CXXFLAGS = -I$(top_srcdir)/src \
-Wno-unused-parameter
noinst_PROGRAMS = test_contrib
src/lib/ebus/contrib/test/test_tem.cpp
+2 -2
View File
@@ -20,8 +20,8 @@
#include <iomanip>
#include <string>
#include <vector>
#include "tem.h"
#include "data.h"
#include "lib/ebus/contrib/tem.h"
#include "lib/ebus/data.h"
using namespace ebusd;
src/lib/ebus/data.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
# include <config.h>
#endif
#include "data.h"
#include "lib/ebus/data.h"
#include <math.h>
#include <iostream>
#include <sstream>
src/lib/ebus/data.h
+4 -4
View File
@@ -25,10 +25,10 @@
#include <fstream>
#include <vector>
#include <map>
#include "symbol.h"
#include "result.h"
#include "filereader.h"
#include "datatype.h"
#include "lib/ebus/symbol.h"
#include "lib/ebus/result.h"
#include "lib/ebus/filereader.h"
#include "lib/ebus/datatype.h"
/** @file data.h
* Classes related to defining fields based on data types in symbols on the
src/lib/ebus/datatype.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
# include <config.h>
#endif
#include "datatype.h"
#include "lib/ebus/datatype.h"
#include <math.h>
#include <iostream>
#include <sstream>
@@ -28,7 +28,7 @@
#include <vector>
#include <cstring>
#ifdef HAVE_CONTRIB
# include "contrib/contrib.h"
# include "lib/ebus/contrib/contrib.h"
#endif
namespace ebusd {
src/lib/ebus/datatype.h
+4 -4
View File
@@ -27,9 +27,9 @@
#include <vector>
#include <list>
#include <map>
#include "symbol.h"
#include "result.h"
#include "filereader.h"
#include "lib/ebus/symbol.h"
#include "lib/ebus/result.h"
#include "lib/ebus/filereader.h"
/** @file datatype.h
* Classes, functions, and constants related to decoding/encoding of symbols
@@ -271,7 +271,7 @@ class DataType {
const uint16_t m_flags;
/** the replacement value (fill-up value for @a StringDataType, no replacement if equal to
* @a NumberDataType#minValue). */
* @a NumberDataType#m_minValue). */
const unsigned int m_replacement;
};
src/lib/ebus/device.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
# include <config.h>
#endif
#include "device.h"
#include "lib/ebus/device.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/file.h>
@@ -34,7 +34,7 @@
#include <cstdlib>
#include <cstring>
#include <fstream>
#include "data.h"
#include "lib/ebus/data.h"
namespace ebusd {
src/lib/ebus/device.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include <netdb.h>
#include <iostream>
#include <fstream>
#include "result.h"
#include "lib/ebus/result.h"
/** @file device.h
* Classes providing access to the eBUS.
src/lib/ebus/filereader.h
+2 -2
View File
@@ -26,8 +26,8 @@
#include <fstream>
#include <algorithm>
#include <vector>
#include "symbol.h"
#include "result.h"
#include "lib/ebus/symbol.h"
#include "lib/ebus/result.h"
/** @file filereader.h
* Helper class and constants for reading configuration files.
src/lib/ebus/message.cpp
+6 -5
View File
@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "message.h"
#include "lib/ebus/message.h"
#include <string>
#include <vector>
#include <cstring>
#include <locale>
#include <iomanip>
#include <climits>
#include "data.h"
#include "result.h"
#include "symbol.h"
#include "lib/ebus/data.h"
#include "lib/ebus/result.h"
#include "lib/ebus/symbol.h"
namespace ebusd {
@@ -659,7 +659,8 @@ result_t Message::storeLastData(SymbolString& master, SymbolString& slave) {
result_t Message::storeLastData(const PartType partType, SymbolString& data, unsigned char index) {
if (data.size() > 0
&& (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData || (partType == pt_masterData && isMaster(this->m_dstAddress)))) {
&& (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData
|| (partType == pt_masterData && isMaster(this->m_dstAddress)))) {
time(&m_lastUpdateTime);
}
if (partType == pt_masterData) {
src/lib/ebus/message.h
+3 -3
View File
@@ -26,9 +26,9 @@
#include <map>
#include <queue>
#include <functional>
#include "data.h"
#include "result.h"
#include "symbol.h"
#include "lib/ebus/data.h"
#include "lib/ebus/result.h"
#include "lib/ebus/symbol.h"
/** @file message.h
* Classes and functions for decoding and encoding of complete messages on the
src/lib/ebus/result.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "result.h"
#include "lib/ebus/result.h"
#include <iostream>
namespace ebusd {
src/lib/ebus/symbol.cpp
+2 -2
View File
@@ -16,12 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "symbol.h"
#include "lib/ebus/symbol.h"
#include <iostream>
#include <iomanip>
#include <string>
#include <vector>
#include "result.h"
#include "lib/ebus/result.h"
namespace ebusd {
src/lib/ebus/symbol.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include <queue>
#include <string>
#include <vector>
#include "result.h"
#include "lib/ebus/result.h"
/** @file symbol.h
* Classes, functions, and constants related to symbols on the eBUS.
src/lib/ebus/test/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/ebus
AM_CXXFLAGS = -I$(top_srcdir)/src
noinst_PROGRAMS = test_filereader \
test_device \
src/lib/ebus/test/test_data.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <iomanip>
#include <string>
#include <vector>
#include "data.h"
#include "lib/ebus/data.h"
using namespace ebusd;
src/lib/ebus/test/test_device.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <iostream>
#include <iomanip>
#include "device.h"
#include "lib/ebus/device.h"
using namespace std;
using namespace ebusd;
src/lib/ebus/test/test_filereader.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <iomanip>
#include <string>
#include <vector>
#include "filereader.h"
#include "lib/ebus/filereader.h"
using namespace std;
using namespace ebusd;
src/lib/ebus/test/test_message.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
#include <map>
#include "message.h"
#include "lib/ebus/message.h"
using namespace ebusd;
src/lib/ebus/test/test_symbol.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <iostream>
#include <iomanip>
#include <string>
#include "symbol.h"
#include "lib/ebus/symbol.h"
using namespace std;
using namespace ebusd;
src/lib/utils/Makefile.am
+2 -1
View File
@@ -1,4 +1,5 @@
AM_CXXFLAGS = -Wconversion
AM_CXXFLAGS = -I$(top_srcdir)/src \
-Wconversion
noinst_LIBRARIES = libutils.a
src/lib/utils/clock.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "clock.h"
#include "lib/utils/clock.h"
#ifdef __MACH__
# include <mach/clock.h>
# include <mach/mach.h>
src/lib/utils/log.cpp
+2 -2
View File
@@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "log.h"
#include "lib/utils/log.h"
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
#include <sys/time.h>
#include <stdarg.h>
#include <string.h>
#include "clock.h"
#include "lib/utils/clock.h"
/** the name of each @a LogFacility. */
static const char *facilityNames[] = {
src/lib/utils/queue.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <pthread.h>
#include <errno.h>
#include <list>
#include "clock.h"
#include "lib/utils/clock.h"
/** \file queue.h */
src/lib/utils/rotatefile.cpp
+2 -2
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rotatefile.h"
#include "lib/utils/rotatefile.h"
#include <sys/ioctl.h>
#include <sys/file.h>
#include <fcntl.h>
@@ -25,7 +25,7 @@
#include <cstring>
#include <fstream>
#include <string>
#include "clock.h"
#include "lib/utils/clock.h"
using std::streamsize;
src/lib/utils/tcpsocket.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "tcpsocket.h"
#include "lib/utils/tcpsocket.h"
#include <fcntl.h>
#include <arpa/inet.h>
#include <netdb.h>
src/lib/utils/thread.cpp
+2 -2
View File
@@ -20,8 +20,8 @@
# include <config.h>
#endif
#include "thread.h"
#include "clock.h"
#include "lib/utils/thread.h"
#include "lib/utils/clock.h"
void* Thread::runThread(void* arg) {
reinterpret_cast<Thread*>(arg)->enter();
src/tools/Makefile.am
+1 -2
View File
@@ -1,5 +1,4 @@
AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/utils \
-isystem$(top_srcdir)/src/lib/ebus
AM_CXXFLAGS = -I$(top_srcdir)/src
bin_PROGRAMS = ebusctl \
ebusfeed
src/tools/ebusctl.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <cstdlib>
#include <sstream>
#include <string>
#include "tcpsocket.h"
#include "lib/utils/tcpsocket.h"
using std::ostringstream;
using std::cin;
src/tools/ebusfeed.cpp
+2 -2
View File
@@ -27,8 +27,8 @@
#include <cstdlib>
#include <fstream>
#include <iomanip>
#include "device.h"
#include "result.h"
#include "lib/ebus/device.h"
#include "lib/ebus/result.h"
using std::hex;
using std::fstream;