no message

Dev/OHV/OHV.Common/Shareds/SharedEnumType.cs

@@ -135,10 +135,15 @@
 		DisConnect,
 		Connect
 	}
+	public enum eTCZState			//Kkm 추가
+	{
+		None,
+		TCZ
+	}
 
-    #endregion
+	#endregion
 
-    #region Command
+	#region Command
 	public enum eCommandByWho
 	{
 		Host,

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoView.xaml

@@ -16,7 +16,6 @@
              xmlns:c ="clr-namespace:GSG.NET.WPF.CalcBinding;assembly=GSG.NET.WPF"
              xmlns:media ="clr-namespace:System.Windows.Media;assembly=PresentationCore"
              xmlns:OHVCommonShareds="clr-namespace:OHV.Common.Shareds;assembly=OHV.Common"
-             xmlns:OHVCommonEvents="clr-namespace:OHV.Common.Events;assembly=OHV.Common"
              >
 
     <prism:Dialog.WindowStyle>
@@ -455,7 +454,9 @@
                 </StackPanel>
             </Grid>
 
-            <TextBlock x:Name="ocsMessage" Text="{DynamicResource SettingView_DriveWarning}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,-140,0,-194" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'OcsState == OHVCommonShareds:eOcsState.DisConnect'}">
+            <TextBlock x:Name="ocsMessage" Text="{DynamicResource SettingView_DriveWarning}" HorizontalAlignment="Left" 
+                       TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,-140,0,-194" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" 
+                       Visibility="{c:Binding 'OcsState == OHVCommonShareds:eOcsState.DisConnect'}">
                 <TextBlock.Triggers>
                     <EventTrigger RoutedEvent="TextBlock.Loaded">
                         <BeginStoryboard>
@@ -470,7 +471,10 @@
                     </EventTrigger>
                 </TextBlock.Triggers>
             </TextBlock>
-            <TextBlock x:Name="tczMessage" Text="{DynamicResource SettingView_TCZState}" HorizontalAlignment="Left" TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,526,0,-132" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" Visibility="{c:Binding 'IsTCZ == OHVCommonEvents:TCZEventArgs:eTCZState.TCZ'}">
+            <TextBlock x:Name="tczMessage" Text="{DynamicResource SettingView_TCZState}" HorizontalAlignment="Left" 
+                       TextWrapping="Wrap" TextAlignment="Center" Foreground="Red" VerticalAlignment="Top" Margin="0,526,0,-132" Grid.Row="1" Height="100" Width="1126" FontSize="78" Grid.ColumnSpan="2" 
+                       Visibility="{c:Binding 'IsTCZ == OHVCommonShareds:eTCZState.TCZ'}">
+
                 <TextBlock.Triggers>
                     <EventTrigger RoutedEvent="TextBlock.Loaded">
                         <BeginStoryboard>

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -23,7 +23,7 @@ using VehicleControlSystem.ControlLayer;
 using VehicleControlSystem.ControlLayer.IO;
 using VehicleControlSystem.ControlLayer.MQ;
 using VehicleControlSystem.Managers;
-using static OHV.Common.Events.TCZEventArgs;
+//using static OHV.Common.Events.TCZEventArgs;      //kkm 주석
 
 namespace OHV.Module.Interactivity.PopUp
 {
@@ -306,20 +306,7 @@ namespace OHV.Module.Interactivity.PopUp
 
         }
 
-        private void TCZStateCallBack(TCZEventArgs obj)
-        {
-            var state = obj.TCZState;
 
-            switch (state)
-            {
-                case eTCZState.TCZ:
-                    this.IsTCZ = eTCZState.TCZ;
-                    break;
-                case eTCZState.None:
-                    this.IsTCZ = eTCZState.None;
-                    break;
-            }
-        }
 
         private void ExecuteBreakOffCommand()
         {
@@ -348,10 +335,8 @@ namespace OHV.Module.Interactivity.PopUp
                 this.OcsState = eOcsState.Connect;
             }
 
-            if(zmqManager.IsTCZ)
-            {
-                this.IsTCZ = eTCZState.TCZ;
-            }
+            if(!zmqManager.IsTCZ)       //Kkm TCZ -> None 변경
+                this.IsTCZ = eTCZState.None;
 
             if (!vcSystem.ZmqManager.SetOperationState(eOperatationMode.ManualMode))
                 messageController.ShowNotificationView("Drive Manual Mode Change Fail", false);
@@ -646,7 +631,20 @@ namespace OHV.Module.Interactivity.PopUp
                     break;
             }
         }
