(2.0): - Заменил ТАБУЛЯЦИИ НА ПРОБЕЛЫ по всем исходным файлам - Небольшая…

Utilities/MBTester/MBSlave.h

@@ -94,9 +94,6 @@ class MBSlave
         ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
                                                         ModbusRTU::MEIMessageRetRDI& reply );
 
-		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
-														ModbusRTU::MEIMessageRetRDI& reply );
-
         /*! интерфейс ModbusRTUSlave для обмена по RS */
         ModbusRTUSlaveSlot* rscomm;
         ModbusRTU::ModbusAddr addr;            /*!< адрес данного узла */

Utilities/MBTester/MBTCPServer.h

@@ -23,11 +23,6 @@ class MBTCPServer
             replyVal = val;
         }
 
-		inline void setReply( long val )
-		{
-			replyVal = val;
-		}
-
         inline void setIgnoreAddrMode( bool state )
         {
             if( sslot )
@@ -80,9 +75,6 @@ class MBTCPServer
         ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
                                                         ModbusRTU::MEIMessageRetRDI& reply );
 
-		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
-														ModbusRTU::MEIMessageRetRDI& reply );
-
         /*! обработка запросов на чтение ошибок */
         ModbusRTU::mbErrCode journalCommand( ModbusRTU::JournalCommandMessage& query,
                                                             ModbusRTU::JournalCommandRetMessage& reply );

Utilities/codegen/ctl-cpp-common.xsl

@@ -611,6 +611,7 @@ end_private(false)
 	<xsl:if test="normalize-space(@no_check_id)!='1'">
 	if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
 		throw Exception( myname + ": Not found ID for (<xsl:value-of select="@name"/>) " + conf->getProp(cnode,"<xsl:value-of select="@name"/>") );
+
 	</xsl:if>
 
 	if( node_<xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )

Utilities/codegen/tests/TestGen.cc

-#include <iomanip>
 #include "Exceptions.h"
-#include "TestProc.h"
+#include "TestGen.h"
 // -----------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
 // -----------------------------------------------------------------------------
-TestProc::TestProc( UniSetTypes::ObjectId id, xmlNode* confnode ):
-	TestProc_SK( id, confnode ),
-	state(false)
+TestGen::TestGen( UniSetTypes::ObjectId id, xmlNode* confnode ):
+    TestGen_SK( id, confnode )
 {
-	loglevels.push_back(Debug::INFO);
-	loglevels.push_back(Debug::WARN);
-	loglevels.push_back(Debug::CRIT);
-	loglevels.push_back(Debug::LEVEL1);
-	loglevels.push_back(Debug::LEVEL2);
-	loglevels.push_back( Debug::type(Debug::LEVEL2 | Debug::INFO) );
-	loglevels.push_back( Debug::type(Debug::LEVEL2 | Debug::INFO | Debug::WARN | Debug::CRIT) );
-
-	lit = loglevels.begin();
-	out_log_c = (*lit);
 }
 // -----------------------------------------------------------------------------
-TestProc::~TestProc()
+TestGen::~TestGen()
 {
 }
 // -----------------------------------------------------------------------------
-TestProc::TestProc():
-	state(false)
+TestGen::TestGen()
 {
     cerr << ": init failed!!!!!!!!!!!!!!!"<< endl;
     throw Exception();
 }
 // -----------------------------------------------------------------------------
-void TestProc::step()
+void TestGen::step()
 {
+    cout << "input2 state=" << in_input2_s << endl;
 }
 // -----------------------------------------------------------------------------
-void TestProc::sysCommand( UniSetTypes::SystemMessage* sm )
+void TestGen::sensorInfo( SensorMessage *sm )
 {
-	TestProc_SK::sysCommand(sm);
-    if( sm->command == SystemMessage::StartUp || sm->command == SystemMessage::WatchDog )
-    {
-        askTimer(tmCheck,checkTime);
-        askTimer(tmCheckWorking,checkWorkingTime);
-		askTimer(tmLogControl,checkLogTime);
-
-        // В начальный момент времени блокирующий датчик =0, поэтому d2_check_s должен быть равен depend_off_value (-50).
-       cerr << myname << "(startup): check init depend: " << ( getValue(d2_check_s) == -50 ? "OK" : "FAIL" ) << endl;
-    }
+    if( sm->id == input1_s )
+        out_output1_c = in_input1_s; // sm->state
 }
 // -----------------------------------------------------------------------------
