(modbus): make style

src/Communications/Modbus/ModbusHelpers.cc

@@ -21,146 +21,146 @@
 // -------------------------------------------------------------------------
 namespace uniset
 {
-	// -------------------------------------------------------------------------
-	using namespace std;
-	using namespace ModbusRTU;
-	using namespace uniset;
-	// -------------------------------------------------------------------------
-	static ComPort::Speed checkSpeed[] =
-	{
-		ComPort::ComSpeed9600,
-		ComPort::ComSpeed19200,
-		ComPort::ComSpeed38400,
-		ComPort::ComSpeed57600,
-		ComPort::ComSpeed4800,
-		ComPort::ComSpeed115200,
-		ComPort::ComSpeed0
-	};
-	// -------------------------------------------------------------------------
-	ModbusAddr ModbusHelpers::autodetectSlave( ModbusClient* m,
-			ModbusAddr beg, ModbusAddr end,
-			ModbusData reg,
-			SlaveFunctionCode fn )
-	{
-		if( beg > end )
-		{
-			ModbusAddr tmp = beg;
-			beg = end;
-			end = tmp;
-		}
+    // -------------------------------------------------------------------------
+    using namespace std;
+    using namespace ModbusRTU;
+    using namespace uniset;
+    // -------------------------------------------------------------------------
+    static ComPort::Speed checkSpeed[] =
+    {
+        ComPort::ComSpeed9600,
+        ComPort::ComSpeed19200,
+        ComPort::ComSpeed38400,
+        ComPort::ComSpeed57600,
+        ComPort::ComSpeed4800,
+        ComPort::ComSpeed115200,
+        ComPort::ComSpeed0
+    };
+    // -------------------------------------------------------------------------
+    ModbusAddr ModbusHelpers::autodetectSlave( ModbusClient* m,
+            ModbusAddr beg, ModbusAddr end,
+            ModbusData reg,
+            SlaveFunctionCode fn )
+    {
+        if( beg > end )
+        {
+            ModbusAddr tmp = beg;
+            beg = end;
+            end = tmp;
+        }
 
-		for( ModbusAddr a = beg; a <= end; a++ )
-		{
-			try
-			{
-				if( fn == fnReadInputRegisters )
-				{
-					m->read04(a, reg, 1);
-				}
-				else if( fn == fnReadInputStatus )
-				{
-					m->read02(a, reg, 1);
-				}
-				else if( fn == fnReadCoilStatus )
-				{
-					m->read01(a, reg, 1);
-				}
-				else if( fn == fnReadOutputRegisters )
-				{
-					m->read03(a, reg, 1);
-				}
-				else
-					throw mbException(erOperationFailed);
+        for( ModbusAddr a = beg; a <= end; a++ )
+        {
+            try
+            {
+                if( fn == fnReadInputRegisters )
+                {
+                    m->read04(a, reg, 1);
+                }
+                else if( fn == fnReadInputStatus )
+                {
+                    m->read02(a, reg, 1);
+                }
+                else if( fn == fnReadCoilStatus )
+                {
+                    m->read01(a, reg, 1);
+                }
+                else if( fn == fnReadOutputRegisters )
+                {
+                    m->read03(a, reg, 1);
+                }
+                else
+                    throw mbException(erOperationFailed);
 
-				return a;
-			}
-			catch( ModbusRTU::mbException& ex )
-			{
-				if( ex.err < erInternalErrorCode )
-					return a; // узел ответил ошибкой (но связь то есть)
-			}
-			catch(...) {}
+                return a;
+            }
+            catch( ModbusRTU::mbException& ex )
+            {
+                if( ex.err < erInternalErrorCode )
+                    return a; // узел ответил ошибкой (но связь то есть)
+            }
+            catch(...) {}
 
-			if( (beg == 0xff) || (end == 0xff) )
-				break;
-		}
+            if( (beg == 0xff) || (end == 0xff) )
+                break;
+        }
 
-		throw TimeOut();
-	}
-	// -------------------------------------------------------------------------
+        throw TimeOut();
+    }
+    // -------------------------------------------------------------------------
 
-	ModbusAddr ModbusHelpers::autodetectSlave(  std::string dev, ComPort::Speed s, int tout,
-			ModbusAddr beg, ModbusAddr end,
-			ModbusData reg,
-			SlaveFunctionCode fn )
-	{
-		ModbusRTUMaster mb(dev);
-		mb.setSpeed(s);
-		mb.setTimeout(tout);
-		return autodetectSlave( &mb, beg, end, reg, fn );
-	}
-	// -------------------------------------------------------------------------
+    ModbusAddr ModbusHelpers::autodetectSlave(  std::string dev, ComPort::Speed s, int tout,
+            ModbusAddr beg, ModbusAddr end,
+            ModbusData reg,
+            SlaveFunctionCode fn )
+    {
+        ModbusRTUMaster mb(dev);
+        mb.setSpeed(s);
+        mb.setTimeout(tout);
+        return autodetectSlave( &mb, beg, end, reg, fn );
+    }
+    // -------------------------------------------------------------------------
 
-	ComPort::Speed ModbusHelpers::autodetectSpeed( ModbusRTUMaster* m, ModbusAddr slave,
-			ModbusData reg, SlaveFunctionCode fn )
-	{
-		ComPort::Speed cur = m->getSpeed();
-		ComPort::Speed s = ComPort::ComSpeed0;
+    ComPort::Speed ModbusHelpers::autodetectSpeed( ModbusRTUMaster* m, ModbusAddr slave,
+            ModbusData reg, SlaveFunctionCode fn )
+    {
+        ComPort::Speed cur = m->getSpeed();
+        ComPort::Speed s = ComPort::ComSpeed0;
 
-		for( unsigned int i = 0; checkSpeed[i] != ComPort::ComSpeed0; i++ )
-		{
-			try
-			{
-				m->setSpeed( checkSpeed[i] );
+        for( unsigned int i = 0; checkSpeed[i] != ComPort::ComSpeed0; i++ )
+        {
+            try
+            {
+                m->setSpeed( checkSpeed[i] );
 
-				if( fn == fnReadInputRegisters )
-				{
-					m->read04(slave, reg, 1);
-				}
-				else if( fn == fnReadInputStatus )
-				{
-					m->read02(slave, reg, 1);
-				}
-				else if( fn == fnReadCoilStatus )
-				{
-					m->read01(slave, reg, 1);
-				}
-				else if( fn == fnReadOutputRegisters )
-				{
-					m->read03(slave, reg, 1);
-				}
-				else
-					throw mbException(erOperationFailed);
+                if( fn == fnReadInputRegisters )
+                {
+                    m->read04(slave, reg, 1);
+                }
+                else if( fn == fnReadInputStatus )
+                {
+                    m->read02(slave, reg, 1);
+                }
+                else if( fn == fnReadCoilStatus )
+                {
+                    m->read01(slave, reg, 1);
+                }
+                else if( fn == fnReadOutputRegisters )
+                {
+                    m->read03(slave, reg, 1);
+                }
+                else
+                    throw mbException(erOperationFailed);
 
 
-				s = checkSpeed[i];
-				break;
-			}
-			catch( ModbusRTU::mbException& ex )
-			{
-				if( ex.err < erInternalErrorCode )
-				{
-					s = checkSpeed[i];
-					break; // узел ответил ошибкой (но связь то есть)
-				}
-			}
-			catch(...) {}
-		}
+                s = checkSpeed[i];
+                break;
+            }
+            catch( ModbusRTU::mbException& ex )
+            {
+                if( ex.err < erInternalErrorCode )
+                {
+                    s = checkSpeed[i];
+                    break; // узел ответил ошибкой (но связь то есть)
+                }
+            }
+            catch(...) {}
+        }
 
-		m->setSpeed(cur);
+        m->setSpeed(cur);
 
-		if( s != ComPort::ComSpeed0 )
-			return s;
+        if( s != ComPort::ComSpeed0 )
+            return s;
 
-		throw TimeOut();
-	}
-	// -------------------------------------------------------------------------
-	ComPort::Speed ModbusHelpers::autodetectSpeed( std::string dev, ModbusRTU::ModbusAddr slave, int tout,
-			ModbusData reg, SlaveFunctionCode fn )
-	{
-		ModbusRTUMaster mb(dev);
-		mb.setTimeout(tout);
-		return autodetectSpeed( &mb, slave, reg, fn );
-	}
-	// -------------------------------------------------------------------------
+        throw TimeOut();
+    }
+    // -------------------------------------------------------------------------
+    ComPort::Speed ModbusHelpers::autodetectSpeed( std::string dev, ModbusRTU::ModbusAddr slave, int tout,
+            ModbusData reg, SlaveFunctionCode fn )
+    {
+        ModbusRTUMaster mb(dev);
+        mb.setTimeout(tout);
+        return autodetectSpeed( &mb, slave, reg, fn );
+    }
+    // -------------------------------------------------------------------------
 } // end of namespace uniset