+        private void TCZStateCallBack(TCZEventArgs obj)
+        {
+            var state = obj.TCZState;
 
+            switch (state)
+            {
+                case TCZEventArgs.eTCZState.TCZ:            //Kkm TCZEventArgs 추가
+                    this.IsTCZ = eTCZState.TCZ;
+                    break;
+                case TCZEventArgs.eTCZState.None:
+                    this.IsTCZ = eTCZState.None;
+                    break;
+            }
+        }
         private void ExecuteJogCommand(object obj)
         {
             if ( this.JogVelocity <= 0 )

Dev/OHV/VehicleControlSystem/ControlLayer/MQ/ZmqManager.cs

@@ -50,7 +50,6 @@ namespace VehicleControlSystem.ControlLayer.MQ
 
         VCSystem vcsSystem;
         HostManager hostManager;
-        //MessageController messageController;
         IEventAggregator eventAggregator;
 
         public event Action<BitArray> OnDriveAlarmBitArrayChg;
@@ -282,8 +281,10 @@ namespace VehicleControlSystem.ControlLayer.MQ
         #endregion
 
 
-        public ZmqManager()
+        public ZmqManager(IEventAggregator ea)
         {
+            eventAggregator = ea;
+
             //NetMQ.NetMQConfig.Cleanup();
         }
 
@@ -356,6 +357,8 @@ namespace VehicleControlSystem.ControlLayer.MQ
             this.subPoller = new NetMQPoller { this.sub };
             this.subPoller.RunAsync();
 
+           
+
             //this.eventAggregator.GetEvent<HostConnectedPubSubEvent>().Subscribe(OcsConnectCallBack, ThreadOption.UIThread, false);
         }
 
@@ -530,7 +533,7 @@ namespace VehicleControlSystem.ControlLayer.MQ
                             else
                             {
                                 IsTCZ = false;
-                                var tczState = new TCZEventArgs(TCZEventArgs.eTCZState.TCZ);
+                                var tczState = new TCZEventArgs(TCZEventArgs.eTCZState.None);
                                 this.eventAggregator.GetEvent<TCZStatePubsubEvent>().Publish(tczState);
                             }
 

Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -108,7 +108,7 @@ namespace VehicleControlSystem
             this.steering = new Steering();
 
             //ZeroMQ
-            this.ZmqManager = new ZmqManager();
+            this.ZmqManager = new ZmqManager(this.eventAggregator);
             this.ZmqManager.AssignRefObject(this.bMUManager, this.steering, this.IO);
             this.ZmqManager.Init();
 

Dev/OHVLoggerTest/OHVLoggerTest.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29905.134
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OHVDriveSimulator", "OHVLoggerTest\OHVDriveSimulator.csproj", "{29027F4C-8DFC-420E-9B5E-AA947A9D8DFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GSG.NET", "..\..\..\GSG\GSG\GSG.NET\GSG.NET.csproj", "{11E12A58-FDBC-444A-90E6-DB96B7E98FF4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{29027F4C-8DFC-420E-9B5E-AA947A9D8DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29027F4C-8DFC-420E-9B5E-AA947A9D8DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29027F4C-8DFC-420E-9B5E-AA947A9D8DFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11E12A58-FDBC-444A-90E6-DB96B7E98FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11E12A58-FDBC-444A-90E6-DB96B7E98FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11E12A58-FDBC-444A-90E6-DB96B7E98FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11E12A58-FDBC-444A-90E6-DB96B7E98FF4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Dev/OHVLoggerTest/OHVLoggerTest/Form1.Designer.cs

@@ -31,6 +31,7 @@
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
             this.listLog = new System.Windows.Forms.ListView();
+            this.button3 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // button1
@@ -62,11 +63,22 @@
             this.listLog.TabIndex = 2;
             this.listLog.UseCompatibleStateImageBehavior = false;
             // 
+            // button3
+            // 
+            this.button3.Location = new System.Drawing.Point(983, 150);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(75, 23);
+            this.button3.TabIndex = 3;
+            this.button3.Text = "button3";
+            this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.button3_Click);
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1106, 450);
+            this.Controls.Add(this.button3);
             this.Controls.Add(this.listLog);
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
@@ -81,6 +93,7 @@
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.ListView listLog;
+        private System.Windows.Forms.Button button3;
     }
 }
 

Dev/OHVLoggerTest/OHVLoggerTest/Form1.cs

@@ -225,6 +225,7 @@ namespace OHVDriveSimulator
             var redis = Redis.Instance;
             var currentPoint = redis.CurrentPointID();
             var targetPoint = redis.GetMovePoint();