-void TestProc::sensorInfo( SensorMessage *sm )
+void TestGen::timerInfo( TimerMessage *tm )
 {
-/*
-	dlog.level2() << myname << "(sensorInfo): id=" << sm->id << " val=" << sm->value
-			<< "  " << timeToString(sm->sm_tv_sec,":")
-			<< "(" << setw(6) << sm->sm_tv_usec << "): "
-			<< endl;
-*/
-	if( sm->id == on_s )
-	{
-		if( sm->value )
-		{
-			cerr << myname << "(sensorInfo): START WORKING.." << endl;
-			askTimer(tmChange,changeTime);
-		}
-	    else
-	    {
-			askTimer(tmChange,0);
-			cerr << myname << "(sensorInfo): STOP WORKING.." << endl;
-		}
-	}
-	else if( sm->id == check_undef_s )
-	{
-		cerr << myname << "(sensorInfo): CHECK UNDEFINED STATE ==> " << (sm->undefined==undef ? "OK" : "FAIL") << endl;
-	}
 }
 // -----------------------------------------------------------------------------
-void TestProc::timerInfo( TimerMessage *tm )
+void TestGen::sigterm( int signo )
 {
-	if( tm->id == tmChange )
-	{
-		state^=true;
-		out_lamp_c = ( state ? lmpBLINK : lmpOFF );
-		dlog.level2() << myname << ": state=" << state << " lmp=" << out_lamp_c << endl;
-        askTimer(tmCheckWorking,checkTime); // reset timer
-	}
-	else if( tm->id == tmCheckWorking )
-       cerr << myname << ": WORKING FAIL!" << endl;
-	else if( tm->id == tmCheck )
-	{
-		cerr << endl << endl << "--------" << endl;
-        test_depend();
-        test_undefined_state();
-        test_thresholds();
-        test_loglevel();
-	}
-	else if( tm->id == tmLogControl )
-	{
-		cerr << endl;
-		cerr << "======= TEST LOG PRINT ======" << endl;
-		cerr << "LOGLEVEL: [" << (int)(*lit) << "] " << (*lit) << endl;
-		for( std::vector<Debug::type>::iterator it=loglevels.begin(); it!=loglevels.end(); ++it )
-			dlog[*it] << myname << ": test log print..." << endl;
-
-		cerr << "======= END LOG PRINT ======" << endl;
-	}
-}
-// -----------------------------------------------------------------------------
-void TestProc::test_depend()
-{
-    cerr << myname << ": Check depend..." << endl;
-
-    long test_val = 100;
-
-    // set depend 0...
-    setValue(depend_c,0);
-    setValue(set_d1_check_s,test_val);
-    setValue(set_d2_check_s,test_val);
-    cerr << myname << ": check depend OFF: d1: " << ( getValue(d1_check_s) == 0 ? "OK" : "FAIL" ) << endl;
-    cerr << myname << ": check depend OFF: d2: " << ( getValue(d2_check_s) == -50 ? "OK" : "FAIL" ) << endl;
-
-    // set depend 1
-    setValue(depend_c,1);
-    cerr << myname << ": check depend ON: d1: " << ( getValue(d1_check_s) == test_val ? "OK" : "FAIL" ) << endl;
-    cerr << myname << ": check depend ON: d2: " << ( getValue(d2_check_s) == test_val ? "OK" : "FAIL" ) << endl;
-}
-// -----------------------------------------------------------------------------
-void TestProc::test_undefined_state()
-{
-    // ---------------- Проверка выставления неопределённого состояния ---------------------
-    cerr << myname << ": Check undef state..." << endl;
-    undef ^= true;
-
-    si.id = undef_c;
-    si.node = conf->getLocalNode();
-    cerr << myname << ": set undefined=" << undef << endl;
-    ui.setUndefinedState( si, undef, getId() );
-}
-// -----------------------------------------------------------------------------
-void TestProc::test_thresholds()
-{
-    // ---------------- Проверка работы порогов ---------------------
-    cerr << myname << ": Check thresholds..." << endl;
-
-    setValue(t_set_c,0);
-    cerr << myname << ": check threshold OFF value: " << ( getValue(t_check_s) == 0 ? "OK" : "FAIL" ) << endl;
-
-    setValue(t_set_c,378);
-    cerr << myname << ": check threshold ON value: " << ( getValue(t_check_s) == 1 ? "OK" : "FAIL" ) << endl;
-
-	cerr << myname << ": ask threshold and check.. " << endl;
-
-	try
-	{
-		setValue(t_set_c, 0);
-		UniSetTypes::ThresholdId tid = 100;
-		ui.askThreshold( t_set_c, tid, UniversalIO::UIONotify, 10, 20 );
-
-		IONotifyController_i::ThresholdInfo ti = ui.getThresholdInfo(t_set_c,tid);
-		cerr << myname << ": ask OFF threshold: " << ( ti.state == IONotifyController_i::NormalThreshold  ? "OK" : "FAIL" ) << endl;
-		setValue(t_set_c, 25);
-		ti = ui.getThresholdInfo(t_set_c,tid);
-		cerr << myname << ": ask ON threshold: " << ( ti.state == IONotifyController_i::HiThreshold  ? "OK" : "FAIL" ) << endl;
-	}
-	catch( Exception& ex )
-	{
-		dlog.level2() << myname << ": CHECK 'ask and get threshold' FAILED: " << ex << endl;
-	}
-}
-// -----------------------------------------------------------------------------
-void TestProc::test_loglevel()
-{
-	lit++;
-	if( lit == loglevels.end() )
-		lit = loglevels.begin();
-
-	cerr << "SET LOGLEVEL: [" << (int)(*lit) << "] " << (*lit) << endl;
-	setValue(log_c, (*lit));
-	askTimer(tmLogControl,checkLogTime);
+    TestGen_SK::sigterm(signo);
 }
 // -----------------------------------------------------------------------------

