revise rinse bug

CyberX8_RT/Modules/Rinse/RinseSecondStepRoutine.cs

@@ -229,7 +229,7 @@ namespace CyberX8_RT.Modules.Rinse
         /// <returns></returns>
         private bool N2ValveOff()
         {
-            if (_recipe.Step1N2BubbleOn)
+            if (_recipe.Step2N2BubbleOn)
             {
                 return _device.N2ValveOff();
             }
@@ -244,7 +244,7 @@ namespace CyberX8_RT.Modules.Rinse
         /// <returns></returns>
         private bool CheckN2ValveOff()
         {
-            if (_recipe.Step1N2BubbleOn)
+            if (_recipe.Step2N2BubbleOn)
             {
                 return !_device.RinseData.N2Valve;
             }

CyberX8_Themes/UserControls/RinseUIControl.xaml.cs

@@ -51,11 +51,11 @@ namespace CyberX8_Themes.UserControls
         /// <summary>
         /// RinseData
         /// </summary>
-        public bool RinseCommonData
+        public RinseData RinseCommonData
         {
             get
             {
-                return (bool)this.GetValue(RinseCommonDataProperty);
+                return (RinseData)this.GetValue(RinseCommonDataProperty);
             }
             set
             {