+            //var tczState = redis.TczState();
 
             List<int> routeIDList = new List<int>();
             routeIDList.Add( currentPoint );
@@ -302,7 +303,12 @@ namespace OHVDriveSimulator
 
         private void button2_Click( object sender, EventArgs e )
         {
-            //RunDrive( 0 );
+            mq.TczState("1");
+        }
+
+        private void button3_Click(object sender, EventArgs e)
+        {
+            mq.TczState("0");
         }
     }
 

Dev/OHVLoggerTest/OHVLoggerTest/NetMq.cs

@@ -162,6 +162,12 @@ namespace OHVDriveSimulator
         public void SetCurrentTag( string tag, string segment ) => this.SetRequest( "3009", $"{tag}/{segment}" );
         #endregion
 
-
+        public bool TczState(string e)
+        {
+            
+            var oo = SetRequest("3065", e);
+            //return database.HashGet("3065", "7").ToString().Equals("1") ? true : false;
+            return true;
+        }
     }
 }

Dev/OHVLoggerTest/OHVLoggerTest/OHVDriveSimulator.csproj

@@ -11,6 +11,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +40,9 @@
     <Reference Include="Dijkstra.NET, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dijkstra.NET.1.2.1\lib\net40\Dijkstra.NET.dll</HintPath>
     </Reference>
+    <Reference Include="GSG.NET">
+      <HintPath>..\..\OHV\Assambly\GSG.NET.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
       <HintPath>..\..\OHV\Assambly\log4net.dll</HintPath>
     </Reference>
@@ -69,8 +74,8 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="ZeroMQ">
-      <HintPath>..\..\..\..\..\Referance_Project\ZeroMQ\clrzmq4-master\bin\Debug\ZeroMQ.dll</HintPath>
+    <Reference Include="ZeroMQ, Version=4.1.0.31, Culture=neutral, PublicKeyToken=4a9630883fd6c563, processorArchitecture=MSIL">
+      <HintPath>..\packages\ZeroMQ.4.1.0.31\lib\net40\ZeroMQ.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -120,11 +125,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\GSG\GSG\GSG.NET\GSG.NET.csproj">
-      <Project>{11e12a58-fdbc-444a-90e6-db96b7e98ff4}</Project>
-      <Name>GSG.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ZeroMQ.4.1.0.31\build\net40\ZeroMQ.targets" Condition="Exists('..\packages\ZeroMQ.4.1.0.31\build\net40\ZeroMQ.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\ZeroMQ.4.1.0.31\build\net40\ZeroMQ.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ZeroMQ.4.1.0.31\build\net40\ZeroMQ.targets'))" />
+  </Target>
 </Project>

Dev/OHVLoggerTest/OHVLoggerTest/Redis.cs

@@ -143,6 +143,5 @@ namespace OHVDriveSimulator
         {
             database.HashSet( "3012", "7", point );
         }
-
     }
 }

Dev/OHVLoggerTest/OHVLoggerTest/packages.config

@@ -3,4 +3,5 @@
   <package id="Dijkstra.NET" version="1.2.1" targetFramework="net45" />
   <package id="StackExchange.Redis.Extensions.Core" version="3.5.0" targetFramework="net45" />
   <package id="StackExchange.Redis.StrongName" version="1.2.6" targetFramework="net45" />
+  <package id="ZeroMQ" version="4.1.0.31" targetFramework="net45" />
 </packages>

Dev/OHVLoggerTest/packages/ZeroMQ.4.1.0.31/build/net40/ZeroMQ.targets

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<ItemGroup>
+
+<!-- Windows -->
+
+    <Content Include="$(MSBuildThisFileDirectory)../amd64/libzmq.dll">
+        <Link>amd64/libzmq.dll</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
+    <Content Include="$(MSBuildThisFileDirectory)../i386/libzmq.dll">
+        <Link>i386/libzmq.dll</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
+
+<!-- Linux -->
+
+    <Content Include="$(MSBuildThisFileDirectory)../amd64/libzmq.so">
+        <Link>amd64/libzmq.so</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
+    <!-- Content Include="$(MSBuildThisFileDirectory)../i386/libzmq.so">
+        <Link>i386/libzmq.so</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content -->
+
+
+<!-- MacOS -->
+
+    <Content Include="$(MSBuildThisFileDirectory)../amd64/libzmq.dylib">
+        <Link>amd64/libzmq.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
+    <!-- Content Include="$(MSBuildThisFileDirectory)../i386/libzmq.dylib">
+        <Link>i386/libzmq.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content -->
+
+</ItemGroup>
+</Project>