Utilities/codegen/tests/TestGen.h

 // -----------------------------------------------------------------------------
-#ifndef TestProc_H_
-#define TestProc_H_
+#ifndef TestGen_H_
+#define TestGen_H_
 // -----------------------------------------------------------------------------
-#include <vector>
-#include "Debug.h"
-#include "TestProc_SK.h"
+#include "TestGen_SK.h"
 // -----------------------------------------------------------------------------
-class TestProc:
-	public TestProc_SK
+class TestGen:
+    public TestGen_SK
 {
     public:
-		TestProc( UniSetTypes::ObjectId id, xmlNode* confnode = UniSetTypes::conf->getNode("TestProc") );
-		virtual ~TestProc();
+        TestGen( UniSetTypes::ObjectId id, xmlNode* confnode = UniSetTypes::conf->getNode("TestGen") );
+        virtual ~TestGen();
 
-	protected:
-		TestProc();
 
-		enum Timers
-		{
-			tmChange,
-			tmCheckWorking,
-			tmCheck,
-			tmLogControl
-		};
+    protected:
+        TestGen();
 
         virtual void step();
-		virtual void sensorInfo( UniSetTypes::SensorMessage *sm );
-		virtual void timerInfo( UniSetTypes::TimerMessage *tm );
-        virtual void sysCommand( UniSetTypes::SystemMessage* sm );
-		
-        void test_depend();
-        void test_undefined_state();
-        void test_thresholds();
-        void test_loglevel();
+        void sensorInfo( UniSetTypes::SensorMessage *sm );
+        void timerInfo( UniSetTypes::TimerMessage *tm );
+        virtual void sigterm( int signo );
 
     private:
-		bool state;
-		bool undef;
-
-		std::vector<Debug::type> loglevels;
-		std::vector<Debug::type>::iterator lit;
 };
 // -----------------------------------------------------------------------------
-#endif // TestProc_H_
+#endif // TestGen_H_
 // -----------------------------------------------------------------------------

conf/test.xml

@@ -148,7 +148,7 @@
 			</rrd>
 		</RRDServer1>
 	</settings>
-	<ObjectsMap idfromfile="0">
+	<ObjectsMap idfromfile="1">
 		<!--
 	Краткие пояснения к полям секции 'sensors'
 	==========================================
