충돌 병합

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

@@ -6,7 +6,7 @@ using OHV.Common.Model;
 using OHV.Common.Shareds;
 using OHV.SqliteDAL;
 using System;
-using VehicleControlSystem.ControlLayer.DB;
+//using VehicleControlSystem.ControlLayer.DB;
 using VehicleControlSystem.ControlLayer.MQ;
 using VehicleControlSystem.Managers;
 
@@ -63,6 +63,34 @@ namespace VehicleControlSystem.ControlLayer.Drive
             set { SetField( ref this.rearDriveState, value ); }
         }
 
+        double rearLoadFactor = 0;
+        public double RearLoadFactor
+        {
+            get { return rearLoadFactor; }
+            set { SetField( ref rearLoadFactor , value ); }
+        }
+
+        double rearRpm = 0;
+        public double RearRpm
+        {
+            get { return rearRpm; }
+            set { SetField( ref rearRpm , value ); }
+        }
+
+        double frontLoadFactor = 0;
+        public double FrontLoadFactor
+        {
+            get { return this.frontLoadFactor; }
+            set { SetField( ref frontLoadFactor , value ); }
+        }
+        double frontRpm = 0;
+        public double FrontRpm
+        {
+            get { return this.frontRpm; }
+            set { SetField( ref frontRpm , value ); }
+        }
+
+
         TaskCancel taskCancel = new TaskCancel();
         ThreadCancel threadCancel = new ThreadCancel();
         SqliteManager sql = null;
@@ -132,9 +160,6 @@ namespace VehicleControlSystem.ControlLayer.Drive
                         this.FrontRpm = v;
                     }
                     break;
-
-                default:
-                    break;
             }
         }
         public void Dispose()
@@ -207,14 +232,16 @@ namespace VehicleControlSystem.ControlLayer.Drive
 
         public eOperatationMode GetDriveOperationMode()
         {
-            var ret = Redis.Instance.GetSystemState();
-
-            if ( ret == 3 )
-                return eOperatationMode.ManualMode;
-            else if ( ret == 4 )
-                return eOperatationMode.AutoMode;
-            else
-                return eOperatationMode.InitialMode;
+            //var ret = Redis.Instance.GetSystemState();
+
+            //if ( ret == 3 )
+            //    return eOperatationMode.ManualMode;
+            //else if ( ret == 4 )
+            //    return eOperatationMode.AutoMode;
+            //else
+            //    return eOperatationMode.InitialMode;
+
+            return eOperatationMode.ManualMode;
         }
 
         public int MoveToPoint( string point, double velocity )

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -17,7 +17,7 @@ using OHV.Common.Shareds;
 using OHV.SqliteDAL;
 using Prism.Events;
 using VehicleControlSystem.ControlLayer.Actuator.Cylinder;
-using VehicleControlSystem.ControlLayer.DB;
+//using VehicleControlSystem.ControlLayer.DB;
 using VehicleControlSystem.ControlLayer.Drive;
 using VehicleControlSystem.ControlLayer.IO;
 using VehicleControlSystem.ControlLayer.MQ;