충돌 병합

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

@@ -148,6 +148,7 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*"/>
@@ -184,16 +185,22 @@
                                 </StackPanel>
                             </Border>
 
-                            <!--<Button Grid.Column="0" Grid.RowSpan="2" HorizontalAlignment="Stretch" Margin="5" Height="Auto" Width="Auto"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            materialDesign:ButtonAssist.CornerRadius="10"
-                            Command="{Binding SelectAxisCommand}"
-                            CommandParameter="Left">
-                                <StackPanel>
-                                    <TextBlock><Run Text="Vehicle" FontSize="20"/></TextBlock>
-                                    <TextBlock><Run Text="Drive" FontSize="20"/></TextBlock>
+                            <Border BorderBrush="Gray" BorderThickness="1" Grid.Column="2" Grid.Row="0">
+                                <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                    <TextBlock HorizontalAlignment="Center"  Foreground="Orange" FontSize="20">
+                                        AutoReadyFlag
+                                    </TextBlock>
                                 </StackPanel>
-                            </Button>-->
+                            </Border>
+
+                            <Border BorderBrush="Gray" BorderThickness="1" Grid.Column="2" Grid.Row="1">
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                    <TextBlock Margin="5" HorizontalAlignment="Center" Foreground="White" FontSize="20">
+                                       <Run Text="{Binding AutoReadyFlag, FallbackValue=NG}"/>
+                                    </TextBlock>
+                                    <Ellipse Margin="5" Height="20" Width="20" Fill="{Binding AutoReadyFlagColor, FallbackValue=Gray}" Stroke="White"/>
+                                </StackPanel>
+                            </Border>
                         </Grid>
 
                         <Grid Grid.Column="1">

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

@@ -37,7 +37,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\OutRelese\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

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

@@ -189,6 +189,14 @@ namespace VehicleControlSystem.ControlLayer.MQ
             set { SetField( ref this.faultMessage, value ); }
         }
 
+        private eVehicleAutoReadyState autoReadyState;
+
+        public eVehicleAutoReadyState AutoReadyState
+        {
+            get { return autoReadyState; }
+            set { SetField(ref this.autoReadyState, value); }
+        }
+
         #endregion
 
         public ZmqManager( BMUManager bMU, Steering steering )

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -211,6 +211,15 @@ namespace VehicleControlSystem.ControlLayer
             set { SetField( ref this.rearDriveState, value ); }
         }
 
+        private eVehicleAutoReadyState autoReadyState;
+
+        public eVehicleAutoReadyState AutoReadyState
+        {
+            get { return autoReadyState; }
+            set { SetField(ref this.autoReadyState, value);}
+        }
+
+
         //이동
         public bool Busy
         {
@@ -2198,6 +2207,13 @@ namespace VehicleControlSystem.ControlLayer
                     }
                     break;
 
+                case "AutoReadyState":
+                    {
+                        var v = CastTo<eVehicleAutoReadyState>.From<object>(newValue);
+                        this.AutoReadyState = v;
+                    }
+                    break;
+
                 default:
                     break;
             }
@@ -2275,38 +2291,7 @@ namespace VehicleControlSystem.ControlLayer
                     }
                     break;
 
-                    //case "FrontLoadFactor":
-                    //    {
-                    //        var v = CastTo<double>.From<object>( newValue );
-                    //        this.FrontLoadFactor = v;
-                    //        this.FrontTorque = Math.Truncate( ( ( v * 1.9 ) / 1000 ) * 100 ) / 100;
-                    //    }
-                    //    break;
-                    //case "FrontRpm":
-                    //    {
-                    //        var v = CastTo<double>.From<object>( newValue );
-                    //        this.FrontRpm = v;
-
-                    //        var ll = ( ( ( ( v / 60 ) * ( 2 * Math.PI ) ) * 0.06 ) / 10 );
-                    //        this.FrontSpeed = Math.Truncate( ll * 100 ) / 100;
-                    //    }
-                    //    break;
-                    //case "RearLoadFactor":
-                    //    {
-                    //        var v = CastTo<double>.From<object>( newValue );
-                    //        this.RearLoadFactor = v;
-                    //        this.RearTorque = Math.Truncate( ( ( v * 1.9 ) / 1000 ) * 100 ) / 100;
-                    //    }
-                    //    break;
-                    //case "RearRpm":
-                    //    {
-                    //        var v = CastTo<double>.From<object>( newValue );
-                    //        this.RearRpm = v;
-
-                    //        var ll = ( ( ( ( v / 60 ) * ( 2 * Math.PI ) ) * 0.06 ) / 10 );
-                    //        this.RearSpeed = Math.Truncate( ll * 100 ) / 100;
-                    //    }
-                    break;
+                
                 default:
                     break;
             }

Dev/OHV/VehicleControlSystem/VehicleControlSystem.csproj

@@ -17,10 +17,10 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>\\192.168.127.10\vcs\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>3</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>