@@ -273,7 +273,6 @@
 	</messages>
 	<!-- <xi:include href="testID.xml"/> -->
 	<!-- <xi:include href="testIDnon-exist.xml"/> -->
-
 	<Calibrations name="Calibrations">
 		<diagram name="testcal">
 			<point x="-200" y="-60"/>

extensions/DBServer-MySQL/DBInterface.cc

@@ -54,7 +54,6 @@ bool DBInterface::connect( const string& host, const string& user, const string&
         connected = false;
         return false;
     }
-
     connected = true;
     return true;
 }
@@ -219,10 +218,9 @@ bool DBInterface::moveToRow(int ind)
 // -----------------------------------------------------------------------------------------
 bool DBInterface::ping()
 {
-	if(!mysql)
-		return false;
-	if(!connected)
+    if( !mysql || !connected )
         return false;
+
     // внимание mysql_ping возвращает 0
     // если всё хорошо.... (поэтому мы инвертируем)
     return !mysql_ping(mysql);

extensions/IOControl/IOControl.h

@@ -84,6 +84,10 @@
     <br>\b jardelay        - защита от дребезга. Задержка на дребезг, мсек.
     <br>\b ondelay         - задержка на срабатывание, мсек.
     <br>\b offdelay        - задержка на отпускание, мсек.
+    <br>\b iofront         - работа по фронту сигнала (для DI).
+    <br>                        "01" - срабатывание (и отпускание) по переходу "0 --> 1"
+    <br>                        "10" - срабатывание (и отпускание) по переходу "1 --> 0"
+
     <br>\b safety          - безопасное значение. Значение которое сохраняется в случае аварийного
                       завершения процесса.
 

extensions/LogicProcessor/TDelay.cc

@@ -30,10 +30,8 @@ void TDelay::setIn( int num, bool state )
     {
         pt.setTiming(0); // reset timer
         myout = false;
-
         if( dlog.is_info() )
             dlog.info() << this << ": set " << myout << endl;
-
         if( prev != myout )
             Element::setChildOut();
         return;
@@ -46,10 +44,8 @@ void TDelay::setIn( int num, bool state )
     {
         pt.setTiming(0); // reset timer
         myout = true;
-
         if( dlog.is_info() )
             dlog.info() << this << ": set " << myout << endl;
-
         if( prev != myout )
             Element::setChildOut();
         return;
@@ -60,7 +56,6 @@ void TDelay::setIn( int num, bool state )
     {
         if( dlog.is_info() )
             dlog.info() << this << ": set timer " << delay << " [msec]" << endl;
-
         pt.setTiming(delay);
     }
 }

extensions/LogicProcessor/TOR.cc

@@ -62,7 +62,6 @@ void TOR::setIn( int num, bool state )
 
     if( dlog.is_info() )
         dlog.info() << this << ": myout " << myout << endl;
-
     if( prev != myout )
         Element::setChildOut();
 }

extensions/ModbusMaster/MBExchange.cc

@@ -2411,7 +2411,11 @@ std::ostream& operator<<( std::ostream& os, const MBExchange::RSProperty& p )
 // -----------------------------------------------------------------------------
 void MBExchange::initDeviceList()
 {
-	xmlNode* respNode = conf->findNode(cnode,"DeviceList");
+    xmlNode* respNode = 0;
+    UniXML* xml = conf->getConfXML();
+    if( xml )
+        respNode = xml->extFindNode(cnode,1,1,"DeviceList");
+
     if( respNode )
     {
         UniXML_iterator it1(respNode);
@@ -2480,7 +2484,6 @@ bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXM
 
     if( dlog.is_info() )
         dlog.info() << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a) << endl;
-
     int tout = it.getPIntProp("timeout",5000);
     d->second->resp_ptTimeout.setTiming(tout);
     d->second->resp_invert = it.getIntProp("invert");

extensions/ModbusMaster/MBExchange.h

@@ -325,16 +325,6 @@ class MBExchange:
         PassiveTimer ptReopen; /*!< таймер для переоткрытия соединения */
         Trigger trReopen;
 
-		// т.к. пороговые датчики не связаны напрямую с обменом, создаём для них отдельный список
-		// и отдельно его проверяем потом
-		typedef std::list<IOBase> ThresholdList;
-		ThresholdList thrlist;
-
-		int aftersend_pause;
-
-		PassiveTimer ptReopen; /*!< таймер для переоткрытия соединения */
-		Trigger trReopen;
-
      private:
         MBExchange();
 

extensions/ModbusMaster/mtr-setup.cc

@@ -363,6 +363,7 @@ int main( int argc, char **argv )
                 return 1;
         }
 
+        return 0;
     }
     catch( ModbusRTU::mbException& ex )
     {
@@ -381,7 +382,7 @@ int main( int argc, char **argv )
         cerr << "(mtr-setup): catch(...)" << endl;
     }
 
