adapt interface to use SI class (and switch to double otherwise)

VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>AdvancedAuxiliaryInterfaces</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -25,6 +25,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DocumentationFile>AdvancedAuxiliaryInterfaces.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +35,7 @@
     <OutputPath>bin\Release\</OutputPath>
     <DocumentationFile>AdvancedAuxiliaryInterfaces.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -115,6 +117,12 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VectoCommon\VectoCommon.csproj">
+      <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+      <Name>VectoCommon</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb

@@ -8,6 +8,7 @@
 '   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports TUGraz.VectoCommon.Utils
 
 Public Interface IAdvancedAuxiliaries
 	' Inherits IAuxiliaryEvent
@@ -23,36 +24,36 @@ Public Interface IAdvancedAuxiliaries
 
 
 	'Diagnostic Only - Remove when beta over.
-	ReadOnly Property AA_D_M12_P1X As Single
-	ReadOnly Property AA_D_M12_P1Y As Single
-	ReadOnly Property AA_D_M12_P2X As Single
-	ReadOnly Property AA_D_M12_P2Y As Single
-	ReadOnly Property AA_D_M12_P3X As Single
-	ReadOnly Property AA_D_M12_P3Y As Single
-	ReadOnly Property AA_D_M12_XTAIN As Single
-	ReadOnly Property AA_D_M12_INTERP1 As Single
-	ReadOnly Property AA_D_M12_INTERP2 As Single
+	ReadOnly Property AA_D_M12_P1X As Joule
+	ReadOnly Property AA_D_M12_P1Y As Gram
+	ReadOnly Property AA_D_M12_P2X As Joule
+	ReadOnly Property AA_D_M12_P2Y As Gram
+	ReadOnly Property AA_D_M12_P3X As Joule
+	ReadOnly Property AA_D_M12_P3Y As Gram
+	ReadOnly Property AA_D_M12_XTAIN As Joule
+	ReadOnly Property AA_D_M12_INTERP1 As Gram
+	ReadOnly Property AA_D_M12_INTERP2 As Gram
 
 	'Additional Permenent Monitoring Signals - Required by engineering
-	ReadOnly Property AA_NonSmartAlternatorsEfficiency As Single?
-	ReadOnly Property AA_SmartIdleCurrent_Amps As Single?
-	ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Single?
-	ReadOnly Property AA_SmartTractionCurrent_Amps As Single?
-	ReadOnly Property AA_SmartTractionAlternatorEfficiency As Single?
-	ReadOnly Property AA_SmartOverrunCurrent_Amps As Single?
-	ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Single?
-	ReadOnly Property AA_CompressorFlowRate_LitrePerSec As Single?
-	ReadOnly Property AA_OverrunFlag As Integer?
+	ReadOnly Property AA_NonSmartAlternatorsEfficiency As Double
+	ReadOnly Property AA_SmartIdleCurrent_Amps As Ampere
+	ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Double
+	ReadOnly Property AA_SmartTractionCurrent_Amps As Ampere
+	ReadOnly Property AA_SmartTractionAlternatorEfficiency As Double
+	ReadOnly Property AA_SmartOverrunCurrent_Amps As Ampere
+	ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Double
+	ReadOnly Property AA_CompressorFlowRate_LitrePerSec As NormLiterPerSecond
+	ReadOnly Property AA_OverrunFlag As Boolean
 	ReadOnly Property AA_EngineIdleFlag As Integer?
-	ReadOnly Property AA_CompressorFlag As Integer?
-	ReadOnly Property AA_TotalCycleFC_Grams As Single?
-	ReadOnly Property AA_TotalCycleFC_Litres As Single?
-	ReadOnly Property AA_AveragePowerDemandCrankHVACMechanicals As Single?
-	ReadOnly Property AA_AveragePowerDemandCrankHVACElectricals As Single?
-	ReadOnly Property AA_AveragePowerDemandCrankElectrics As Single?
-	ReadOnly Property AA_AveragePowerDemandCrankPneumatics As Single?
-	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Single?
-	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Single?
+	ReadOnly Property AA_CompressorFlag As Boolean
+	ReadOnly Property AA_TotalCycleFC_Grams As Gram
+	ReadOnly Property AA_TotalCycleFC_Litres As Liter
+	ReadOnly Property AA_AveragePowerDemandCrankHVACMechanicals As Watt
+	ReadOnly Property AA_AveragePowerDemandCrankHVACElectricals As Watt
+	ReadOnly Property AA_AveragePowerDemandCrankElectrics As Watt
+	ReadOnly Property AA_AveragePowerDemandCrankPneumatics As Watt
+	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Gram
+	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Gram
 
 	''' <summary>
 	''' Total Cycle Fuel In Grams
@@ -60,7 +61,7 @@ Public Interface IAdvancedAuxiliaries
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	ReadOnly Property TotalFuelGRAMS As Single
+	ReadOnly Property TotalFuelGRAMS As Gram
 
 	''' <summary>
 	''' Total Cycle Fuel in Litres
@@ -68,7 +69,7 @@ Public Interface IAdvancedAuxiliaries
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	ReadOnly Property TotalFuelLITRES As Single
+	ReadOnly Property TotalFuelLITRES As Liter
 
 	''' <summary>
 	''' Total Power Demans At Crank From Auxuliaries (W)
@@ -76,7 +77,7 @@ Public Interface IAdvancedAuxiliaries
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	ReadOnly Property AuxiliaryPowerAtCrankWatts As Single
+	ReadOnly Property AuxiliaryPowerAtCrankWatts As Watt
 
 
 	''' <summary>
@@ -121,7 +122,7 @@ Public Interface IAdvancedAuxiliaries
 	''' <param name="message"></param>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Function CycleStep(seconds As Double, ByRef message As String) As Boolean
+	Function CycleStep(seconds As Second, ByRef message As String) As Boolean
 
 	''' <summary>
 	''' Initialises AAUX Environment ( Begin Processs )

VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb

-Public Interface IFuelConsumptionMap
+Imports TUGraz.VectoCommon.Utils
+
+Public Interface IFuelConsumptionMap
 	''' <summary>
 	''' 
 	''' </summary>
@@ -6,5 +8,5 @@
 	''' <param name="angularVelocity"></param>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Function GetFuelConsumption(torque As Double, angularVelocity As Double) As Double
+	Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond
 End Interface
\ No newline at end of file

VectoCommon/AdvancedAuxiliaryInterfaces/ISignals.vb

@@ -16,7 +16,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks>Vecto Input</remarks>
-	Property PreExistingAuxPower As Single
+	Property PreExistingAuxPower As Double
 
 	''' <summary>
 	''' Engine Motoring Power (KW)
@@ -24,7 +24,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks>Vecto Input</remarks>
-	Property EngineMotoringPower As Single
+	Property EngineMotoringPower As Double
 
 	''' <summary>
 	''' Engine Driveline Power (KW)
@@ -32,7 +32,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Property EngineDrivelinePower As Single
+	Property EngineDrivelinePower As Double
 
 	''' <summary>
 	''' Smart Electrics
@@ -88,7 +88,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks>Vecto Input</remarks>
-	Property EngineDrivelineTorque As Single
+	Property EngineDrivelineTorque As Double
 
 	''' <summary>
 	''' Engine Idle
@@ -128,7 +128,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks>'Vecto Input</remarks>
-	Property WHTC As Single
+	Property WHTC As Double
 
 	''' <summary>
 	''' Declaration Mode
@@ -144,7 +144,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Property EngineIdleSpeed As Single
+	Property EngineIdleSpeed As Double
 
 	''' <summary>
 	''' Pneumatic Overrun Utilisation
@@ -152,7 +152,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Property PneumaticOverrunUtilisation As Single
+	Property PneumaticOverrunUtilisation As Double
 
 	''' <summary>
 	''' Stored Energy Efficiency
@@ -160,7 +160,7 @@ Public Interface ISignals
 	''' <value></value>
 	''' <returns></returns>
 	''' <remarks></remarks>
-	Property StoredEnergyEfficiency As Single
+	Property StoredEnergyEfficiency As Double
 
 	''' <summary>
 	''' Running Calc

VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.Designer.vb

 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 

VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb

 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,12 +15,12 @@ Imports System
 
 Namespace My.Resources
     
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
     <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -33,7 +33,7 @@ Namespace My.Resources
         Private resourceCulture As Global.System.Globalization.CultureInfo
         
         '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -47,8 +47,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Property Culture() As Global.System.Globalization.CultureInfo

VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb

 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -22,7 +22,7 @@ Namespace My
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "My.Settings Auto-Save Functionality"
+#Region "Funktion zum automatischen Speichern von My.Settings"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 

VectoCommon/AdvancedAuxiliaryInterfaces/Signals.vb

@@ -18,9 +18,9 @@ Public Class Signals
 	Private _smartElectrics As Boolean
 
 	Public Property ClutchEngaged As Boolean Implements ISignals.ClutchEngaged
-	Public Property EngineDrivelinePower As Single Implements ISignals.EngineDrivelinePower
-	Public Property EngineDrivelineTorque As Single Implements ISignals.EngineDrivelineTorque
-	Public Property EngineMotoringPower As Single Implements ISignals.EngineMotoringPower
+	Public Property EngineDrivelinePower As Double Implements ISignals.EngineDrivelinePower
+	Public Property EngineDrivelineTorque As Double Implements ISignals.EngineDrivelineTorque
+	Public Property EngineMotoringPower As Double Implements ISignals.EngineMotoringPower
 	Public Property EngineSpeed As Double Implements ISignals.EngineSpeed
 
 	Public Property SmartElectrics As Boolean Implements ISignals.SmartElectrics
@@ -35,7 +35,7 @@ Public Class Signals
 	Public Property SmartPneumatics As Boolean Implements ISignals.SmartPneumatics
 	Public Property TotalCycleTimeSeconds As Integer Implements ISignals.TotalCycleTimeSeconds
 	Public Property CurrentCycleTimeInSeconds As Double Implements ISignals.CurrentCycleTimeInSeconds
-	Public Property PreExistingAuxPower As Single Implements ISignals.PreExistingAuxPower
+	Public Property PreExistingAuxPower As Double Implements ISignals.PreExistingAuxPower
 	Public Property Idle As Boolean Implements ISignals.Idle
 	Public Property InNeutral As Boolean Implements ISignals.InNeutral
 
@@ -45,8 +45,8 @@ Public Class Signals
 	Public Property EngineStopped As Boolean Implements ISignals.EngineStopped
 	Public Property DeclarationMode As Boolean Implements ISignals.DeclarationMode
 
-	Public Property WHTC As Single Implements ISignals.WHTC
-		Set(value As Single)
+	Public Property WHTC As Double Implements ISignals.WHTC
+		Set(value As Double)
 			_WHTCCorretion = value
 		End Set
 		Get
@@ -54,9 +54,9 @@ Public Class Signals
 		End Get
 	End Property
 
-	Public Property EngineIdleSpeed As Single Implements ISignals.EngineIdleSpeed
-	Public Property PneumaticOverrunUtilisation As Single Implements ISignals.PneumaticOverrunUtilisation
-	Public Property StoredEnergyEfficiency As Single Implements ISignals.StoredEnergyEfficiency
+	Public Property EngineIdleSpeed As Double Implements ISignals.EngineIdleSpeed
+	Public Property PneumaticOverrunUtilisation As Double Implements ISignals.PneumaticOverrunUtilisation
+	Public Property StoredEnergyEfficiency As Double Implements ISignals.StoredEnergyEfficiency
 	Public Property RunningCalc As Boolean Implements ISignals.RunningCalc
 	Public Property Internal_Engine_Power As Single Implements ISignals.Internal_Engine_Power
 End Class

VectoCommon/AdvancedAuxiliaryInterfaces/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" requireReinstallation="True" />
 </packages>
\ No newline at end of file