src/Communications/Modbus/ModbusServerSlot.cc

@@ -18,92 +18,92 @@
 // -------------------------------------------------------------------------
 namespace uniset
 {
-	// -------------------------------------------------------------------------
-	using namespace ModbusRTU;
-	using namespace std;
-	// -------------------------------------------------------------------------
-	ModbusServerSlot::ModbusServerSlot()
-	{
-	}
-	// -------------------------------------------------------------------------
-	ModbusServerSlot::~ModbusServerSlot()
-	{
+    // -------------------------------------------------------------------------
+    using namespace ModbusRTU;
+    using namespace std;
+    // -------------------------------------------------------------------------
+    ModbusServerSlot::ModbusServerSlot()
+    {
+    }
+    // -------------------------------------------------------------------------
+    ModbusServerSlot::~ModbusServerSlot()
+    {
 
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectReadCoil( ReadCoilSlot sl )
-	{
-		slReadCoil = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectReadInputStatus( ReadInputStatusSlot sl )
-	{
-		slReadInputStatus = sl;
-	}
-	// -------------------------------------------------------------------------
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectReadCoil( ReadCoilSlot sl )
+    {
+        slReadCoil = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectReadInputStatus( ReadInputStatusSlot sl )
+    {
+        slReadInputStatus = sl;
+    }
+    // -------------------------------------------------------------------------
 
-	void ModbusServerSlot::connectReadOutput( ReadOutputSlot sl )
-	{
-		slReadOutputs = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectReadInput( ReadInputSlot sl )
-	{
-		slReadInputs = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectForceCoils( ForceCoilsSlot sl )
-	{
-		slForceCoils = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectWriteOutput( WriteOutputSlot sl )
-	{
-		slWriteOutputs = sl;
-	}
+    void ModbusServerSlot::connectReadOutput( ReadOutputSlot sl )
+    {
+        slReadOutputs = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectReadInput( ReadInputSlot sl )
+    {
+        slReadInputs = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectForceCoils( ForceCoilsSlot sl )
+    {
+        slForceCoils = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectWriteOutput( WriteOutputSlot sl )
+    {
+        slWriteOutputs = sl;
+    }
 
-	// ------------------------------------------------------------------------
-	void ModbusServerSlot::connectWriteSingleOutput( WriteSingleOutputSlot sl )
-	{
-		slWriteSingleOutputs = sl;
-	}
+    // ------------------------------------------------------------------------
+    void ModbusServerSlot::connectWriteSingleOutput( WriteSingleOutputSlot sl )
+    {
+        slWriteSingleOutputs = sl;
+    }
 
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectDiagnostics( DiagnosticsSlot sl )
-	{
-		slDiagnostics = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectMEIRDI( MEIRDISlot sl )
-	{
-		slMEIRDI = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectForceSingleCoil( ForceSingleCoilSlot sl )
-	{
-		slForceSingleCoil = sl;
-	}
-	// -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectDiagnostics( DiagnosticsSlot sl )
+    {
+        slDiagnostics = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectMEIRDI( MEIRDISlot sl )
+    {
+        slMEIRDI = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectForceSingleCoil( ForceSingleCoilSlot sl )
+    {
+        slForceSingleCoil = sl;
+    }
+    // -------------------------------------------------------------------------
 
-	void ModbusServerSlot::connectJournalCommand( JournalCommandSlot sl )
-	{
-		slJournalCommand = sl;
-	}
+    void ModbusServerSlot::connectJournalCommand( JournalCommandSlot sl )
+    {
+        slJournalCommand = sl;
+    }
 
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectSetDateTime( SetDateTimeSlot sl )
-	{
-		slSetDateTime = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectRemoteService( RemoteServiceSlot sl )
-	{
-		slRemoteService = sl;
-	}
-	// -------------------------------------------------------------------------
-	void ModbusServerSlot::connectFileTransfer( FileTransferSlot sl )
-	{
-		slFileTransfer = sl;
-	}
-	// -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectSetDateTime( SetDateTimeSlot sl )
+    {
+        slSetDateTime = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectRemoteService( RemoteServiceSlot sl )
+    {
+        slRemoteService = sl;
+    }
+    // -------------------------------------------------------------------------
+    void ModbusServerSlot::connectFileTransfer( FileTransferSlot sl )
+    {
+        slFileTransfer = sl;
+    }
+    // -------------------------------------------------------------------------
 } // end of namespace uniset