-	return 0;
+    return 1;
 }
 // --------------------------------------------------------------------------
 char* checkArg( int i, int argc, char* argv[] )

extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -5,10 +5,18 @@
 --mbtcp-name MBMaster1 \
 --smemory-id SharedMemory \
 --dlog-add-levels info,crit,warn,level4,level3 \
---mbtcp-filter-field mbtcp \
---mbtcp-filter-value 1 \
+--mbtcp-set-prop-prefix \
+--mbtcp-filter-field rs \
+--mbtcp-filter-value 5 \
 --mbtcp-gateway-iaddr 127.0.0.1 \
 --mbtcp-gateway-port 2048 \
 --mbtcp-recv-timeout 5000 \
---mbtcp-force-disconnect 1
+--mbtcp-force-disconnect 1 \
+--mbtcp-polltime 3000 \
+--mbtcp-force-out 1 \
+$*
+
+#--mbtcp-exchange-mode-id MB1_Mode_AS \
 #--mbtcp-filter-field mbtcp --mbtcp-filter-value 1
+#--mbtcp-set-prop-prefix rs_ \
+

extensions/ModbusMaster/vtconv.cc

@@ -14,7 +14,7 @@ static void print_help()
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
 {
-
+/*
     VTypes::F2 f2;
     f2.raw.val = 2.345;
 
@@ -58,8 +58,7 @@ int main( int argc, const char **argv )
     cout << "-------------" << endl << endl;
 
 //    return 0;
-
-
+*/
     unsigned short v[4];
     memset(v,0,sizeof(v));
 

extensions/ModbusSlave/MBSlave.cc

@@ -1490,7 +1490,6 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
     {
          if( dlog.is_warn() )
             dlog.warn() << myname << "(readInputStatus): " << ex << endl;
-
         return ModbusRTU::erBadDataAddress;
     }
     catch( Exception& ex )

extensions/SharedMemory/SharedMemory.cc

@@ -4,6 +4,7 @@
 #include "NCRestorer.h"
 #include "SharedMemory.h"
 #include "Extensions.h"
+#include "ORepHelpers.h"
 // -----------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
@@ -55,11 +56,9 @@ SharedMemory::SharedMemory( ObjectId id, string datafile, std::string confname )
 
     // ----------------------
     buildHistoryList(cnode);
-
     signal_change_value().connect(sigc::mem_fun(*this, &SharedMemory::updateHistory));
     for( History::iterator i=hist.begin(); i!=hist.end(); ++i )
         histmap[i->fuse_id].push_back(i);
-
     // ----------------------
     restorer = NULL;
     NCRestorer_XML* rxml = new NCRestorer_XML(datafile);
@@ -814,8 +813,7 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
         else if( s_it->second.type == UniversalIO::AI ||
                  s_it->second.type == UniversalIO::AO )
         {
-			if( sm->sensor_type == UniversalIO::DigitalInput ||
-				sm->sensor_type == UniversalIO::DigitalOutput )
+            if( !it->fuse_use_val )
             {
                 bool st = (bool)value;
 
@@ -832,8 +830,7 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
                     m_historySignal.emit( &(*it) );
                 }
             }
-			else if( sm->sensor_type == UniversalIO::AnalogInput ||
-					 sm->sensor_type == UniversalIO::AnalogOutput )
+            else
             {
                 if( value == it->fuse_val )
                 {

extensions/SharedMemory/SharedMemory.h

@@ -432,8 +432,6 @@ class SharedMemory:
         IOController_i::SensorInfo siPulsar;
         int msecPulsar;
 
-		UniSetTypes::uniset_mutex act_mutex;
-
         UniSetTypes::uniset_rwmutex mutex_act;
 
     private: