diff --git a/.hgtags b/.hgtags index d7456f39556185839bcfe1159c9b539f448f8b43..f7d9d8c9be25d06c7d5112ef778c534ca29cb909 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ +4736a2c94a73ee85c1134cba09c7e87bd9c5d7b0 1.0.1 newLic 693c847b64a398ff9b6c629318085f4218fcbb85 1.1 beta 4 06b3a64ff49c0602b6f839fd3b07634193003868 1.1 beta 3 fb9280176abd2f9c58fc884b72f2774a878e06bb 1.1 beta 2 diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index efea1445a9969c253e446a5e27bf2ae7723576e9..571a9d3d4f6fd1201a44feb78a78bf4a0a230345 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -353,7 +353,9 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <None Include="My Project\app.manifest" /> + <None Include="My Project\app.manifest"> + <SubType>Designer</SubType> + </None> <None Include="My Project\Application.myapp"> <Generator>MyApplicationCodeGenerator</Generator> <LastGenOutput>Application.Designer.vb</LastGenOutput> diff --git a/VECTO/VECTO_Global.vb.orig b/VECTO/VECTO_Global.vb.orig index b61093890bd7b8a222b97cb7ce6ef76b6ff198ee..ce051408386dc8214118d9f912d75cf94082f4ea 100644 --- a/VECTO/VECTO_Global.vb.orig +++ b/VECTO/VECTO_Global.vb.orig @@ -1,8 +1,8 @@ -Imports System.Collections.Generic +Imports System.Collections.Generic Module VECTO_Global - Public Const VECTOvers As String = "1.1" + Public Const VECTOvers As String = "1.3.1" Public MyAppPath As String Public MyConfPath As String Public MyDeclPath As String @@ -17,14 +17,14 @@ Module VECTO_Global 'Config------------------------------------------------------- Public Cfg As cConfig - 'TODO: Weg damit! SOC-Iteration gehört in die Leistungsschleife oder nach Em-Berechnung für LinReg + 'TODO: Get rid of it! SOC-iteration belongs either in the Power-loop or Em-calculation for LinReg Public SOCstart As Single Public SOC(izykt) As Single Public Const izykt As Integer = 40000 Public sKey As csKey - 'Dateiformat + 'File format Public FileFormat As System.Text.Encoding = System.Text.Encoding.UTF8 Public LOGfile As System.IO.StreamWriter @@ -51,7 +51,6 @@ Module VECTO_Global Public ProgBarCtrl As cProgBarCtrl Public SetCulture As Boolean 'Damit der Backgroundworker das richtige Format verwendet - Public FirstTime As Boolean Public Function nMtoPe(ByVal nU As Double, ByVal M As Double) As Double Return ((nU * 2 * Math.PI / 60) * M / 1000) @@ -67,7 +66,7 @@ Module VECTO_Global Return Pnorm * VEH.Pnenn * 1000 / (nU * 2 * Math.PI / 60) End Function - Public Function PToM(ByVal nU As Single, ByVal Pe As Double) As Single + Public Function nPeToM(ByVal nU As Single, ByVal Pe As Double) As Single Return Pe * 1000 / (nU * 2 * Math.PI / 60) End Function @@ -99,6 +98,8 @@ Module VECTO_Global Return tDriComp.s Case sKey.DRI.StopTime Return tDriComp.StopTime + Case sKey.DRI.Torque + Return tDriComp.Torque Case Else Return tDriComp.Undefined @@ -130,7 +131,7 @@ Module VECTO_Global x = sK.IndexOf("_") - If x = -1 Then Return tExsComp.Undefined + If x = -1 Then Return tAuxComp.Undefined sK = Left(sK, x + 1) @@ -343,13 +344,13 @@ Module VECTO_Global Public Sub StartLogfile() - 'Log starten + 'Log start LOGfile = My.Computer.FileSystem.OpenTextFileWriter(MyAppPath & "LOG.txt", True, FileFormat) LOGfile.AutoFlush = True LOGfile.WriteLine("------------------------------------------------------------------------------------------") LOGfile.WriteLine("Starting Session " & Now) - LOGfile.WriteLine("PHEM " & VECTOvers) + LOGfile.WriteLine("VECTO " & VECTOvers) End Sub @@ -423,6 +424,7 @@ Public Class csKey Public VairBeta As String = "<VAIR_BETA>" Public s As String = "<S>" Public StopTime As String = "<STOP>" + Public Torque As String = "<ME>" End Class Public Class csKeyEXS