Kaynağa Gözat

현장 업데이트

unque781 5 yıl önce
ebeveyn
işleme
36049d6e6c

+ 2 - 2
Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -891,8 +891,8 @@ namespace VehicleControlSystem.ControlLayer
                             this.CurrentSubCommand = subCmd;
                             this.Move( subCmd );
 
-                            if ( !refObjects.HostManager.IsConnected )
-                                OccurVehicleAlarm( 43 );
+                            //if ( !refObjects.HostManager.IsConnected )
+                            //    OccurVehicleAlarm( 43 );
                             break;
 
                         case eSubCommandType.Load:

+ 6 - 6
Dev/OHV/VehicleControlSystem/Managers/Scheduler.cs

@@ -167,13 +167,13 @@ namespace VehicleControlSystem.Managers
             if ( !IsCreateDryRunCommand )
                 return;
 
-            if ( this.bMUManager.ReceivedDataDic[eDataKind.SOC].Value <= 15 )
+            if ( this.bMUManager.ReceivedDataDic[eDataKind.SOC].Value <= 25 )
             {
-                var chargePoint = "2";
-                Command chageCmd = new Command() { TargetID = chargePoint, Type = eCommandType.Charging };
-                chageCmd.ByWho = eCommandByWho.LocalSystem;
+//!                var chargePoint = "2";
+//                Command chageCmd = new Command() { TargetID = chargePoint, Type = eCommandType.Charging };
+//                chageCmd.ByWho = eCommandByWho.LocalSystem;
 
-                this.AddCommand( chageCmd );
+//                this.AddCommand( chageCmd );
 
                 this.IsCreateDryRunCommand = false;
                 return;
@@ -182,7 +182,7 @@ namespace VehicleControlSystem.Managers
             string targetPoint = string.Empty;
             if ( isSTK )
             {
-                targetPoint = RouteManager.Instance.Equipments.Where( x => x.Name.Equals( "CAN_STATION_IP01" ) ).SingleOrDefault().pointID.ToString();
+                targetPoint = RouteManager.Instance.Equipments.Where( x => x.Name.Equals( "CHARGING_02" ) ).SingleOrDefault().pointID.ToString();
                 isSTK = false;
             }
             else

BIN
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide


BIN
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide-shm


BIN
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide-wal


+ 1 - 1
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/App.config

@@ -5,7 +5,7 @@
     </startup>
 
 	<appSettings>
-		<add key="VehicleID" value="V02"/>
+		<add key="VehicleID" value="V01"/>
 		<add key="FTPUploadIP" value="192.168.127.123"/>
 		<add key="PLC_IP" value="192.168.0.20"/>
 		<add key="PLC_PORT" value="5000"/>

+ 1 - 1
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/Config/log4net.xml

@@ -82,7 +82,7 @@
 	</appender>
 
 	<appender name="FileAppender" type="GSG.NET.Logging.FileAppender, GSG.NET">
-		<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+		<!--<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />-->
 		<file type="log4net.Util.PatternString">
 			<conversionPattern value="C:\LOG\OHV\DriveLogger\DriveLogger.log"  />
 		</file>

+ 1 - 1
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/FTPLogger.cs

@@ -22,7 +22,7 @@ namespace OHVDriveLogger
             using ( var ftp = new FtpClient( UploadIP ) )
             {
                 ftp.Connect();
-                ftp.UploadDirectory( @"C:\LOG\FTP\", @"\LOG\", FtpFolderSyncMode.Update );
+                //ftp.UploadDirectory( @"C:\LOG\FTP\", @"\LOG\", FtpFolderSyncMode.Update );
                 ftp.UploadDirectory( @"C:\LOG\OHV\DriveLogger\PhysicalCheckup\", @"\LOG\", FtpFolderSyncMode.Update);
 
                 ftp.Disconnect();

+ 3 - 3
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/FormMain.cs

@@ -175,7 +175,7 @@ namespace OHVDriveLogger
             {
             }
 
-            //Buffer 에 있는 내용을 써야지.;
+            //Buffer 에 있는 내용을 써야지.
             var appenders = logger.logger.Logger.Repository.GetAppenders();
             foreach ( var a in appenders )
             {
@@ -186,8 +186,8 @@ namespace OHVDriveLogger
 
             this.plc.WriteBit( "DRIVE_LOGGING_ONOFF", false );
 
-            LockUtils.Wait( 200 );
-            FTPLogger.Instance.FTPDownload();
+            //LockUtils.Wait( 200 );
+            //FTPLogger.Instance.FTPDownload();
             LockUtils.Wait( 500 );
             FTPLogger.Instance.FTPUpload();
             LockUtils.Wait( 100 );