Merge branch 'master' of http://unque781.synology.me:3000/GSI/OHV

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -1010,7 +1010,8 @@ namespace VehicleControlSystem.ControlLayer
         {
             this.VehicleStateProperty = eVehicleState.Unload;
 
-            if ( !this.CurrentTag.ToString().Equals( sub.TargetID ) )
+            var targetNo = Convert.ToInt32( sub.TargetID );
+            if ( this.CurrentTag != targetNo )
             {
                 this.OccurVehicleAlarm( 21 );
                 return false; //Alarm
@@ -1349,6 +1350,9 @@ namespace VehicleControlSystem.ControlLayer
         public int PIOAndLoad( string targetName )
         {
 #if SIMULATION
+            this.OnFailReport?.Invoke( eFailCode.LoadPIOInterlockTimeout );
+            return 0;
+
             PIOClear();
             loggerPIO.I( $"Start Load PIO - [{targetName}]" );
             this.OnPIOStart?.Invoke( true );

Dev/OHV/VehicleControlSystem/Managers/HostManager.cs

@@ -523,7 +523,7 @@ namespace VehicleControlSystem.Managers
         {
             var msg = new OCSMessage();
             msg.Kind = eKind.B;
-            var bData = volt;
+            var bData = 54.32;
             msg.Tag = bData.ToString( "00.00" ).Replace( ".", "" );
             msg.IsSubCode1 = this.vehicle.IsContain;
             msg.IsSubCode2 = vehicle.IsMoving;

Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger.sln

@@ -9,12 +9,15 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Remote|Any CPU = Remote|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Remote|Any CPU.ActiveCfg = Remote|Any CPU
+		{2C4A899E-68A7-45AB-BB81-65D0D941AF1E}.Remote|Any CPU.Build.0 = Remote|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger.csproj

@@ -31,6 +31,17 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>\\192.168.127.10\KV8000\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentFTP">
       <HintPath>..\..\..\OHV\Assambly\FluentFTP.dll</HintPath>