no message

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

@@ -137,7 +137,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
-                    
+
                     <Grid Grid.Row="0" Margin="15">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
@@ -212,7 +212,7 @@
                                     BorderBrush="{Binding SteeringLeftBrushProperty}" 
                                     BorderThickness="5" 
                                     Command="{Binding SteeringMoveCommand}"
-                                    CommandParameter="CW" > 
+                                    CommandParameter="CW" >
                                     <StackPanel>
                                         <materialDesign:PackIcon Kind="ArrowLeft" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
                                         <TextBlock Text="Steering Left" VerticalAlignment="Stretch" HorizontalAlignment="Center" FontSize="20"/>
@@ -229,7 +229,7 @@
                                     BorderBrush="{Binding SteeringRightBrushProperty}" 
                                     BorderThickness="5" 
                                     Command="{Binding SteeringMoveCommand}"
-                                    CommandParameter="CCW"> 
+                                    CommandParameter="CCW">
                                     <StackPanel>
                                         <materialDesign:PackIcon Kind="ArrowRight" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
                                         <TextBlock Text="Steering Right" VerticalAlignment="Stretch" HorizontalAlignment="Center" FontSize="18"/>
@@ -245,9 +245,9 @@
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                    
+
                         <Border BorderThickness="1" BorderBrush="#FF00FFD3" Margin="15,0,10,169" Grid.ColumnSpan="3"></Border>
-                        
+
                         <Grid Grid.Column="0" Margin="20">
                             <RepeatButton
                             HorizontalAlignment="Right"
@@ -298,7 +298,7 @@
                         </Grid>
                     </Grid>
                 </Grid>
-                    <!--<Grid Grid.Row="1">
+                <!--<Grid Grid.Row="1">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
@@ -316,14 +316,16 @@
                     <Border Margin="10,5,179,0" BorderBrush="#FF00FFD3" BorderThickness="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.RowSpan="2" Grid.Column="2"/>
                     <Border Margin="33,-2,34,82" BorderBrush="#FF00FFD3" BorderThickness="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="2" Grid.ColumnSpan="3" Grid.RowSpan="2"/>
 
-                    --><!--<Button Grid.Column="0" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
+                    -->
+                <!--<Button Grid.Column="0" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             materialDesign:ButtonAssist.CornerRadius="10">
                         <StackPanel>
                             <TextBlock HorizontalAlignment="Center"><Run Text="Target" FontSize="20"/></TextBlock>
                             <TextBlock HorizontalAlignment="Center"><Run Text="Pos" FontSize="20"/></TextBlock>
                         </StackPanel>
-                    </Button>--><!--
+                    </Button>-->
+                <!--
 
                     <Button Grid.Column="0" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
@@ -335,7 +337,8 @@
                         </StackPanel>
                     </Button>
 
-                    --><!--<Button Grid.Column="0" Grid.Row="3" HorizontalAlignment="Stretch" Margin="5" Height="auto"
+                    -->
+                <!--<Button Grid.Column="0" Grid.Row="3" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             materialDesign:ButtonAssist.CornerRadius="10">
                         <StackPanel>
@@ -344,13 +347,14 @@
                         </StackPanel>
                     </Button>-->
 
-                    <!--<Button Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="5" Height="auto"
+                <!--<Button Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             materialDesign:ButtonAssist.CornerRadius="10"
                             Command="{Binding SelectAxisCommand}"
                             CommandParameter="Left">
                         <TextBlock><Run Text="Drive" FontSize="20"/></TextBlock>
-                    </Button>--><!--
+                    </Button>-->
+                <!--
 
                     <Button Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
@@ -363,14 +367,16 @@
                         </StackPanel>
                     </Button>
 
-                    --><!--<Button Background="{x:Null}" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
+                    -->
+                <!--<Button Background="{x:Null}" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             materialDesign:ButtonAssist.CornerRadius="10">
                         <Button.InputBindings>
                             <MouseBinding Gesture="LeftClick" Command="{Binding KeyInTargetPosCommand}" CommandParameter="Left"/>
                         </Button.InputBindings>
                         <TextBlock><Run Text="{Binding DriveTargetPos, StringFormat=0.000, FallbackValue=0.000}" FontSize="20"/></TextBlock>
-                    </Button>--><!--
+                    </Button>-->
+                <!--
 
                     <Button Background="{x:Null}" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
@@ -378,11 +384,13 @@
                         <TextBlock><Run Text="{Binding CurrentPosition, StringFormat=0.000, FallbackValue=0.000}" FontSize="20"/></TextBlock>
                     </Button>
 
-                    --><!--<Button Background="{x:Null}" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Stretch" Margin="5" Height="auto"
+                    -->
+                <!--<Button Background="{x:Null}" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Stretch" Margin="5" Height="auto"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             materialDesign:ButtonAssist.CornerRadius="10">
                         <TextBlock><Run Text="{Binding DifferenceDrive, StringFormat=0.000, FallbackValue=0.000}" FontSize="20"/></TextBlock>
-                    </Button>--><!--
+                    </Button>-->
+                <!--
 
                     <StackPanel Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="3"  Orientation="Horizontal" HorizontalAlignment="Center" Margin="82,52,43,31" Width="379" >
 
@@ -416,7 +424,9 @@
                     </StackPanel>
 
 
-                    --><!--Jog Button--><!--
+                    -->
+                <!--Jog Button-->
+                <!--
                     <RepeatButton
                             Margin="5"
                             Grid.Row="0" 

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>
@@ -306,7 +306,8 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy "$(SolutionDir)\Assambly\EzPlus2\*.*" "$(TargetDir)"
-copy "$(SolutionDir)\Assambly\OHVDrive\*.*" "$(TargetDir)"</PostBuildEvent>
+copy "$(SolutionDir)\Assambly\OHVDrive\*.*" "$(TargetDir)"
+copy "$(SolutionDir)\Assambly\CanDll\*.*" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

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

@@ -314,6 +314,17 @@ namespace VehicleControlSystem.ControlLayer.Drive
             return true;
         }
 
+        public bool JogForword()
+        {
+            this.zmq.SetJogMove();
+            return true;
+        }
+        public bool JogBackword()
+        {
+            this.zmq.SetJogMove( false );
+            return true;
+        }
+
         #region Test Method
 
         #endregion

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -762,13 +762,9 @@ namespace VehicleControlSystem.ControlLayer
         void ReqJog( DriveControlEventArgs _args )
         {
             if ( _args.JogDir == DriveControlEventArgs.eJogMoveDir.Positive )
-            {
-                //this.drive.JogForWard();
-            }
+                this.refObjects.Drive.JogForword();
             else
-            {
-                //this.drive.JogBackward();
-            }
+                this.refObjects.Drive.JogBackword();
         }
 
         Logger batteryLogger = Logger.GetLogger( "BatteryLogger" );

Dev/OHV/VehicleControlSystem/VehicleControlSystem.csproj

@@ -17,7 +17,7 @@
     <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>