diff --git a/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj b/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
index 55193dbb87105241597c1277873cfd14423b8e08..6c72421bf927f2e9e20edb4e5351d4fb5d569f5d 100644
--- a/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
+++ b/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
@@ -67,8 +67,10 @@
<Import Include="System.Threading.Tasks" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Diagnostics.vb" />
<Compile Include="Enumerations.vb" />
<Compile Include="IAdvancedAuxiliaries.vb" />
+ <Compile Include="IDiagnostics.vb" />
<Compile Include="ISignals.vb" />
<Compile Include="IAuxiliaryEvent.vb" />
<Compile Include="IVectoInputs.vb" />
diff --git a/AdvancedAuxiliaryInterfaces/Diagnostics.vb b/AdvancedAuxiliaryInterfaces/Diagnostics.vb
new file mode 100644
index 0000000000000000000000000000000000000000..568feae2fdd88d3b402cea156e40c2882337b28b
--- /dev/null
+++ b/AdvancedAuxiliaryInterfaces/Diagnostics.vb
@@ -0,0 +1,35 @@
+
+
+Public Class Diagnostics
+Implements IDiagnostics
+
+
+ Public Property AA_CompressorFlag As Integer Implements IDiagnostics.AA_CompressorFlag
+
+ Public Property AA_CompressorFlowRate_LitrePerSec As Single Implements IDiagnostics.AA_CompressorFlowRate_LitrePerSec
+
+ Public Property AA_EngineIdleFlag As Integer Implements IDiagnostics.AA_EngineIdleFlag
+
+ Public Property AA_NonSmartAlternatorsEfficiency As Single Implements IDiagnostics.AA_NonSmartAlternatorsEfficiency
+
+ Public Property AA_OverrunFlag As Integer Implements IDiagnostics.AA_OverrunFlag
+
+ Public Property AA_SmartIdleAlternatorsEfficiency As Single Implements IDiagnostics.AA_SmartIdleAlternatorsEfficiency
+
+ Public Property AA_SmartIdleCurrent_Amps As Single Implements IDiagnostics.AA_SmartIdleCurrent_Amps
+
+ Public Property AA_SmartOverrunAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartOverrunAlternatorEfficiency
+
+ Public Property AA_SmartOverrunCurrent_Amps As Single Implements IDiagnostics.AA_SmartOverrunCurrent_Amps
+
+ Public Property AA_SmartTractionAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartTractionAlternatorEfficiency
+
+ Public Property AA_SmartTractionCurrent_Amps As Single Implements IDiagnostics.AA_SmartTractionCurrent_Amps
+
+ Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams
+
+ Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres
+
+
+End Class
+
diff --git a/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb b/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
index 8984b807ffdeb492fadf34c473e204d17ff4bbc0..2a323a9441f043da5f7bdc6ce8326ccc4c8a66e0 100644
--- a/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
+++ b/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
@@ -6,11 +6,27 @@ Public Interface IAdvancedAuxiliaries
'Information
ReadOnly Property Running As boolean
-Readonly Property TotalFuelGRAMS As Single
-Readonly Property TotalFuelLITRES As single
+
ReadOnly Property AuxiliaryName As String
ReadOnly Property AuxiliaryVersion As String
+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_EngineIdleFlag As integer?
+ReadOnly Property AA_CompressorFlag As integer?
+Readonly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As single?
+ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As single?
+
+Readonly Property TotalFuelGRAMS As Single
+Readonly Property TotalFuelLITRES As single
+
'Static Values
property VectoInputs As IVectoInputs
diff --git a/AdvancedAuxiliaryInterfaces/IDiagnostics.vb b/AdvancedAuxiliaryInterfaces/IDiagnostics.vb
new file mode 100644
index 0000000000000000000000000000000000000000..e49348cf867f4c6b72a01226fee6616929e7ddd5
--- /dev/null
+++ b/AdvancedAuxiliaryInterfaces/IDiagnostics.vb
@@ -0,0 +1,21 @@
+Public Interface IDiagnostics
+
+
+
+Property AA_NonSmartAlternatorsEfficiency As single
+Property AA_SmartIdleCurrent_Amps As single
+Property AA_SmartIdleAlternatorsEfficiency As single
+Property AA_SmartTractionCurrent_Amps As single
+Property AA_SmartTractionAlternatorEfficiency As single
+Property AA_SmartOverrunCurrent_Amps As Single
+Property AA_SmartOverrunAlternatorEfficiency As Single
+Property AA_CompressorFlowRate_LitrePerSec As Single
+Property AA_OverrunFlag As integer
+Property AA_EngineIdleFlag As integer
+Property AA_CompressorFlag As integer
+Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As single
+Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As single
+
+
+
+End Interface
diff --git a/AdvancedAuxiliaryInterfaces/ISignals.vb b/AdvancedAuxiliaryInterfaces/ISignals.vb
index c5915c62fe5248ad3fe76ebdc9203ee4915152bf..5bf418a0a7581404d19b9030c4f11740a677f971 100644
--- a/AdvancedAuxiliaryInterfaces/ISignals.vb
+++ b/AdvancedAuxiliaryInterfaces/ISignals.vb
@@ -8,6 +8,7 @@ Property ClutchEngaged As Boolean
Property EngineSpeed as integer
Property SmartPneumatics As Boolean
Property TotalCycleTimeSeconds As Integer
+Property CurrentCycleTimeInSeconds As Integer
property EngineDrivelineTorque as single
Property Idle As Boolean
Property InNeutral As Boolean
diff --git a/AdvancedAuxiliaryInterfaces/Signals.vb b/AdvancedAuxiliaryInterfaces/Signals.vb
index 58e1bf81b39717a92ba7feffb37c9bfe86b8d12b..0292819415ac5295ceabe77e662ca76a88882f0e 100644
--- a/AdvancedAuxiliaryInterfaces/Signals.vb
+++ b/AdvancedAuxiliaryInterfaces/Signals.vb
@@ -36,6 +36,8 @@ Implements ISignals
Public Property TotalCycleTimeSeconds As Integer Implements ISignals.TotalCycleTimeSeconds
+ public Property CurrentCycleTimeInSeconds As Integer Implements ISignals.CurrentCycleTimeInSeconds
+
Public Property PreExistingAuxPower As Single Implements ISignals.PreExistingAuxPower
Public Property Idle As Boolean Implements ISignals.Idle
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index fd83f8f6f73851be847e77421c459aedaf6d97e7..79d282aeca6046bdee982226f39e64c8b9d30b4c 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -1382,8 +1382,6 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles
configResult=AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
- dim a=2
-
else
'txtAdvancedAuxiliaryFile.Text="INVALIDFILENAME"
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index a9ae9034be9f943ab8696301236db4035efc1079..760dbf2598b9f9d7a3dde31d619ce96f4a212e86 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -40,6 +40,23 @@ Public Class cMOD
Public Pclutch As List(Of Single)
Public Grad As List(Of Single)
+ 'AA-TB
+ public AA_NonSmartAlternatorsEfficiency as List(Of single? )
+ public AA_SmartIdleCurrent_Amps as List(Of single? )
+ public AA_SmartIdleAlternatorsEfficiency as List(Of single? )
+ public AA_SmartTractionCurrent_Amps as List(Of single? )
+ public AA_SmartTractionAlternatorEfficiency as List(Of single? )
+ public AA_SmartOverrunCurrent_Amps as List(Of single? )
+ public AA_SmartOverrunAlternatorEfficiency as List(Of single? )
+ public AA_CompressorFlowRate_LitrePerSec as List(Of single? )
+ public AA_OverrunFlag as List(Of integer?)
+ public AA_EngineIdleFlag as List(Of integer?)
+ public AA_CompressorFlag as List(Of integer?)
+ public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams as List(Of single? )
+ public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres as List(Of single? )
+
+
+
Public EngState As List(Of tEngState)
'Vehicle
@@ -76,6 +93,23 @@ Public Class cMOD
Vh = New cVh
CylceKin = New cCycleKin
+
+ 'AA-TB
+ AA_NonSmartAlternatorsEfficiency = new List(Of single? )
+ AA_SmartIdleCurrent_Amps = new List(Of single? )
+ AA_SmartIdleAlternatorsEfficiency = new List(Of single? )
+ AA_SmartTractionCurrent_Amps = new List(Of single? )
+ AA_SmartTractionAlternatorEfficiency = new List(Of single? )
+ AA_SmartOverrunCurrent_Amps = new List(Of single? )
+ AA_SmartOverrunAlternatorEfficiency = new List(Of single? )
+ AA_CompressorFlowRate_LitrePerSec = new List(Of single? )
+ AA_OverrunFlag = new List(Of integer?)
+ AA_EngineIdleFlag = new List(Of integer?)
+ AA_CompressorFlag = new List(Of integer?)
+ AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams = new List(Of single? )
+ AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres = new List(Of single? )
+
+
Proll = New List(Of Single)
Psum = New List(Of Single)
Pstg = New List(Of Single)
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index 7cc99cef6e4ad7b5fe0721a9ba425bf0e7aa75fe..5a475b633c61a4b02e2027417d6dd6e753603a6b 100644
--- a/VECTO/My Project/AssemblyInfo.vb
+++ b/VECTO/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by entering "*" in them:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("2.0.4.0")>
-<Assembly: AssemblyFileVersion("2.0.4.0")>
+<Assembly: AssemblyVersion("2.1.4.0")>
+<Assembly: AssemblyFileVersion("2.1.4.0")>
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index f1f6233d96ac1d75b37eee6ed9caf04fdd8fe81f..425c6f05202d5c039ef83b2c2ac212eb28e062c4 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -9,8 +9,11 @@ Public Class AdvancedAuxiliaries
Implements IAdvancedAuxiliaries
+
+
Private auxConfig As AuxiliaryConfig
+
'Supporting classes which may generate event messages
Private WithEvents compressorMap As ICompressorMap
Private Withevents alternatorMap As IAlternatorMap
@@ -60,6 +63,7 @@ Public Class AdvancedAuxiliaries
'Initialise Model
Public Sub Initialise( auxPath As String )
+ Signals.CurrentCycleTimeInSeconds=0
auxConfig = New AuxiliaryConfig(auxPath)
'Pass some signals from config to Signals. ( These are stored in the configuration but shared in the signal distribution around modules )
@@ -182,7 +186,11 @@ End Sub
M9.CycleStep( seconds )
M11.CycleStep( seconds )
+
+ 'Used in the fuel aggregated output on M13 ( Sum 5 )
+ Signals.CurrentCycleTimeInSeconds+=1
+ Return true
End Function
@@ -195,8 +203,10 @@ End Sub
Public Function RunStart( ByVal auxFilePath As String, ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStart
- Initialise(auxFilePath)
- 'CycleStep( Signals.TotalCycleTimeSeconds, message)
+ Initialise(auxFilePath)
+
+ 'TODO:Modify Initialise to return a Bool.
+ Return true
End Function
@@ -277,6 +287,88 @@ End Sub
End Function
+ 'Diagnostic Signals
+
+ Public ReadOnly Property AA_NonSmartAlternatorsEfficiency As Single? Implements IAdvancedAuxiliaries.AA_NonSmartAlternatorsEfficiency
+ Get
+ Return M0.AlternatorsEfficiency
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartIdleCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartIdleCurrent_Amps
+ Get
+ Return M05.SmartIdleCurrent
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartIdleAlternatorsEfficiency
+ Get
+ Return M05.AlternatorsEfficiencyIdleResultCard
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartTractionCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartTractionCurrent_Amps
+ Get
+ Return M05.SmartTractionCurrent
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartTractionAlternatorEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartTractionAlternatorEfficiency
+ Get
+ Return AA_SmartTractionAlternatorEfficiency
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartOverrunCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartOverrunCurrent_Amps
+ Get
+ Return M05.SmartOverrunCurrent
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartOverrunAlternatorEfficiency
+ Get
+ Return M05.AlternatorsEfficiencyOverrunResultCard
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_CompressorFlowRate_LitrePerSec As Single? Implements IAdvancedAuxiliaries.AA_CompressorFlowRate_LitrePerSec
+ Get
+ Return M4.GetAveragePowerDemandPerCompressorUnitFlowRate
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_OverrunFlag As Integer? Implements IAdvancedAuxiliaries.AA_OverrunFlag
+ Get
+ Return M6.OverrunFlag
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_EngineIdleFlag As Integer? Implements IAdvancedAuxiliaries.AA_EngineIdleFlag
+ Get
+ Return Signals.Idle
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_CompressorFlag As Integer? Implements IAdvancedAuxiliaries.AA_CompressorFlag
+ Get
+ Return M8.CompressorFlag
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As Single? Implements IAdvancedAuxiliaries.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams
+ Get
+ Return M13.TotalCycleFuelConsumptionGrams
+ End Get
+ End Property
+
+ Public ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As Single? Implements IAdvancedAuxiliaries.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres
+ Get
+ Return M13.TotalCycleFuelConsumptionLitres
+ End Get
+ End Property
+
+
+
End Class
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
index 468fd273e3889be251be56178850d112650fb7b0..561d43815cca6803b22d4d4794b4e4eb91d5d148 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
@@ -1,7 +1,7 @@

-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
Namespace DownstreamModules
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb
index 57b30fefc402faebe442745d385e33cf77a37107..c005492aae142d4837002f014274489b54261632 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb
@@ -1,7 +1,7 @@

-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
Namespace DownstreamModules
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM8.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM8.vb
index 7ace3cf64a2afa5fc6bad87beed4a7926a4b67d2..d3ee574cd01a89a0b35fc7dedc725307410afa24 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM8.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM8.vb
@@ -1,7 +1,7 @@

-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
Namespace DownstreamModules
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
index 2d6b5ffa3c7bedf5b4df3a82a0370332966b5542..10542909a6764c8867ad4ede20a79de6cf8ea07d 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
@@ -37,7 +37,7 @@ Private readonly Property Sum4 As Single
End Property
Private readonly Property Sum5 As Single
Get
- Return ( m1.HVACFuelingLitresPerHour * ( signals.TotalCycleTimeSeconds/3600)) * FUEL_DENSITY_L3
+ Return ( m1.HVACFuelingLitresPerHour * ( signals.CurrentCycleTimeInSeconds/3600)) * FUEL_DENSITY_L3
End Get
End Property
Private ReadOnly Property Sum6 As Single
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
index b82b4409b7b81c61ecda189b5cb920200ac498a0..98abb78c403ad19983d6b7932e7d04e67fc491ee 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
@@ -182,7 +182,7 @@ Implements IAlternatorMap
End Function
Public Function ReturnDefaultMapValueTests() As String
- Dim sb = New StringBuilder()
+ Dim sb As StringBuilder = New StringBuilder()
Dim x, y As Single
'All Sector Values
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
index 8d16a7a5ad4e0df19f82c6f945acc862f76fd5a7..cfaf018464d4c202da6c1d1ae7ec59855840cfe5 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
@@ -1,4 +1,4 @@
-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
Namespace Electrics
Public Class ElectricsUserInputsConfig
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
index 7620c049511aac44e94b956ca387fe118bece001..300ce91a9d46072507775f15f6fcfbdb08db8cac 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
@@ -1,4 +1,4 @@
-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
Namespace Electrics
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
index 1fd66080b62f3ad178e55961f72d65588dc65711..fb38c33c20982753816ce039d556b80d21412a4f 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
@@ -1,4 +1,4 @@
-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
Namespace Electrics
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index d194e20e6742ae7fd8294430449413f91a0ac2e0..0839f8c3c15e0d978fb64766c6d120852c35126b 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -1,4 +1,4 @@
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
+Imports VectoAuxiliaries.Pneumatics
Namespace Pneumatics
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
index 77b2e56d801c23554cda6ed82fb89e8c1abf1017..d2d183751a5e78f3c249047cd7a81dc7245a6363 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
@@ -55,17 +55,8 @@ Namespace Pneumatics
End Set
End Property
- ''' <summary>
- ''' Creates a new instance of the AirCompressor Class
- ''' </summary>
- ''' <param name="map">map of compressor values against compressor rpm</param>
- ''' <remarks></remarks>
- 'Public Sub New(ByVal map As ICompressorMap, signals As ISignals)
- ' _map = map
- ' _signals = signals
- 'End Sub
- ''' <summary>
+ '''<summary>
''' Creates a new instance of the AirCompressor Class
''' </summary>
''' <param name="map">map of compressor values against compressor rpm</param>
diff --git a/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb b/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
index 4d2c7420600f4eeabb283538e89ee61f3b49f79a..2d9dbcea34d47b8759aaa4679322f1a25a3b365f 100644
--- a/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
@@ -42,8 +42,8 @@ Module FB_Global
Public fbVMOD As cFileBrowser
'Paths
- private MyAppPath = My.Application.Info.DirectoryPath & "\"
- private MyConfPath = MyAppPath & "Config\"
+ private MyAppPath = My.Application.Info.DirectoryPath & "\"
+ private MyConfPath = MyAppPath & "Config\"
private MyDeclPath = MyAppPath & "Declaration\"
'private FB_FilHisDir = MyConfPath & "FileHistory\"
private HomePath As String = "<HOME>"
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 9c9946ee1dc6214499509a8fa6e53c8ee2475874..e5945053c03be54991aeea42ac544a598afe1f24 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -307,7 +307,7 @@ Public Function IsZeroOrPostiveNumber(ByVal test As String) As Boolean
End Function
-Public Function IsNumberBetweenZeroandOne(test As String)
+Public Function IsNumberBetweenZeroandOne(test As String) As Boolean
'Is this numeric sanity check.
If Not IsNumeric(test) Then Return False
@@ -322,7 +322,7 @@ Public Function IsNumberBetweenZeroandOne(test As String)
End Function
-Public Function IsIntegerZeroOrPositiveNumber(test As String)
+Public Function IsIntegerZeroOrPositiveNumber(test As String) As Boolean
'Is this numeric sanity check.
If Not IsNumeric(test) Then Return False
@@ -1247,11 +1247,11 @@ Private Function GetSSMMAP( ByVal filePath As String , byref message As string)
catch ex As Exception
- Return Nothing
+ 'TODO:?
End Try
-
+ Return Nothing
End Function
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
index de99ca603df9a1e712de4ce407dc54083a824a2d..50ea62a8f867a531925d8e24fec020de004c9a3d 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -23,30 +23,30 @@ Implements IFUELMAP
Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
Get
-
+ Return New List(Of Single)
End Get
End Property
Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
Get
-
+ Return 0
End Get
End Property
Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
Get
-
+ Return New List(Of Single)
End Get
End Property
Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
Get
-
+ Return New List(Of Single)
End Get
End Property
Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
-
+ Return true
End Function
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 285fc8ecaa3fd491362962eea001d0839c64c3c2..3da3a062913a2a4bf3285e2b0e37a53ae1d10ffa 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -41,7 +41,7 @@ Signals.Setup ( Function(x) x.SmartPneumatics)
Signals.Setup ( Function(x) x.SmartElectrics) .Returns( IP5 )
m1.Setup ( Function(x) x.HVACFuelingLitresPerHour) .Returns( IP6 )
Signals.Setup ( Function(x) x.TotalCycleTimeSeconds) .Returns( 3114)
-
+Signals.Setup ( Function(x) x.CurrentCycleTimeInSeconds) .Returns( 3114)
'Act
Dim target = New M13( m1.Object, m10.Object, M12.Object, Signals.Object)