no message

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

@@ -246,6 +246,8 @@
 		RearOn,//후방 전원 On(방향 상관없음)
 		FrontOff,// 전방 전원 Off
 		RearOff,// 후방 전원 Off
+		ManualLL,
+		ManualRR,
     }
 
 	public enum eSteerState4ZMq

Dev/OHV/OHV.Module.Monitoring/Interactivity/InOutIOView.xaml

@@ -60,7 +60,7 @@
                 <ItemsControl ItemsSource="{Binding InIOList}" >
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <IOBtn:LEDIO_Button OffColor="Red" OnColor="Green" Content="{Binding Tag}" IsOnOff="{Binding IsOn}" VerticalContentAlignment="Center"/>
+                            <IOBtn:LEDIO_Button OffColor="Red" OnColor="lightGreen" Content="{Binding Tag}" IsOnOff="{Binding IsOn}" VerticalContentAlignment="Center"/>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                     <ItemsControl.ItemsPanel>
@@ -108,7 +108,7 @@
                 <ItemsControl ItemsSource="{Binding OutIOList}" >
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <IOBtn:LEDIO_Button OffColor="Red" OnColor="Green" Content="{Binding Tag}" IsOnOff="{Binding IsOn}" VerticalContentAlignment="Center"
+                            <IOBtn:LEDIO_Button OffColor="Red" OnColor="LightGreen" Content="{Binding Tag}" IsOnOff="{Binding IsOn}" VerticalContentAlignment="Center"
                                                Command="{Binding DataContext.OutPutCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ItemsControl}}}" CommandParameter="{Binding Element}"/>
                         </DataTemplate>
 

Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -449,7 +449,7 @@ namespace OHV.Vehicle.Concept
 
             vcsMessagePublisher.Publish( msg );
 
-            this.ExecuteTextCommand();
+            //this.ExecuteTextCommand();
         }
 
         private void Execte_ChangeLanguage()

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.104\VCS\</OutputPath>
+    <OutputPath>\\192.168.127.103\VCS\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

Dev/OHV/VehicleControlSystem/ControlLayer/Steering.cs

@@ -183,6 +183,7 @@ namespace VehicleControlSystem.ControlLayer
                 switch (cmd)
                 {
                     case eSteerCommand.LL:
+                    case eSteerCommand.ManualLL:
                         inputList.Add(IsFrontLeft);
                         inputList.Add(IsRearLeft);
                         this.iO.WriteOutputIO("OUT_F_STEERING_OFF", true);
@@ -205,6 +206,7 @@ namespace VehicleControlSystem.ControlLayer
                         outputList.Add(actionOnRearHightVolteOn);
                         break;
                     case eSteerCommand.RR:
+                    case eSteerCommand.ManualRR:
                         inputList.Add(IsFrontRight);
                         inputList.Add(IsRearRight);
                         this.iO.WriteOutputIO("OUT_F_STEERING_OFF", true);
@@ -224,6 +226,7 @@ namespace VehicleControlSystem.ControlLayer
                         inputList.Add(IsRearRight);
                         this.iO.WriteOutputIO("OUT_R_STEERING_OFF", true);
                         actionSteerRear(false);
+
                         outputList.Add(actionOnRearHightVolteOn);
                         break;
                     default:
@@ -245,7 +248,7 @@ namespace VehicleControlSystem.ControlLayer
 
                     if (SwUtils.Elapsed(sT) > 700)
                     {
-                        logger.D($"Execute Steer - {cmd} - {SwUtils.Elapsed(sT)}mm");
+                        logger.D($"Execute Steer Time out - {cmd} - {SwUtils.Elapsed(sT)}mm");
                         break;
                     }
                 }
@@ -256,9 +259,11 @@ namespace VehicleControlSystem.ControlLayer
             switch (command)
             {
                 case eSteerCommand.LL:
+                case eSteerCommand.ManualLL:
                 case eSteerCommand.LX:
                 case eSteerCommand.XL:
                 case eSteerCommand.RR:
+                case eSteerCommand.ManualRR:
                 case eSteerCommand.RX:
                 case eSteerCommand.XR:
                     actionSteer(command);
@@ -288,6 +293,11 @@ namespace VehicleControlSystem.ControlLayer
                     break;
             }
 
+            if ( command == eSteerCommand.ManualLL || command == eSteerCommand.ManualRR)
+            {
+                this.SteeringState = GetSteerDirection();
+            }
+
             logger.D($"Complete Steer Command - {command} / {SwUtils.Elapsed(cmdSt)}ms");
         }
 
@@ -309,10 +319,10 @@ namespace VehicleControlSystem.ControlLayer
                 case eSteeringState.None:
                     break;
                 case eSteeringState.Left:
-                    this.RequestCommand(eSteerCommand.LL);
+                    this.RequestCommand(eSteerCommand.ManualLL);
                     break;
                 case eSteeringState.Right:
-                    this.RequestCommand(eSteerCommand.RR);
+                    this.RequestCommand(eSteerCommand.ManualRR);
                     break;
                 default:
                     break;

Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -1,4 +1,4 @@
-#define TEST
+//#define TEST
 using System;
 using System.Collections.Generic;
 using System.IO;