Skip to content

U
uniset2
Commit 64cc0668 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Для защиты от ошибок стал использовать "override" (нашёл пару багов).

parent 6480bf57
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 195 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ 64cc0668
......@@ -182,14 +182,14 @@
</xsl:template>
<xsl:template name="COMMON-HEAD-PROTECTED">
virtual void callback();
virtual void processingMessage( UniSetTypes::VoidMessage* msg );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void callback() override;
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd ){}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ){}
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ){}
virtual void sigterm( int signo );
virtual bool activateObject();
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override{}
virtual void sigterm( int signo ) override;
virtual bool activateObject() override;
virtual void testMode( bool state );
void updatePreviousValues();
void checkSensors();
......
extensions/DBServer-MySQL/DBServer_MySQL.h
View file @ 64cc0668
......@@ -147,10 +147,10 @@ class DBServer_MySQL:
virtual void initDB(MySQLInterface *db){};
virtual void initDBTableMap(DBTableMap& tblMap){};
virtual void timerInfo( const UniSetTypes::TimerMessage* tm );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm );
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg );
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg ) override;
bool writeToBase( const string& query );
virtual void init_dbserver();
......
extensions/DBServer-SQLite/DBServer_SQLite.h
View file @ 64cc0668
......@@ -147,10 +147,10 @@ class DBServer_SQLite:
virtual void initDB( SQLiteInterface *db ){};
virtual void initDBTableMap(DBTableMap& tblMap){};
virtual void timerInfo( const UniSetTypes::TimerMessage* tm );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm );
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg );
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg ) override;
bool writeToBase( const string& query );
virtual void init_dbserver();
......
extensions/IOControl/IOControl.h
View file @ 64cc0668
......@@ -281,12 +281,12 @@ class IOControl:
void blink();
// действия при завершении работы
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd );
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm );
virtual void timerInfo( const UniSetTypes::TimerMessage* tm );
virtual void sigterm( int signo );
virtual bool activateObject();
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
virtual void sigterm( int signo ) override;
virtual bool activateObject() override;
// начальная инициализация выходов
void initOutputs();
......
extensions/LogicProcessor/Element.h
View file @ 64cc0668
......@@ -112,10 +112,10 @@ class TOR:
TOR( ElementID id, int numbers=0, bool st=false );
virtual ~TOR();
virtual void setIn( int num, bool state );
virtual bool getOut(){ return myout; }
virtual void setIn( int num, bool state ) override;
virtual bool getOut() override { return myout; }
virtual std::string getType(){ return "OR"; }
virtual std::string getType() override { return "OR"; }
protected:
TOR():myout(false){}
......@@ -133,8 +133,8 @@ class TAND:
TAND( ElementID id, int numbers=0, bool st=false );
virtual ~TAND();
virtual void setIn( int num, bool state );
virtual std::string getType(){ return "AND"; }
virtual void setIn( int num, bool state ) override;
virtual std::string getType() override { return "AND"; }
protected:
TAND(){}
......@@ -152,14 +152,14 @@ class TNOT:
TNOT( ElementID id, bool out_default );
virtual ~TNOT();
virtual bool getOut(){ return myout; }
virtual bool getOut() override { return myout; }
/* num игнорируется, т.к. элемент с одним входом
*/
virtual void setIn( int num, bool state );
virtual std::string getType(){ return "NOT"; }
virtual void addInput( int num, bool state=false ){}
virtual void delInput( int num ){}
virtual void setIn( int num, bool state ) override ;
virtual std::string getType() override { return "NOT"; }
virtual void addInput( int num, bool state=false ) override {}
virtual void delInput( int num ) override {}
protected:
TNOT():myout(false){}
......
extensions/LogicProcessor/PassiveLProcessor.h
View file @ 64cc0668
......@@ -33,16 +33,16 @@ class PassiveLProcessor:
virtual void getInputs();
virtual void setOuts();
void sysCommand( const UniSetTypes::SystemMessage *msg );
void sensorInfo( const UniSetTypes::SensorMessage*sm );
void timerInfo( const UniSetTypes::TimerMessage *tm );
void sysCommand( const UniSetTypes::SystemMessage *msg ) override;
void sensorInfo( const UniSetTypes::SensorMessage*sm ) override;
void timerInfo( const UniSetTypes::TimerMessage *tm ) override;
void askSensors( const UniversalIO::UIOCommand cmd );
// void initOutput();
// действия при завершении работы
virtual void sigterm( int signo );
virtual void sigterm( int signo ) override;
void initIterators();
virtual bool activateObject();
virtual bool activateObject() override;
SMInterface* shm;
......
extensions/LogicProcessor/TDelay.h
View file @ 64cc0668
......@@ -15,12 +15,12 @@ class TDelay:
virtual ~TDelay();
virtual void tick();
virtual void setIn( int num, bool state );
virtual bool getOut();
virtual std::string getType(){ return "Delay"; }
virtual void tick() override;
virtual void setIn( int num, bool state ) override;
virtual bool getOut() override;
virtual std::string getType() override { return "Delay"; }
virtual void setDelay(int timeMS);
void setDelay( int timeMS );
inline int getDelay(){ return delay; }
protected:
......
extensions/ModbusMaster/MBExchange.h
View file @ 64cc0668
......@@ -200,13 +200,13 @@ class MBExchange:
protected:
virtual void step();
virtual void sysCommand( const UniSetTypes::SystemMessage *msg );
virtual void sensorInfo( const UniSetTypes::SensorMessage*sm );
virtual void timerInfo( const UniSetTypes::TimerMessage *tm );
virtual void sysCommand( const UniSetTypes::SystemMessage *msg ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage*sm ) override;
virtual void timerInfo( const UniSetTypes::TimerMessage *tm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd );
virtual void initOutput();
virtual void sigterm( int signo );
virtual bool activateObject();
virtual void sigterm( int signo ) override;
virtual bool activateObject() override;
virtual void initIterators();
struct InitRegInfo
......
extensions/ModbusMaster/MBTCPMaster.h
View file @ 64cc0668
......@@ -205,17 +205,13 @@ class MBTCPMaster:
static void help_print( int argc, const char* const* argv );
protected:
virtual void sysCommand( const UniSetTypes::SystemMessage *sm );
virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
virtual ModbusClient* initMB( bool reopen=false ) override;
UniSetTypes::uniset_rwmutex mbMutex;
std::string iaddr;
// ost::InetAddress* ia;
int port;
// int recv_timeout;
// virtual void step();
virtual ModbusClient* initMB( bool reopen=false );
void poll_thread();
bool force_disconnect;
......
extensions/ModbusMaster/MBTCPMultiMaster.h
View file @ 64cc0668
......@@ -227,9 +227,9 @@ class MBTCPMultiMaster:
static void help_print( int argc, const char* const* argv );
protected:
virtual void sysCommand( const UniSetTypes::SystemMessage *sm );
virtual void initIterators();
virtual ModbusClient* initMB( bool reopen=false );
virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
virtual void initIterators() override;
virtual ModbusClient* initMB( bool reopen=false ) override;
void poll_thread();
void check_thread();
......
extensions/ModbusMaster/RTUExchange.h
View file @ 64cc0668
......@@ -33,11 +33,11 @@ class RTUExchange:
bool use485F;
bool transmitCtl;
virtual void step();
virtual void poll();
virtual void step() override;
virtual void poll() override;
virtual ModbusClient* initMB( bool reopen=false );
virtual bool initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML_iterator& it );
virtual ModbusClient* initMB( bool reopen=false ) override;
virtual bool initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML_iterator& it ) override;
private:
RTUExchange();
......
extensions/ModbusSlave/MBSlave.h
View file @ 64cc0668
......@@ -138,17 +138,17 @@ class MBSlave:
SMInterface* shm;
virtual void sysCommand( const UniSetTypes::SystemMessage *msg );
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm );
virtual void sysCommand( const UniSetTypes::SystemMessage *msg ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
void askSensors( UniversalIO::UIOCommand cmd );
void waitSMReady();
void execute_rtu();
void execute_tcp();
virtual bool activateObject();
virtual bool activateObject() override;
// действия при завершении работы
virtual void sigterm( int signo );
virtual void sigterm( int signo ) override;
void initIterators();
bool initItem( UniXML_iterator& it );
......
extensions/RRDServer/RRDServer.h
View file @ 64cc0668
......@@ -73,13 +73,13 @@ class RRDServer:
protected:
RRDServer();
virtual void askSensors( UniversalIO::UIOCommand cmd );
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm );
virtual void timerInfo( const UniSetTypes::TimerMessage* tm );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void askSensors( UniversalIO::UIOCommand cmd ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void initRRD( xmlNode* cnode, int tmID );
void step();
void initRRD( xmlNode* cnode, int tmID );
virtual void step() override;
SMInterface* shm;
......
extensions/SharedMemory/SharedMemory.h
View file @ 64cc0668
......@@ -350,14 +350,14 @@ class SharedMemory:
typedef std::list<Restorer_XML::ReaderSlot> ReadSlotList;
ReadSlotList lstRSlot;
virtual void sysCommand( const UniSetTypes::SystemMessage *sm );
virtual void timerInfo( const UniSetTypes::TimerMessage *tm );
virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
virtual void timerInfo( const UniSetTypes::TimerMessage *tm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd );
virtual void sendEvent( UniSetTypes::SystemMessage& sm );
void sendEvent( UniSetTypes::SystemMessage& sm );
// действия при завершении работы
virtual void sigterm( int signo );
bool activateObject();
virtual void sigterm( int signo ) override;
virtual bool activateObject() override;
// virtual void logging(UniSetTypes::SensorMessage& sm){}
// virtual void dumpToDB(){}
bool readItem( const UniXML& xml, UniXML_iterator& it, xmlNode* sec );
......@@ -416,9 +416,9 @@ class SharedMemory:
int evntPause;
int activateTimeout;
virtual void loggingInfo( UniSetTypes::SensorMessage& sm );
virtual void dumpOrdersList( const UniSetTypes::ObjectId sid, const IONotifyController::ConsumerList& lst ){}
virtual void dumpThresholdList( const UniSetTypes::ObjectId sid, const IONotifyController::ThresholdExtList& lst ){}
virtual void loggingInfo( UniSetTypes::SensorMessage& sm ) override;
virtual void dumpOrdersList( const UniSetTypes::ObjectId sid, const IONotifyController::ConsumerListInfo& lst ) override {};
virtual void dumpThresholdList( const UniSetTypes::ObjectId sid, const IONotifyController::ThresholdExtList& lst ) override {}
bool dblogging;
......
extensions/UNetUDP/UNetExchange.h
View file @ 64cc0668
......@@ -101,9 +101,9 @@ class UNetExchange:
SMInterface* shm;
void step();
void sysCommand( const UniSetTypes::SystemMessage *msg );
void sensorInfo( const UniSetTypes::SensorMessage*sm );
void timerInfo( const UniSetTypes::TimerMessage *tm );
void sysCommand( const UniSetTypes::SystemMessage *msg ) override;
void sensorInfo( const UniSetTypes::SensorMessage*sm ) override;
void timerInfo( const UniSetTypes::TimerMessage *tm ) override;
void askSensors( UniversalIO::UIOCommand cmd );
void waitSMReady();
void receiverEvent( UNetReceiver* r, UNetReceiver::Event ev );
......
extensions/UniNetwork/UniExchange.h
View file @ 64cc0668
......@@ -49,13 +49,13 @@ class UniExchange:
/*! глобальная функция для вывода help-а */
static void help_print( int argc, const char** argv );
virtual IOController_i::ShortMapSeq* getSensors();
virtual IOController_i::ShortMapSeq* getSensors() override;
protected:
virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd );
virtual void sigterm( int signo );
virtual void sigterm( int signo ) override;
xmlNode* cnode;
std::string s_field;
......
include/DBServer.h
View file @ 64cc0668
......@@ -56,10 +56,10 @@ class DBServer:
protected:
virtual void processingMessage( UniSetTypes::VoidMessage* msg );
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg ){}
virtual bool activateObject();
virtual bool activateObject() override;
virtual void init_dbserver(){};
private:
......
include/IOController.h
View file @ 64cc0668
......@@ -45,40 +45,40 @@ class IOController:
IOController( const UniSetTypes::ObjectId id );
~IOController();
virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("IOController"); }
virtual UniSetTypes::ObjectType getType() override { return UniSetTypes::ObjectType("IOController"); }
virtual CORBA::Long getValue( UniSetTypes::ObjectId sid );
virtual CORBA::Long getValue( UniSetTypes::ObjectId sid ) override;
// -------------------- !!!!!!!!! ---------------------------------
// Реализуются конкретным i/o контроллером
// Не забывайте писать реализацию этих функций
virtual void setValue( UniSetTypes::ObjectId sid, CORBA::Long value,
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId );
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId ) override;
virtual void fastSetValue( UniSetTypes::ObjectId sid, CORBA::Long value,
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId );
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId ) override;
// ----------------------------------------------------------------
virtual void setUndefinedState( UniSetTypes::ObjectId sid,
CORBA::Boolean undefined,
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId );
UniSetTypes::ObjectId sup_id = UniSetTypes::DefaultObjectId ) override;
virtual IOController_i::SensorInfoSeq* getSensorSeq( const UniSetTypes::IDSeq& lst );
virtual UniSetTypes::IDSeq* setOutputSeq( const IOController_i::OutSeq& lst, UniSetTypes::ObjectId sup_id );
virtual IOController_i::SensorInfoSeq* getSensorSeq( const UniSetTypes::IDSeq& lst ) override;
virtual UniSetTypes::IDSeq* setOutputSeq( const IOController_i::OutSeq& lst, UniSetTypes::ObjectId sup_id ) override;
// ----------------------------------------------------------------
virtual UniversalIO::IOType getIOType( UniSetTypes::ObjectId sid );
virtual UniversalIO::IOType getIOType( UniSetTypes::ObjectId sid ) override;
virtual IOController_i::SensorInfoSeq* getSensorsMap();
virtual IOController_i::SensorIOInfo getSensorIOInfo( UniSetTypes::ObjectId sid );
virtual IOController_i::SensorInfoSeq* getSensorsMap() override;
virtual IOController_i::SensorIOInfo getSensorIOInfo( UniSetTypes::ObjectId sid ) override;
virtual CORBA::Long getRawValue(UniSetTypes::ObjectId sid);
virtual void calibrate(UniSetTypes::ObjectId sid,
virtual CORBA::Long getRawValue( UniSetTypes::ObjectId sid ) override;
virtual void calibrate( UniSetTypes::ObjectId sid,
const IOController_i::CalibrateInfo& ci,
UniSetTypes::ObjectId adminId );
UniSetTypes::ObjectId adminId ) override;
IOController_i::CalibrateInfo getCalibrateInfo( UniSetTypes::ObjectId sid );
IOController_i::CalibrateInfo getCalibrateInfo( UniSetTypes::ObjectId sid ) override;
inline IOController_i::SensorInfo SensorInfo( const UniSetTypes::ObjectId sid,
const UniSetTypes::ObjectId node=UniSetTypes::conf->getLocalNode())
......@@ -91,9 +91,9 @@ class IOController:
UniSetTypes::Message::Priority getPriority( const UniSetTypes::ObjectId id );
virtual IOController_i::ShortIOInfo getChangedTime( const UniSetTypes::ObjectId id );
virtual IOController_i::ShortIOInfo getChangedTime( const UniSetTypes::ObjectId id ) override;
virtual IOController_i::ShortMapSeq* getSensors();
virtual IOController_i::ShortMapSeq* getSensors() override;
public:
......@@ -189,8 +189,8 @@ class IOController:
protected:
// переопределяем для добавления вызова регистрации датчиков
virtual bool disactivateObject();
virtual bool activateObject();
virtual bool disactivateObject() override;
virtual bool activateObject() override;
/*! Начальная инициализация (выставление значений) */
virtual void activateInit();
......
include/IONotifyController.h
View file @ 64cc0668
......@@ -136,27 +136,27 @@ class IONotifyController:
virtual ~IONotifyController();
virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("IONotifyController"); }
virtual void askSensor(const UniSetTypes::ObjectId sid, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd);
virtual UniSetTypes::ObjectType getType() override { return UniSetTypes::ObjectType("IONotifyController"); }
virtual void askSensor(const UniSetTypes::ObjectId sid, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd) override;
virtual void askThreshold(const UniSetTypes::ObjectId sid, const UniSetTypes::ConsumerInfo& ci,
UniSetTypes::ThresholdId tid,
CORBA::Long lowLimit, CORBA::Long hiLimit, CORBA::Boolean invert,
UniversalIO::UIOCommand cmd );
UniversalIO::UIOCommand cmd ) override;
virtual IONotifyController_i::ThresholdInfo getThresholdInfo( const UniSetTypes::ObjectId sid, UniSetTypes::ThresholdId tid );
virtual IONotifyController_i::ThresholdList* getThresholds(const UniSetTypes::ObjectId sid );
virtual IONotifyController_i::ThresholdsListSeq* getThresholdsList();
virtual IONotifyController_i::ThresholdInfo getThresholdInfo( const UniSetTypes::ObjectId sid, UniSetTypes::ThresholdId tid ) override;
virtual IONotifyController_i::ThresholdList* getThresholds(const UniSetTypes::ObjectId sid ) override;
virtual IONotifyController_i::ThresholdsListSeq* getThresholdsList() override;
virtual UniSetTypes::IDSeq* askSensorsSeq(const UniSetTypes::IDSeq& lst,
const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd);
const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd) override;
// --------------------------------------------
// функция для работы напрямую черех iterator (оптимизация)
virtual void localSetValue( IOController::IOStateList::iterator& it,
UniSetTypes::ObjectId sid,
CORBA::Long value, UniSetTypes::ObjectId sup_id );
CORBA::Long value, UniSetTypes::ObjectId sup_id ) override;
// --------------------------------------------
......@@ -256,7 +256,7 @@ class IONotifyController:
protected:
IONotifyController();
virtual bool activateObject();
virtual bool activateObject() override;
virtual void initItem( IOStateList::iterator& it, IOController* ic );
// ФИЛЬТРЫ
......
include/ObjectIndex_Array.h
View file @ 64cc0668
......@@ -44,20 +44,19 @@ class ObjectIndex_Array:
ObjectIndex_Array(const ObjectInfo* objectInfo);
virtual ~ObjectIndex_Array();
virtual const ObjectInfo* getObjectInfo( const ObjectId ) override;
virtual const ObjectInfo* getObjectInfo( const std::string& name ) override;
virtual ObjectId getIdByName( const std::string& name ) override;
virtual std::string getMapName( const ObjectId id ) override;
virtual std::string getTextName( const ObjectId id ) override;
virtual const ObjectInfo* getObjectInfo(const ObjectId);
virtual const ObjectInfo* getObjectInfo( const std::string& name );
virtual ObjectId getIdByName(const std::string& name);
virtual std::string getMapName(const ObjectId id);
virtual std::string getTextName(const ObjectId id);
virtual std::ostream& printMap(std::ostream& os);
virtual std::ostream& printMap(std::ostream& os) override;
friend std::ostream& operator<<(std::ostream& os, ObjectIndex_Array& oi );
private:
int numOfObject;
typedef std::map<std::string, ObjectId> MapObjectKey;
typedef std::map<std::string, ObjectId> MapObjectKey;
MapObjectKey::iterator MapObjectKeyIterator;
MapObjectKey mok;
const ObjectInfo *objectInfo;
......
include/ObjectIndex_XML.h
View file @ 64cc0668
......@@ -41,17 +41,17 @@ class ObjectIndex_XML:
ObjectIndex_XML(UniXML& xml, int minSize=1000 );
virtual ~ObjectIndex_XML();
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const ObjectId );
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string& name );
virtual ObjectId getIdByName( const std::string& name );
virtual std::string getMapName( const ObjectId id );
virtual std::string getTextName( const ObjectId id );
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const ObjectId ) override;
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string& name ) override;
virtual ObjectId getIdByName( const std::string& name ) override;
virtual std::string getMapName( const ObjectId id ) override;
virtual std::string getTextName( const ObjectId id ) override;
virtual std::ostream& printMap(std::ostream& os);
virtual std::ostream& printMap(std::ostream& os) override;
friend std::ostream& operator<<(std::ostream& os, ObjectIndex_XML& oi );
protected:
virtual void build(UniXML& xml);
void build( UniXML& xml );
unsigned int read_section( UniXML& xml, const std::string& sec, unsigned int ind );
unsigned int read_nodes( UniXML& xml, const std::string& sec, unsigned int ind );
......
include/ObjectIndex_idXML.h
View file @ 64cc0668
......@@ -15,17 +15,17 @@ class ObjectIndex_idXML:
ObjectIndex_idXML(UniXML& xml);
virtual ~ObjectIndex_idXML();
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const UniSetTypes::ObjectId );
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string& name );
virtual UniSetTypes::ObjectId getIdByName( const std::string& name );
virtual std::string getMapName( const UniSetTypes::ObjectId id );
virtual std::string getTextName( const UniSetTypes::ObjectId id );
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const UniSetTypes::ObjectId ) override;
virtual const UniSetTypes::ObjectInfo* getObjectInfo( const std::string& name ) override;
virtual UniSetTypes::ObjectId getIdByName( const std::string& name ) override;
virtual std::string getMapName( const UniSetTypes::ObjectId id ) override;
virtual std::string getTextName( const UniSetTypes::ObjectId id ) override;
virtual std::ostream& printMap( std::ostream& os );
virtual std::ostream& printMap( std::ostream& os ) override;
friend std::ostream& operator<<(std::ostream& os, ObjectIndex_idXML& oi );
protected:
virtual void build( UniXML& xml );
void build( UniXML& xml );
void read_section( UniXML& xml, const std::string& sec );
void read_nodes( UniXML& xml, const std::string& sec );
......
include/SMonitor.h
View file @ 64cc0668
......@@ -15,10 +15,10 @@ class SMonitor:
// -----
protected:
virtual void sysCommand( const UniSetTypes::SystemMessage *sm );
virtual void sensorInfo( const UniSetTypes::SensorMessage *si );
virtual void timerInfo( const UniSetTypes::TimerMessage *tm );
virtual void sigterm( int signo );
virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
virtual void sensorInfo( const UniSetTypes::SensorMessage *si ) override;
virtual void timerInfo( const UniSetTypes::TimerMessage *tm ) override;
virtual void sigterm( int signo ) override;
SMonitor();
private:
......
include/UniSetActivator.h
View file @ 64cc0668
......@@ -65,7 +65,7 @@ class UniSetActivator:
inline void oakill(int signo){ raise(signo);}
virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("UniSetActivator"); }
virtual UniSetTypes::ObjectType getType() override { return UniSetTypes::ObjectType("UniSetActivator"); }
protected:
......@@ -94,7 +94,7 @@ class UniSetActivator:
return orb;
}
virtual void sysCommand( const UniSetTypes::SystemMessage *sm );
virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
// уносим в protected, т.к. Activator должен быть только один..
......
include/UniSetManager.h
View file @ 64cc0668
......@@ -62,11 +62,11 @@ class UniSetManager:
UniSetManager( const std::string& name, const std::string& section );
virtual ~UniSetManager();
virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("UniSetManager"); }
virtual UniSetTypes::ObjectType getType() override { return UniSetTypes::ObjectType("UniSetManager"); }
// ------ функции объявленные в интерфейсе(IDL) ------
virtual void broadcast(const UniSetTypes::TransportMessage& msg);
virtual UniSetTypes::SimpleInfoSeq* getObjectsInfo( CORBA::Long MaxLength=300 );
virtual void broadcast( const UniSetTypes::TransportMessage& msg) override;
virtual UniSetTypes::SimpleInfoSeq* getObjectsInfo( CORBA::Long MaxLength=300 ) override ;
// --------------------------
void initPOA(UniSetManager* rmngr);
......@@ -127,12 +127,12 @@ class UniSetManager:
// работа со списком менеджеров
void managers(OManagerCommand cmd);
virtual void sigterm( int signo );
virtual void sigterm( int signo ) override;
//! \note Переопределяя не забывайте вызвать базовую
virtual bool activateObject();
virtual bool activateObject() override;
//! \note Переопределяя не забывайте вызвать базовую
virtual bool disactivateObject();
virtual bool disactivateObject() override;
typedef UniSetManagerList::iterator MListIterator;
......
include/UniSetObject.h
View file @ 64cc0668
......@@ -71,18 +71,18 @@ class UniSetObject:
virtual ~UniSetObject();
// Функции объявленные в IDL
virtual CORBA::Boolean exist();
virtual char* getName(){return (char*)myname.c_str();}
virtual UniSetTypes::ObjectId getId(){ return myid; }
virtual CORBA::Boolean exist() override;
virtual UniSetTypes::ObjectId getId() override { return myid; }
inline const UniSetTypes::ObjectId getId() const { return myid; }
inline std::string getName(){ return myname; }
virtual UniSetTypes::ObjectType getType() { return UniSetTypes::ObjectType("UniSetObject"); }
virtual UniSetTypes::SimpleInfo* getInfo();
virtual UniSetTypes::ObjectType getType() override { return UniSetTypes::ObjectType("UniSetObject"); }
virtual UniSetTypes::SimpleInfo* getInfo() override;
friend std::ostream& operator<<(std::ostream& os, UniSetObject& obj );
//! поместить сообщение в очередь
virtual void push(const UniSetTypes::TransportMessage& msg);
virtual void push( const UniSetTypes::TransportMessage& msg ) override;
/*! получить ссылку (на себя) */
inline UniSetTypes::ObjectPtr getRef() const
......
include/modbus/ModbusClient.h
View file @ 64cc0668
......@@ -134,7 +134,7 @@ class ModbusClient
// ---------------------------------------------------------------------
/*! установить время ожидания по умолчанию */
void setTimeout( timeout_t msec );
/*! Установка паузы после посылки запроса
\return старое значение
*/
......@@ -190,7 +190,7 @@ class ModbusClient
timeout_t replyTimeOut_ms; /*!< таймаут на ожидание ответа */
timeout_t aftersend_msec; /*!< пауза после посылки запроса */
timeout_t sleepPause_usec; /*!< пауза между попытками чтения символа из канала */
bool crcNoCheckit;
UniSetTypes::uniset_rwmutex sendMutex;
......@@ -198,8 +198,6 @@ class ModbusClient
void printProcessingTime();
PassiveTimer tmProcessing;
private:
};
......
include/modbus/ModbusRTUMaster.h
View file @ 64cc0668
......@@ -23,8 +23,8 @@ class ModbusRTUMaster:
ModbusRTUMaster( const std::string& dev, bool use485=false, bool tr_ctl=false );
virtual ~ModbusRTUMaster();
virtual void cleanupChannel(){ if( port ) port->cleanupChannel(); }
virtual void cleanupChannel() override { if( port ) port->cleanupChannel(); }
void setSpeed( ComPort::Speed s );
void setSpeed( const std::string& s );
ComPort::Speed getSpeed();
......@@ -43,16 +43,16 @@ class ModbusRTUMaster:
\param len - size of buf
\return real data lenght ( must be <= len )
*/
virtual int getNextData( unsigned char* buf, int len );
virtual int getNextData( unsigned char* buf, int len ) override;
/*! set timeout for send/receive data */
virtual void setChannelTimeout( timeout_t msec );
virtual void setChannelTimeout( timeout_t msec ) override;
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len );
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len ) override;
/*! функция запрос-ответ */
virtual ModbusRTU::mbErrCode query( ModbusRTU::ModbusAddr addr, ModbusRTU::ModbusMessage& msg,
ModbusRTU::ModbusMessage& reply, timeout_t timeout );
ModbusRTU::ModbusMessage& reply, timeout_t timeout ) override;
std::string dev; /*!< устройство */
......
include/modbus/ModbusRTUSlave.h
View file @ 64cc0668
......@@ -26,23 +26,23 @@ class ModbusRTUSlave:
ModbusRTUSlave( const std::string& dev, bool use485=false, bool tr_ctl=false );
ModbusRTUSlave( ComPort* com );
virtual ~ModbusRTUSlave();
void setSpeed( ComPort::Speed s );
void setSpeed( const std::string& s );
ComPort::Speed getSpeed();
virtual ModbusRTU::mbErrCode receive( ModbusRTU::ModbusAddr addr, timeout_t msecTimeout );
virtual ModbusRTU::mbErrCode receive( ModbusRTU::ModbusAddr addr, timeout_t msecTimeout ) override;
virtual void cleanupChannel() override { if(port) port->cleanupChannel(); }
virtual void cleanupChannel(){ if(port) port->cleanupChannel(); }
virtual void terminate() override;
virtual void terminate();
protected:
// realisation (see ModbusServer.h)
virtual int getNextData( unsigned char* buf, int len );
virtual void setChannelTimeout( timeout_t msec );
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len );
virtual int getNextData( unsigned char* buf, int len ) override;
virtual void setChannelTimeout( timeout_t msec ) override;
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len ) override;
std::string dev; /*!< устройство */
ComPort* port; /*!< устройство для работы с COM-портом */
......
include/modbus/ModbusServer.h
View file @ 64cc0668
......@@ -91,7 +91,7 @@ class ModbusServer
*/
virtual ModbusRTU::mbErrCode readInputStatus( ModbusRTU::ReadInputStatusMessage& query,
ModbusRTU::ReadInputStatusRetMessage& reply )=0;
/*! Обработка запроса на чтение данных (0x03).
\param query - запрос
\param reply - ответ. Заполняется в обработчике.
......
include/modbus/ModbusServerSlot.h
View file @ 64cc0668
......@@ -12,7 +12,7 @@ class ModbusServerSlot
public:
ModbusServerSlot();
virtual ~ModbusServerSlot();
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::ReadCoilMessage&,
ModbusRTU::ReadCoilRetMessage&> ReadCoilSlot;
......@@ -20,11 +20,11 @@ class ModbusServerSlot
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::ReadInputStatusMessage&,
ModbusRTU::ReadInputStatusRetMessage&> ReadInputStatusSlot;
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::ReadOutputMessage&,
ModbusRTU::ReadOutputRetMessage&> ReadOutputSlot;
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::ReadInputMessage&,
ModbusRTU::ReadInputRetMessage&> ReadInputSlot;
......@@ -44,7 +44,7 @@ class ModbusServerSlot
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::WriteOutputMessage&,
ModbusRTU::WriteOutputRetMessage&> WriteOutputSlot;
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::DiagnosticMessage&,
ModbusRTU::DiagnosticRetMessage&> DiagnosticsSlot;
......@@ -52,7 +52,7 @@ class ModbusServerSlot
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::MEIMessageRDI&,
ModbusRTU::MEIMessageRetRDI&> MEIRDISlot;
typedef sigc::slot<ModbusRTU::mbErrCode,
ModbusRTU::JournalCommandMessage&,
ModbusRTU::JournalCommandRetMessage&> JournalCommandSlot;
......@@ -112,7 +112,7 @@ class ModbusServerSlot
void connectFileTransfer( FileTransferSlot sl );
virtual void sigterm( int signo ){}
protected:
ReadCoilSlot slReadCoil;
ReadInputStatusSlot slReadInputStatus;
......
include/modbus/ModbusTCPMaster.h
View file @ 64cc0668
......@@ -27,19 +27,19 @@ class ModbusTCPMaster:
{
force_disconnect = s;
}
void reconnect();
void cleanInputStream();
virtual void cleanupChannel(){ cleanInputStream(); }
virtual void cleanupChannel() override { cleanInputStream(); }
protected:
virtual int getNextData( unsigned char* buf, int len );
virtual void setChannelTimeout( timeout_t msec );
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len );
virtual int getNextData( unsigned char* buf, int len ) override;
virtual void setChannelTimeout( timeout_t msec ) override;
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len ) override;
virtual ModbusRTU::mbErrCode query( ModbusRTU::ModbusAddr addr, ModbusRTU::ModbusMessage& msg,
ModbusRTU::ModbusMessage& reply, timeout_t timeout );
ModbusRTU::ModbusMessage& reply, timeout_t timeout ) override;
private:
ost::TCPStream* tcp;
......
include/modbus/ModbusTCPServer.h
View file @ 64cc0668
......@@ -21,26 +21,26 @@ class ModbusTCPServer:
public:
ModbusTCPServer( ost::InetAddress &ia, int port=502 );
virtual ~ModbusTCPServer();
virtual ModbusRTU::mbErrCode receive( ModbusRTU::ModbusAddr addr, timeout_t msecTimeout );
virtual ModbusRTU::mbErrCode receive( ModbusRTU::ModbusAddr addr, timeout_t msecTimeout ) override;
inline void setIgnoreAddrMode( bool st ){ ignoreAddr = st; }
inline bool getIgnoreAddrMode(){ return ignoreAddr; }
void cleanInputStream();
virtual void cleanupChannel(){ cleanInputStream(); }
virtual void terminate();
virtual void cleanupChannel() override { cleanInputStream(); }
virtual void terminate() override;
protected:
virtual ModbusRTU::mbErrCode pre_send_request( ModbusRTU::ModbusMessage& request );
// virtual ModbusRTU::mbErrCode post_send_request( ModbusRTU::ModbusMessage& request );
// realisation (see ModbusServer.h)
virtual int getNextData( unsigned char* buf, int len );
virtual void setChannelTimeout( timeout_t msec );
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len );
virtual int getNextData( unsigned char* buf, int len ) override;
virtual void setChannelTimeout( timeout_t msec ) override;
virtual ModbusRTU::mbErrCode sendData( unsigned char* buf, int len ) override;
virtual ModbusRTU::mbErrCode tcp_processing( ost::TCPStream& tcp, ModbusTCP::MBAPHeader& mhead );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment