Add explicit to constructor

savushkin-r-d · Aug 1, 2023 · a8a7adf · a8a7adf
1 parent dfe3ae9
commit a8a7adf
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/PAC/common/PAC_dev.cpp b/PAC/common/PAC_dev.cpp
@@ -3227,6 +3227,32 @@ digital_io_device::digital_io_device( const char *dev_name, device::DEVICE_TYPE
 digital_io_device::~digital_io_device()
     {
     }
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+#ifndef DEBUG_NO_IO_MODULES
+
+int valve_DO2::get_state()
+    {
+    int b1 = get_DO( DO_INDEX_1 );
+    int b2 = get_DO( DO_INDEX_2 );
+    if ( b1 == b2 ) return -1;
+    return b2;
+    }
+//-----------------------------------------------------------------------------
+void valve_DO2::direct_on()
+    {
+    set_DO( DO_INDEX_1, 0 );
+    set_DO( DO_INDEX_2, 1 );
+    }
+//-----------------------------------------------------------------------------
+void valve_DO2::direct_off()
+    {
+    set_DO( DO_INDEX_1, 1 );
+    set_DO( DO_INDEX_2, 0 );
+    }
+
+#endif // DEBUG_NO_IO_MODULES
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 valve::valve( bool is_on_fb, bool is_off_fb, const char *dev_name,

diff --git a/PAC/common/PAC_dev.h b/PAC/common/PAC_dev.h
@@ -1304,7 +1304,7 @@ class valve_DO1_DI2 : public valve
 class valve_DO2_DI2 : public valve
     {
     public:
-        valve_DO2_DI2( const char *dev_name ):
+       explicit valve_DO2_DI2( const char *dev_name ):
             valve( true, true, dev_name, DT_V, DST_V_DO2_DI2 )
             {
             }
@@ -3736,6 +3736,19 @@ class valve_DO2 : public valve
         valve_DO2( const char *dev_name ): valve( dev_name, DT_V, DST_V_DO2 )
             {
             }
+#ifndef DEBUG_NO_IO_MODULES
+    public:
+        int  get_state();
+        void direct_on();
+        void direct_off();
+
+    private:
+        enum CONSTANTS
+            {
+            DO_INDEX_1 = 0, ///< Индекс канала дискретного выхода №1.
+            DO_INDEX_2,     ///< Индекс канала дискретного выхода №2.
+            };
+#endif // DEBUG_NO_IO_MODULES
     };
 //-----------------------------------------------------------------------------
 class i_motor : public device