Loading Common/Libraries/ModbusChannel/include/ModbusChannel.h +3 −2 Original line number Diff line number Diff line #ifndef MODBUSCHANNEL_HPP #define MODBUSCHANNEL_HPP #include <acsThread.h> #include <IRA> #include <modbus/modbus.h> #include <sys/time.h> #include <string> #include <cerrno> #include <stdexcept> #include <boost/shared_ptr.hpp> #include <boost/thread.hpp> #define MODBUS_DEFAULT_PORT MODBUS_TCP_DEFAULT_PORT #define MODBUS_TIMEOUT 2 Loading Loading @@ -89,7 +90,7 @@ class ModbusChannel T get(int address); //throw ModbusError private: /* class members */ boost::mutex _connection_guard; BACIMutex _connection_guard; std::string _server_ip; int _server_port; bool _is_connected; Loading Common/Libraries/ModbusChannel/src/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -62,7 +62,7 @@ LIBRARIES_L = # # <brief description of lllll library> ModbusChannel_OBJECTS = ModbusChannel ModbusChannel_LIBS = modbus boost_thread ModbusChannel_LIBS = modbus acsnc # # Scripts (public and local) Loading Common/Libraries/ModbusChannel/src/ModbusChannel.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -53,7 +53,7 @@ ModbusChannel::~ModbusChannel() void ModbusChannel::connect() { boost::mutex::scoped_lock lock(_connection_guard); baci::ThreadSyncGuard lock(&_connection_guard); int rc; if(!(this->_is_connected)) { Loading @@ -66,7 +66,7 @@ ModbusChannel::connect() void ModbusChannel::disconnect() { boost::mutex::scoped_lock lock(_connection_guard); baci::ThreadSyncGuard lock(&_connection_guard); if(this->_is_connected){ modbus_close(this->_modbus_context); this->_is_connected = false; Loading Loading
Common/Libraries/ModbusChannel/include/ModbusChannel.h +3 −2 Original line number Diff line number Diff line #ifndef MODBUSCHANNEL_HPP #define MODBUSCHANNEL_HPP #include <acsThread.h> #include <IRA> #include <modbus/modbus.h> #include <sys/time.h> #include <string> #include <cerrno> #include <stdexcept> #include <boost/shared_ptr.hpp> #include <boost/thread.hpp> #define MODBUS_DEFAULT_PORT MODBUS_TCP_DEFAULT_PORT #define MODBUS_TIMEOUT 2 Loading Loading @@ -89,7 +90,7 @@ class ModbusChannel T get(int address); //throw ModbusError private: /* class members */ boost::mutex _connection_guard; BACIMutex _connection_guard; std::string _server_ip; int _server_port; bool _is_connected; Loading
Common/Libraries/ModbusChannel/src/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -62,7 +62,7 @@ LIBRARIES_L = # # <brief description of lllll library> ModbusChannel_OBJECTS = ModbusChannel ModbusChannel_LIBS = modbus boost_thread ModbusChannel_LIBS = modbus acsnc # # Scripts (public and local) Loading
Common/Libraries/ModbusChannel/src/ModbusChannel.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -53,7 +53,7 @@ ModbusChannel::~ModbusChannel() void ModbusChannel::connect() { boost::mutex::scoped_lock lock(_connection_guard); baci::ThreadSyncGuard lock(&_connection_guard); int rc; if(!(this->_is_connected)) { Loading @@ -66,7 +66,7 @@ ModbusChannel::connect() void ModbusChannel::disconnect() { boost::mutex::scoped_lock lock(_connection_guard); baci::ThreadSyncGuard lock(&_connection_guard); if(this->_is_connected){ modbus_close(this->_modbus_context); this->_is_connected = false; Loading