unque781 před 6 roky
rodič
revize
3b502daf0c

+ 0 - 1
Dev/OHV/OHV.Vehicle/Logger.cs

@@ -31,6 +31,5 @@ namespace OHV.Vehicle
                     break;
             }
         }
-
     }
 }

+ 6 - 6
Dev/OHV/VehicleControlSystem/ControlLayer/MQ/ZmqManager.cs

@@ -78,10 +78,10 @@ namespace VehicleControlSystem.ControlLayer.MQ
         public int CurrentPointNo
         {
             get { return currentPointNo; }
-            set 
+            set
             {
                 if ( SetField( ref this.currentPointNo, value ) )
-                    pub.SendMoreFrame( "CurrentPoint" ).SendFrame( value.ToString() ); 
+                    pub.SendMoreFrame( "CurrentPoint" ).SendFrame( value.ToString() );
             }
         }
 
@@ -194,8 +194,7 @@ namespace VehicleControlSystem.ControlLayer.MQ
             switch ( kind )
             {
                 case eDataKind.Current:
-                    var currnet = (double)obj.Value * obj.Scale;
-                    this.pub.SendMoreFrame( "BatteryCurrent" ).SendFrame( currnet.ToString() ); ;
+                    this.pub.SendMoreFrame( "BatteryCurrent" ).SendFrame( obj.Value.ToString() ); ;
                     break;
                 case eDataKind.Voltage:
                 case eDataKind.BatteryState:
@@ -326,10 +325,11 @@ namespace VehicleControlSystem.ControlLayer.MQ
                 }
 
             }
-            catch ( Exception exception)
+            catch ( Exception exception )
             {
                 logger.E( exception );
-            }        }
+            }
+        }
 
         private void Sub_ReceiveReady( object sender, NetMQ.NetMQSocketEventArgs e )
         {

binární
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide


binární
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide-shm


binární
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide-wal


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

@@ -5,6 +5,6 @@
     </startup>
 
 	<appSettings>
-		<add key="VehicleID" value="V01"/>
+		<add key="VehicleID" value="V02"/>
     </appSettings>
 </configuration>

+ 1 - 1
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger.csproj

@@ -43,7 +43,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RRmode|AnyCPU'">
-    <OutputPath>\\192.168.127.20\DriveLogger\</OutputPath>
+    <OutputPath>\\192.168.127.10\DriveLogger\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>