GSI Lab 실 수정 내용

Dev/OHV/OHV.Module.ListViews/Views/CommandListView.xaml

@@ -91,7 +91,7 @@
             </DataGrid>
 
             <Grid Background="#263238" Grid.Column="1">
-                <!--<Grid.RowDefinitions>
+                <Grid.RowDefinitions>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="140"/>
                     <RowDefinition Height="*"/>
@@ -129,7 +129,7 @@
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="2" VerticalAlignment="Top" Margin="0,15,0,0">
                     <Button Margin="0,0,10,0" Height="45" Content="Add" Command="{Binding SaveCommand}" Width="100" IsEnabled="{c:Binding 'MachineMode == Shared:eMachineMode.LocalMode'}" />
                     <Button Height="45" Content="Delete" Command="{Binding DeleteCommand}" Width="100"/>
-                </StackPanel>-->
+                </StackPanel>
             </Grid>
 
 

Dev/OHV/OHV.Vehicle/OHV.Vehicle.csproj

@@ -65,7 +65,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote1|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>\\192.168.127.103\VCS\</OutputPath>
+    <OutputPath>\\192.168.127.106\VCS\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

Dev/OHV/VehicleControlSystem/ControlLayer/Motion/GSIDrive.cs

@@ -295,7 +295,7 @@ namespace VehicleControlSystem.ControlLayer.Drive
             if (steeringState == eSteeringState.None ) //현재 가 None 이면 기다렸다가 다시 확인 필요.
                 LockUtils.Wait( 500 );
 
-            zmq.SetCurrentSteeringState( steering.GetSteeringState() );
+            //zmq.SetCurrentSteeringState( steering.GetSteeringState() );
             LockUtils.Wait( 200 );
 
             StringBuilder sb = new StringBuilder();

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -138,7 +138,7 @@ namespace VehicleControlSystem.ControlLayer
             {
                 if (SetField(ref this.steeringState, value))
                 {
-                    this.refObjects.ZmqManager.SetCurrentSteeringState(value);
+                    //this.refObjects.ZmqManager.SetCurrentSteeringState(value);
                 }
             }
         }
@@ -1058,8 +1058,8 @@ namespace VehicleControlSystem.ControlLayer
         void DoWork()
         {
             //2020.08.18.Kang. 상위 연결이 안되어 있으면 SubCmd 실행을 안하고 대기함.
-            if (!this.refObjects.HostManager.IsConnected)
-                return;
+            //if (!this.refObjects.HostManager.IsConnected)
+                //return;
 
             var subCmd = this.refObjects.Sqlite.SubCmdDAL.GetAll().FirstOrDefault();
             if (subCmd == null) return;

Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -1,5 +1,4 @@
-//#define TEST
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -708,10 +707,10 @@ namespace VehicleControlSystem
             GUIMessageEventArgs reply;
             if (msg.MessageKey.Equals(MessageKey.AutoMode))
             {
-#if TEST
-                if (!QuartzUtils.StopSchedule("SteerTest"))
-                    return;
-#endif
+//#if TEST
+//                if (!QuartzUtils.StopSchedule("SteerTest"))
+//                    return;
+//#endif
 
                 if (!this.ZmqManager.IsReqConnected)
                 {
@@ -741,6 +740,11 @@ namespace VehicleControlSystem
                 if (result != ConstInt.EXECUTE_SUCCESS)
                 {
                     var al = this.Alarms.FirstOrDefault(a => a.AlarmId == result);
+                    if (al == null)
+                        al = new Alarm()
+                        {
+                            Text = "Not Define"
+                        };
                     reply = new GUIMessageEventArgs { Kind = GUIMessageEventArgs.eGUIMessageKind.RspVehicleModeChange, Result = FluentResults.Results.Fail(new Error(al.Text)), MessageKey = MessageKey.ManualMode };
                     GUIMessageEventPublish(reply);
                     return;