diff --git a/HVACTOOL/Module1.vb b/HVACTOOL/Module1.vb
index 240793e7d2c6fb2f2e1cd1890fcf70156f9d1a4b..047ed00cdb7c4615f211f0b40928dd4c58a8b302 100644
--- a/HVACTOOL/Module1.vb
+++ b/HVACTOOL/Module1.vb
@@ -13,8 +13,9 @@ Sub main()
Dim altSignals As New CombinedAlternatorSignals()
- Dim frm As New frmHVACTool("BusDatabase.abdb", "ssm.ahsm")
+ 'Dim frm As New frmHVACTool("BusDatabase.abdb", "ssm.ahsm")
' Dim frm As New frmCombinedAlternators("ABCDEFG.aalt",altSignals)
+ Dim frm As New frmAuxiliaryConfig("ABCX.AAUX","")
frm.ShowDialog()
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 267817c1a5c93def9bf21772bcc11d83b266797a..0e1cb2434a6842ec772eb009a32e5f8ea5695cee 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -407,7 +407,10 @@ End Sub
Public ReadOnly Property AA_EngineIdleFlag As Integer? Implements IAdvancedAuxiliaries.AA_EngineIdleFlag
Get
- Return Signals.Idle
+ ' Return Signals.Idle
+
+ Return signals.EngineSpeed <=600 ANDAlso ( NOT signals.ClutchEngaged OrElse signals.InNeutral)
+
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 6883dc29256e3109a23c3b7146cafb1320b60e0e..5b90e71596422e32543346677b6a6bed3469a881 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -50,8 +50,8 @@ Public Class AuxiliaryConfig
'Special Condition
If auxConfigFile="EMPTY" then
- ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With { .PowerNetVoltage= 26.3}
- ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(26.3,0.096,false)
+ ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With { .PowerNetVoltage= 28.3}
+ ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(28.3,0.096,false)
ElectricalUserInputsConfig.ResultCardIdle = new ResultCard( New List(Of SmartResult ))
ElectricalUserInputsConfig.ResultCardOverrun= new ResultCard( New List(Of SmartResult ))
ElectricalUserInputsConfig.ResultCardTraction= new ResultCard( New List(Of SmartResult ))
@@ -83,7 +83,7 @@ End Sub
'.CycleDurationMinutes=51.9,
- VectoInputs = New VectoInputs With {.Cycle="Urban", .VehicleWeightKG=16500, .PowerNetVoltage=26.3, .FuelMap="testFuelGoodMap.vmap"}
+ VectoInputs = New VectoInputs With {.Cycle="Urban", .VehicleWeightKG=16500, .PowerNetVoltage=28.3, .FuelMap="testFuelGoodMap.vmap"}
'Pneumatics
PneumaticUserInputsConfig = New PneumaticUserInputsConfig(true)
@@ -93,7 +93,7 @@ End Sub
'testAlternatorMap.aalt
ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With {.DoorActuationTimeSecond=4,
- .AlternatorGearEfficiency=0.8,
+ .AlternatorGearEfficiency=0.92,
.PowerNetVoltage= VectoInputs.PowerNetVoltage,
.ResultCardIdle= New ResultCard( New List(Of SmartResult)),
.ResultCardOverrun= New ResultCard(New List(Of SmartResult)),
@@ -108,7 +108,7 @@ End Sub
Signals = New Signals With { .EngineSpeed=2000, .TotalCycleTimeSeconds=3114, .ClutchEngaged=False}
- ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(26.3,0.096,true)
+ ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(28.3,0.096,true)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
index 766805a9eeac94daa4bace9ec7bd1bd5d41360ab..c620a9db7fa1f5952202c0fdaadc55864af089ae 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
@@ -224,7 +224,7 @@ End Property
End Property
Public ReadOnly Property Sum15 As Single
Get
- Return VC2 * _m4.GetPowerCompressorOn
+ Return VC2 * ( _m4.GetPowerCompressorOn * 0.97 )
End Get
End Property
Public ReadOnly property Sum16 as single
@@ -239,7 +239,7 @@ End Property
End Property
Public ReadOnly Property Sum18 As Single
Get
- Return VC4 * _m4.GetPowerCompressorOn
+ Return VC4 * ( _m4.GetPowerCompressorOn * 0.97 )
End Get
End Property
Public ReadOnly Property Sum19 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
index b3c0524fca807c50c2555291d854fad63e3e0fc6..c6a0c7e27ca500660f8a60bcc985f9700925e17a 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
@@ -32,6 +32,9 @@ Public Class M7
'Internal Switched Outputs
Private Readonly Property SW1 As Single
Get
+
+ Dim idle As Boolean = _signals.EngineSpeed <=600 ANDAlso ( NOT _signals.ClutchEngaged OrElse _signals.InNeutral)
+
Return If ( _signals.Idle, _m5.AlternatorsGenerationPowerAtCrankIdleWatts, _m5.AlternatorsGenerationPowerAtCrankTractionOnWatts)
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 81b1ae224038d71dfe554f87f1e150ceb9e57ca1..ed5c49f95bbf1a6388fbff32b4514c8c01df2de7 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -24,18 +24,18 @@ Partial Class frmAuxiliaryConfig
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuxiliaryConfig))
- Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
@@ -320,97 +320,97 @@ Partial Class frmAuxiliaryConfig
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+ DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
+ DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+ DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+ DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
+ DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+ DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+ DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
+ DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
+ DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -462,33 +462,33 @@ Partial Class frmAuxiliaryConfig
'
'gvElectricalConsumables
'
- DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+ DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
+ DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+ DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -496,6 +496,7 @@ Partial Class frmAuxiliaryConfig
'
Me.txtDoorActuationTimeSeconds.Location = New System.Drawing.Point(162, 101)
Me.txtDoorActuationTimeSeconds.Name = "txtDoorActuationTimeSeconds"
+ Me.txtDoorActuationTimeSeconds.ReadOnly = true
Me.txtDoorActuationTimeSeconds.Size = New System.Drawing.Size(100, 20)
Me.txtDoorActuationTimeSeconds.TabIndex = 9
'
@@ -503,6 +504,7 @@ Partial Class frmAuxiliaryConfig
'
Me.txtAlternatorGearEfficiency.Location = New System.Drawing.Point(162, 71)
Me.txtAlternatorGearEfficiency.Name = "txtAlternatorGearEfficiency"
+ Me.txtAlternatorGearEfficiency.ReadOnly = true
Me.txtAlternatorGearEfficiency.Size = New System.Drawing.Size(100, 20)
Me.txtAlternatorGearEfficiency.TabIndex = 6
'
@@ -517,6 +519,7 @@ Partial Class frmAuxiliaryConfig
'
Me.txtPowernetVoltage.Location = New System.Drawing.Point(162, 16)
Me.txtPowernetVoltage.Name = "txtPowernetVoltage"
+ Me.txtPowernetVoltage.ReadOnly = true
Me.txtPowernetVoltage.Size = New System.Drawing.Size(100, 20)
Me.txtPowernetVoltage.TabIndex = 2
'
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 87fcb92670fed29991acac46f1797cb94dfd6de8..720e9337367d000f7c4682130e7e339483491bd4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -80,6 +80,9 @@ public class SSMToolMock
End Function
Public Property TechList As ISSMTechList Implements ISSMTOOL.TechList
+
+ public Event Message(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) Implements ISSMTOOL.Message
+
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 452cf443449a4d65a24118347f600eb8818293ac..4ca0166d8050599cc3830cea1b62540cde720c67 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -52,7 +52,7 @@ End Sub
'Test Cases Supplied by Mike Preston.
<Test()> _
<TestCase(100,100,100,100,20,20,40,100,100,100,.100f,-.550f,false, 0,0, 0, 20, 0,100,20,200,0)> _
-<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,true , 1,1, 100,40, 100,100,40,200,1)> _
+<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,true , 1,1, 100,38.7999992f, 100,100,38.7999992f,200,1)> _
Public Sub MikesConditionsTest( M1_1 As Single, _
M1_2 As Single, _
M2_1 As Single, _