diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 0baab8ff5c4cda603f0835b7ac01bd45426facec..4e74240c2bb28aedc80b16eab37ad2a1db6c0d4f 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -23,18 +23,18 @@ Partial Class Dashboard
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle36 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.btnForward = New System.Windows.Forms.Button()
@@ -128,7 +128,17 @@ Partial Class Dashboard
Me.txtHVACElectricalLoadPowerWatts = New System.Windows.Forms.TextBox()
Me.lblHVACElectricalLoadPowerWatts = New System.Windows.Forms.Label()
Me.tabPlayground = New System.Windows.Forms.TabPage()
+ Me.lblM5_SmartAltSetGeneration = New System.Windows.Forms.Label()
+ Me.Panel3 = New System.Windows.Forms.Panel()
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts = New System.Windows.Forms.Label()
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts = New System.Windows.Forms.Label()
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts = New System.Windows.Forms.TextBox()
+ Me.lblM5_AltRegenPowerAtCrankIdleW = New System.Windows.Forms.Label()
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts = New System.Windows.Forms.TextBox()
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts = New System.Windows.Forms.TextBox()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.lblM4_AirCompressor = New System.Windows.Forms.Label()
+ Me.btnFinish = New System.Windows.Forms.Button()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.lblM4_PowerAtCrankFromPSCompressorON = New System.Windows.Forms.Label()
Me.lblM4_PowerAtCrankFromPSCompressorOFF = New System.Windows.Forms.Label()
@@ -144,6 +154,7 @@ Partial Class Dashboard
Me.lbl_M3_AvgPowerAtCrankFromPneumatics = New System.Windows.Forms.Label()
Me.txtM3_out_TotalAirConsumedPerCycleInLitres = New System.Windows.Forms.TextBox()
Me.txtM3_out_AveragePowerAtCrankFromPneumatics = New System.Windows.Forms.TextBox()
+ Me.btnStart = New System.Windows.Forms.Button()
Me.lblM2AverageElectricalLoadTitle = New System.Windows.Forms.Label()
Me.pnl_M2_Displays = New System.Windows.Forms.Panel()
Me.lblM2_AvgPwrDmdAtCrankFromElectrics = New System.Windows.Forms.Label()
@@ -180,32 +191,21 @@ Partial Class Dashboard
Me.lblAlternatorsEfficiency = New System.Windows.Forms.Label()
Me.txtM0_Out_AlternatorsEfficiency = New System.Windows.Forms.TextBox()
Me.txtM0_Out_HVacElectricalCurrentDemand = New System.Windows.Forms.TextBox()
+ Me.chkClutchEngaged = New System.Windows.Forms.CheckBox()
+ Me.lblTotalCycleTimeSeconds = New System.Windows.Forms.Label()
+ Me.lblEngineSpeed = New System.Windows.Forms.Label()
+ Me.lblEngineMotoringPower = New System.Windows.Forms.Label()
+ Me.lblEngineDrivelineTorque = New System.Windows.Forms.Label()
+ Me.lblEngineDrivelinePower = New System.Windows.Forms.Label()
+ Me.txtTotalCycleTimeSeconds = New System.Windows.Forms.TextBox()
+ Me.txtEngineSpeed = New System.Windows.Forms.TextBox()
+ Me.txtEngineMotoringPower = New System.Windows.Forms.TextBox()
+ Me.txtEngineDrivelineTorque = New System.Windows.Forms.TextBox()
+ Me.txtEngineDrivelinePower = New System.Windows.Forms.TextBox()
Me.resultCardContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
- Me.Panel3 = New System.Windows.Forms.Panel()
- Me.lblM5_SmartAltSetGeneration = New System.Windows.Forms.Label()
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts = New System.Windows.Forms.TextBox()
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts = New System.Windows.Forms.TextBox()
- Me.lblM5_AltRegenPowerAtCrankIdleW = New System.Windows.Forms.Label()
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts = New System.Windows.Forms.Label()
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts = New System.Windows.Forms.TextBox()
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts = New System.Windows.Forms.Label()
- Me.txtEngineDrivelinePower = New System.Windows.Forms.TextBox()
- Me.txtEngineDrivelineTorque = New System.Windows.Forms.TextBox()
- Me.txtEngineMotoringPower = New System.Windows.Forms.TextBox()
- Me.txtEngineSpeed = New System.Windows.Forms.TextBox()
- Me.txtTotalCycleTimeSeconds = New System.Windows.Forms.TextBox()
- Me.lblEngineDrivelinePower = New System.Windows.Forms.Label()
- Me.lblEngineDrivelineTorque = New System.Windows.Forms.Label()
- Me.lblEngineMotoringPower = New System.Windows.Forms.Label()
- Me.lblEngineSpeed = New System.Windows.Forms.Label()
- Me.lblTotalCycleTimeSeconds = New System.Windows.Forms.Label()
- Me.chkClutchEngaged = New System.Windows.Forms.CheckBox()
- Me.btnStart = New System.Windows.Forms.Button()
- Me.btnFinish = New System.Windows.Forms.Button()
- Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -219,6 +219,8 @@ Partial Class Dashboard
Me.pnlPneumaticAuxillaries.SuspendLayout
Me.tabHVACConfig.SuspendLayout
Me.tabPlayground.SuspendLayout
+ Me.Panel3.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
Me.Panel1.SuspendLayout
Me.pnl_M3_Displays.SuspendLayout
Me.pnl_M2_Displays.SuspendLayout
@@ -227,8 +229,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.SuspendLayout
Me.resultCardContextMenu.SuspendLayout
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).BeginInit
- Me.Panel3.SuspendLayout
- CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
Me.SuspendLayout
'
'pnlMain
@@ -295,7 +295,7 @@ Partial Class Dashboard
Me.tabGeneralConfig.Location = New System.Drawing.Point(4, 22)
Me.tabGeneralConfig.Name = "tabGeneralConfig"
Me.tabGeneralConfig.Padding = New System.Windows.Forms.Padding(3)
- Me.tabGeneralConfig.Size = New System.Drawing.Size(909, 632)
+ Me.tabGeneralConfig.Size = New System.Drawing.Size(909, 643)
Me.tabGeneralConfig.TabIndex = 0
Me.tabGeneralConfig.Text = "GeneralConfig"
Me.tabGeneralConfig.UseVisualStyleBackColor = true
@@ -357,7 +357,7 @@ Partial Class Dashboard
Me.tabElectricalConfig.Location = New System.Drawing.Point(4, 22)
Me.tabElectricalConfig.Name = "tabElectricalConfig"
Me.tabElectricalConfig.Padding = New System.Windows.Forms.Padding(3)
- Me.tabElectricalConfig.Size = New System.Drawing.Size(909, 632)
+ Me.tabElectricalConfig.Size = New System.Drawing.Size(909, 643)
Me.tabElectricalConfig.TabIndex = 1
Me.tabElectricalConfig.Text = "ElectricalConfig"
Me.tabElectricalConfig.UseVisualStyleBackColor = true
@@ -373,97 +373,97 @@ Partial Class Dashboard
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25
+ 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
- DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle26
+ 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"
- DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle27
+ 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
'
- DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
+ 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
- DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle29
+ 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"
- DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle30
+ 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
'
- DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
+ 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
- DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle32
+ 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"
- DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
+ 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
'
@@ -515,33 +515,33 @@ Partial Class Dashboard
'
'gvElectricalConsumables
'
- DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+ 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
- DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle35
+ 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"
- DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
+ 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
'
@@ -587,9 +587,9 @@ Partial Class Dashboard
Me.lblAlternatorGearEfficiency.AutoSize = true
Me.lblAlternatorGearEfficiency.Location = New System.Drawing.Point(30, 73)
Me.lblAlternatorGearEfficiency.Name = "lblAlternatorGearEfficiency"
- Me.lblAlternatorGearEfficiency.Size = New System.Drawing.Size(121, 13)
+ Me.lblAlternatorGearEfficiency.Size = New System.Drawing.Size(132, 13)
Me.lblAlternatorGearEfficiency.TabIndex = 7
- Me.lblAlternatorGearEfficiency.Text = "AlternatorGearEfficiency"
+ Me.lblAlternatorGearEfficiency.Text = "Alternator Pulley Efficiency"
'
'lblAlternatormapPath
'
@@ -615,7 +615,7 @@ Partial Class Dashboard
Me.tabPneumaticConfig.Controls.Add(Me.pnlPneumaticAuxillaries)
Me.tabPneumaticConfig.Location = New System.Drawing.Point(4, 22)
Me.tabPneumaticConfig.Name = "tabPneumaticConfig"
- Me.tabPneumaticConfig.Size = New System.Drawing.Size(909, 632)
+ Me.tabPneumaticConfig.Size = New System.Drawing.Size(909, 643)
Me.tabPneumaticConfig.TabIndex = 2
Me.tabPneumaticConfig.Text = "PneumaticConfig"
Me.tabPneumaticConfig.UseVisualStyleBackColor = true
@@ -705,7 +705,7 @@ Partial Class Dashboard
'
Me.chkSmartAirCompression.AutoSize = true
Me.chkSmartAirCompression.FlatStyle = System.Windows.Forms.FlatStyle.System
- Me.chkSmartAirCompression.Location = New System.Drawing.Point(156, 469)
+ Me.chkSmartAirCompression.Location = New System.Drawing.Point(156, 473)
Me.chkSmartAirCompression.Name = "chkSmartAirCompression"
Me.chkSmartAirCompression.Size = New System.Drawing.Size(35, 18)
Me.chkSmartAirCompression.TabIndex = 48
@@ -725,7 +725,7 @@ Partial Class Dashboard
'
Me.chkSmartRegeneration.AutoSize = true
Me.chkSmartRegeneration.FlatStyle = System.Windows.Forms.FlatStyle.System
- Me.chkSmartRegeneration.Location = New System.Drawing.Point(156, 510)
+ Me.chkSmartRegeneration.Location = New System.Drawing.Point(156, 513)
Me.chkSmartRegeneration.Name = "chkSmartRegeneration"
Me.chkSmartRegeneration.Size = New System.Drawing.Size(35, 18)
Me.chkSmartRegeneration.TabIndex = 47
@@ -745,7 +745,7 @@ Partial Class Dashboard
'
Me.chkRetarderBrake.AutoSize = true
Me.chkRetarderBrake.FlatStyle = System.Windows.Forms.FlatStyle.System
- Me.chkRetarderBrake.Location = New System.Drawing.Point(156, 428)
+ Me.chkRetarderBrake.Location = New System.Drawing.Point(156, 431)
Me.chkRetarderBrake.Name = "chkRetarderBrake"
Me.chkRetarderBrake.Size = New System.Drawing.Size(38, 18)
Me.chkRetarderBrake.TabIndex = 45
@@ -1154,7 +1154,7 @@ Partial Class Dashboard
Me.tabHVACConfig.Controls.Add(Me.lblHVACElectricalLoadPowerWatts)
Me.tabHVACConfig.Location = New System.Drawing.Point(4, 22)
Me.tabHVACConfig.Name = "tabHVACConfig"
- Me.tabHVACConfig.Size = New System.Drawing.Size(909, 632)
+ Me.tabHVACConfig.Size = New System.Drawing.Size(909, 643)
Me.tabHVACConfig.TabIndex = 3
Me.tabHVACConfig.Text = "HVACConfig"
Me.tabHVACConfig.UseVisualStyleBackColor = true
@@ -1256,6 +1256,89 @@ Partial Class Dashboard
Me.tabPlayground.Text = "Playground"
Me.tabPlayground.UseVisualStyleBackColor = true
'
+ 'lblM5_SmartAltSetGeneration
+ '
+ Me.lblM5_SmartAltSetGeneration.AutoSize = true
+ Me.lblM5_SmartAltSetGeneration.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblM5_SmartAltSetGeneration.Location = New System.Drawing.Point(379, 470)
+ Me.lblM5_SmartAltSetGeneration.Name = "lblM5_SmartAltSetGeneration"
+ Me.lblM5_SmartAltSetGeneration.Size = New System.Drawing.Size(168, 13)
+ Me.lblM5_SmartAltSetGeneration.TabIndex = 37
+ Me.lblM5_SmartAltSetGeneration.Text = "M5-Smart Alt Set Generation"
+ '
+ 'Panel3
+ '
+ Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.Panel3.Controls.Add(Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts)
+ Me.Panel3.Controls.Add(Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts)
+ Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts)
+ Me.Panel3.Controls.Add(Me.lblM5_AltRegenPowerAtCrankIdleW)
+ Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankTractionWatts)
+ Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankIdleWatts)
+ Me.Panel3.Location = New System.Drawing.Point(380, 486)
+ Me.Panel3.Name = "Panel3"
+ Me.Panel3.Size = New System.Drawing.Size(197, 141)
+ Me.Panel3.TabIndex = 36
+ '
+ 'lblM5_AlternatorRegenPowerAtCrankTractionWatts
+ '
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.AutoSize = true
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Location = New System.Drawing.Point(5, 48)
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Name = "lblM5_AlternatorRegenPowerAtCrankTractionWatts"
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Size = New System.Drawing.Size(190, 13)
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.TabIndex = 6
+ Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Text = "Alt Regen Pwr@tCrank Traction Watts"
+ '
+ 'M5_AlternatorGenerationPowerAtCrankOverrunWatts
+ '
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.AutoSize = true
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Location = New System.Drawing.Point(8, 87)
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Name = "M5_AlternatorGenerationPowerAtCrankOverrunWatts"
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Size = New System.Drawing.Size(186, 13)
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.TabIndex = 5
+ Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Text = "Alt Regen Pwr@Crank Overrun Watts"
+ '
+ 'txtM5_out_AltRegenPowerAtCrankOverrunWatts
+ '
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Location = New System.Drawing.Point(8, 105)
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Name = "txtM5_out_AltRegenPowerAtCrankOverrunWatts"
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Size = New System.Drawing.Size(100, 20)
+ Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.TabIndex = 4
+ '
+ 'lblM5_AltRegenPowerAtCrankIdleW
+ '
+ Me.lblM5_AltRegenPowerAtCrankIdleW.AutoSize = true
+ Me.lblM5_AltRegenPowerAtCrankIdleW.Location = New System.Drawing.Point(5, 5)
+ Me.lblM5_AltRegenPowerAtCrankIdleW.Name = "lblM5_AltRegenPowerAtCrankIdleW"
+ Me.lblM5_AltRegenPowerAtCrankIdleW.Size = New System.Drawing.Size(165, 13)
+ Me.lblM5_AltRegenPowerAtCrankIdleW.TabIndex = 2
+ Me.lblM5_AltRegenPowerAtCrankIdleW.Text = "Alt Regen Pwr@tCrank IdleWatts"
+ '
+ 'txtM5_out_AltRegenPowerAtCrankTractionWatts
+ '
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Location = New System.Drawing.Point(8, 64)
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Name = "txtM5_out_AltRegenPowerAtCrankTractionWatts"
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Size = New System.Drawing.Size(100, 20)
+ Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.TabIndex = 1
+ '
+ 'txtM5_out_AltRegenPowerAtCrankIdleWatts
+ '
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Location = New System.Drawing.Point(8, 21)
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Name = "txtM5_out_AltRegenPowerAtCrankIdleWatts"
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Size = New System.Drawing.Size(100, 20)
+ Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.TabIndex = 0
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.Location = New System.Drawing.Point(28, 280)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(100, 94)
+ Me.PictureBox1.TabIndex = 34
+ Me.PictureBox1.TabStop = false
+ '
'lblM4_AirCompressor
'
Me.lblM4_AirCompressor.AutoSize = true
@@ -1266,6 +1349,15 @@ Partial Class Dashboard
Me.lblM4_AirCompressor.TabIndex = 33
Me.lblM4_AirCompressor.Text = "M4-Air Compressor"
'
+ 'btnFinish
+ '
+ Me.btnFinish.Location = New System.Drawing.Point(25, 448)
+ Me.btnFinish.Name = "btnFinish"
+ Me.btnFinish.Size = New System.Drawing.Size(100, 23)
+ Me.btnFinish.TabIndex = 4
+ Me.btnFinish.Text = "Stop Processing"
+ Me.btnFinish.UseVisualStyleBackColor = true
+ '
'Panel1
'
Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -1406,6 +1498,15 @@ Partial Class Dashboard
Me.txtM3_out_AveragePowerAtCrankFromPneumatics.Size = New System.Drawing.Size(100, 20)
Me.txtM3_out_AveragePowerAtCrankFromPneumatics.TabIndex = 0
'
+ 'btnStart
+ '
+ Me.btnStart.Location = New System.Drawing.Point(25, 392)
+ Me.btnStart.Name = "btnStart"
+ Me.btnStart.Size = New System.Drawing.Size(102, 23)
+ Me.btnStart.TabIndex = 1
+ Me.btnStart.Text = "Start Processing"
+ Me.btnStart.UseVisualStyleBackColor = true
+ '
'lblM2AverageElectricalLoadTitle
'
Me.lblM2AverageElectricalLoadTitle.AutoSize = true
@@ -1746,134 +1847,51 @@ Partial Class Dashboard
Me.txtM0_Out_HVacElectricalCurrentDemand.Size = New System.Drawing.Size(100, 20)
Me.txtM0_Out_HVacElectricalCurrentDemand.TabIndex = 0
'
- 'resultCardContextMenu
- '
- Me.resultCardContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeleteToolStripMenuItem})
- Me.resultCardContextMenu.Name = "resultCardContextMenu"
- Me.resultCardContextMenu.Size = New System.Drawing.Size(108, 26)
- '
- 'DeleteToolStripMenuItem
- '
- Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
- Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(107, 22)
- Me.DeleteToolStripMenuItem.Text = "Delete"
- '
- 'ErrorProvider
- '
- Me.ErrorProvider.ContainerControl = Me
- '
- 'Timer1
- '
- '
- 'Panel3
- '
- Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.Panel3.Controls.Add(Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts)
- Me.Panel3.Controls.Add(Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts)
- Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts)
- Me.Panel3.Controls.Add(Me.lblM5_AltRegenPowerAtCrankIdleW)
- Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankTractionWatts)
- Me.Panel3.Controls.Add(Me.txtM5_out_AltRegenPowerAtCrankIdleWatts)
- Me.Panel3.Location = New System.Drawing.Point(380, 486)
- Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(197, 141)
- Me.Panel3.TabIndex = 36
- '
- 'lblM5_SmartAltSetGeneration
- '
- Me.lblM5_SmartAltSetGeneration.AutoSize = true
- Me.lblM5_SmartAltSetGeneration.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblM5_SmartAltSetGeneration.Location = New System.Drawing.Point(379, 470)
- Me.lblM5_SmartAltSetGeneration.Name = "lblM5_SmartAltSetGeneration"
- Me.lblM5_SmartAltSetGeneration.Size = New System.Drawing.Size(168, 13)
- Me.lblM5_SmartAltSetGeneration.TabIndex = 37
- Me.lblM5_SmartAltSetGeneration.Text = "M5-Smart Alt Set Generation"
- '
- 'txtM5_out_AltRegenPowerAtCrankIdleWatts
- '
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Location = New System.Drawing.Point(8, 21)
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Name = "txtM5_out_AltRegenPowerAtCrankIdleWatts"
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.Size = New System.Drawing.Size(100, 20)
- Me.txtM5_out_AltRegenPowerAtCrankIdleWatts.TabIndex = 0
- '
- 'txtM5_out_AltRegenPowerAtCrankTractionWatts
- '
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Location = New System.Drawing.Point(8, 64)
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Name = "txtM5_out_AltRegenPowerAtCrankTractionWatts"
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.Size = New System.Drawing.Size(100, 20)
- Me.txtM5_out_AltRegenPowerAtCrankTractionWatts.TabIndex = 1
- '
- 'lblM5_AltRegenPowerAtCrankIdleW
- '
- Me.lblM5_AltRegenPowerAtCrankIdleW.AutoSize = true
- Me.lblM5_AltRegenPowerAtCrankIdleW.Location = New System.Drawing.Point(5, 5)
- Me.lblM5_AltRegenPowerAtCrankIdleW.Name = "lblM5_AltRegenPowerAtCrankIdleW"
- Me.lblM5_AltRegenPowerAtCrankIdleW.Size = New System.Drawing.Size(165, 13)
- Me.lblM5_AltRegenPowerAtCrankIdleW.TabIndex = 2
- Me.lblM5_AltRegenPowerAtCrankIdleW.Text = "Alt Regen Pwr@tCrank IdleWatts"
- '
- 'M5_AlternatorGenerationPowerAtCrankOverrunWatts
- '
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.AutoSize = true
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Location = New System.Drawing.Point(8, 87)
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Name = "M5_AlternatorGenerationPowerAtCrankOverrunWatts"
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Size = New System.Drawing.Size(186, 13)
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.TabIndex = 5
- Me.M5_AlternatorGenerationPowerAtCrankOverrunWatts.Text = "Alt Regen Pwr@Crank Overrun Watts"
- '
- 'txtM5_out_AltRegenPowerAtCrankOverrunWatts
- '
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Location = New System.Drawing.Point(8, 105)
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Name = "txtM5_out_AltRegenPowerAtCrankOverrunWatts"
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.Size = New System.Drawing.Size(100, 20)
- Me.txtM5_out_AltRegenPowerAtCrankOverrunWatts.TabIndex = 4
- '
- 'lblM5_AlternatorRegenPowerAtCrankTractionWatts
- '
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.AutoSize = true
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Location = New System.Drawing.Point(5, 48)
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Name = "lblM5_AlternatorRegenPowerAtCrankTractionWatts"
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Size = New System.Drawing.Size(190, 13)
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.TabIndex = 6
- Me.lblM5_AlternatorRegenPowerAtCrankTractionWatts.Text = "Alt Regen Pwr@tCrank Traction Watts"
- '
- 'txtEngineDrivelinePower
+ 'chkClutchEngaged
'
- Me.txtEngineDrivelinePower.Location = New System.Drawing.Point(25, 76)
- Me.txtEngineDrivelinePower.Name = "txtEngineDrivelinePower"
- Me.txtEngineDrivelinePower.Size = New System.Drawing.Size(100, 20)
- Me.txtEngineDrivelinePower.TabIndex = 1
+ Me.chkClutchEngaged.AutoSize = true
+ Me.chkClutchEngaged.Location = New System.Drawing.Point(25, 20)
+ Me.chkClutchEngaged.Name = "chkClutchEngaged"
+ Me.chkClutchEngaged.Size = New System.Drawing.Size(102, 17)
+ Me.chkClutchEngaged.TabIndex = 20
+ Me.chkClutchEngaged.Text = "Clutch Engaged"
+ Me.chkClutchEngaged.UseVisualStyleBackColor = true
'
- 'txtEngineDrivelineTorque
+ 'lblTotalCycleTimeSeconds
'
- Me.txtEngineDrivelineTorque.Location = New System.Drawing.Point(25, 120)
- Me.txtEngineDrivelineTorque.Name = "txtEngineDrivelineTorque"
- Me.txtEngineDrivelineTorque.Size = New System.Drawing.Size(100, 20)
- Me.txtEngineDrivelineTorque.TabIndex = 2
+ Me.lblTotalCycleTimeSeconds.AutoSize = true
+ Me.lblTotalCycleTimeSeconds.Location = New System.Drawing.Point(25, 237)
+ Me.lblTotalCycleTimeSeconds.Name = "lblTotalCycleTimeSeconds"
+ Me.lblTotalCycleTimeSeconds.Size = New System.Drawing.Size(134, 13)
+ Me.lblTotalCycleTimeSeconds.TabIndex = 14
+ Me.lblTotalCycleTimeSeconds.Text = "Total Cycle Time Seconds "
'
- 'txtEngineMotoringPower
+ 'lblEngineSpeed
'
- Me.txtEngineMotoringPower.Location = New System.Drawing.Point(25, 165)
- Me.txtEngineMotoringPower.Name = "txtEngineMotoringPower"
- Me.txtEngineMotoringPower.Size = New System.Drawing.Size(100, 20)
- Me.txtEngineMotoringPower.TabIndex = 3
+ Me.lblEngineSpeed.AutoSize = true
+ Me.lblEngineSpeed.Location = New System.Drawing.Point(23, 192)
+ Me.lblEngineSpeed.Name = "lblEngineSpeed"
+ Me.lblEngineSpeed.Size = New System.Drawing.Size(107, 13)
+ Me.lblEngineSpeed.TabIndex = 13
+ Me.lblEngineSpeed.Text = "Engine Speed (RPM)"
'
- 'txtEngineSpeed
+ 'lblEngineMotoringPower
'
- Me.txtEngineSpeed.Location = New System.Drawing.Point(25, 205)
- Me.txtEngineSpeed.Name = "txtEngineSpeed"
- Me.txtEngineSpeed.Size = New System.Drawing.Size(100, 20)
- Me.txtEngineSpeed.TabIndex = 4
+ Me.lblEngineMotoringPower.AutoSize = true
+ Me.lblEngineMotoringPower.Location = New System.Drawing.Point(24, 148)
+ Me.lblEngineMotoringPower.Name = "lblEngineMotoringPower"
+ Me.lblEngineMotoringPower.Size = New System.Drawing.Size(117, 13)
+ Me.lblEngineMotoringPower.TabIndex = 12
+ Me.lblEngineMotoringPower.Text = "Engine Motoring Power"
'
- 'txtTotalCycleTimeSeconds
+ 'lblEngineDrivelineTorque
'
- Me.txtTotalCycleTimeSeconds.Location = New System.Drawing.Point(25, 254)
- Me.txtTotalCycleTimeSeconds.Name = "txtTotalCycleTimeSeconds"
- Me.txtTotalCycleTimeSeconds.Size = New System.Drawing.Size(100, 20)
- Me.txtTotalCycleTimeSeconds.TabIndex = 5
+ Me.lblEngineDrivelineTorque.AutoSize = true
+ Me.lblEngineDrivelineTorque.Location = New System.Drawing.Point(24, 103)
+ Me.lblEngineDrivelineTorque.Name = "lblEngineDrivelineTorque"
+ Me.lblEngineDrivelineTorque.Size = New System.Drawing.Size(121, 13)
+ Me.lblEngineDrivelineTorque.TabIndex = 11
+ Me.lblEngineDrivelineTorque.Text = "Engine Driveline Torque"
'
'lblEngineDrivelinePower
'
@@ -1884,77 +1902,59 @@ Partial Class Dashboard
Me.lblEngineDrivelinePower.TabIndex = 10
Me.lblEngineDrivelinePower.Text = "Engine Driveline Power "
'
- 'lblEngineDrivelineTorque
+ 'txtTotalCycleTimeSeconds
'
- Me.lblEngineDrivelineTorque.AutoSize = true
- Me.lblEngineDrivelineTorque.Location = New System.Drawing.Point(24, 103)
- Me.lblEngineDrivelineTorque.Name = "lblEngineDrivelineTorque"
- Me.lblEngineDrivelineTorque.Size = New System.Drawing.Size(121, 13)
- Me.lblEngineDrivelineTorque.TabIndex = 11
- Me.lblEngineDrivelineTorque.Text = "Engine Driveline Torque"
+ Me.txtTotalCycleTimeSeconds.Location = New System.Drawing.Point(25, 254)
+ Me.txtTotalCycleTimeSeconds.Name = "txtTotalCycleTimeSeconds"
+ Me.txtTotalCycleTimeSeconds.Size = New System.Drawing.Size(100, 20)
+ Me.txtTotalCycleTimeSeconds.TabIndex = 5
'
- 'lblEngineMotoringPower
+ 'txtEngineSpeed
'
- Me.lblEngineMotoringPower.AutoSize = true
- Me.lblEngineMotoringPower.Location = New System.Drawing.Point(24, 148)
- Me.lblEngineMotoringPower.Name = "lblEngineMotoringPower"
- Me.lblEngineMotoringPower.Size = New System.Drawing.Size(117, 13)
- Me.lblEngineMotoringPower.TabIndex = 12
- Me.lblEngineMotoringPower.Text = "Engine Motoring Power"
+ Me.txtEngineSpeed.Location = New System.Drawing.Point(25, 205)
+ Me.txtEngineSpeed.Name = "txtEngineSpeed"
+ Me.txtEngineSpeed.Size = New System.Drawing.Size(100, 20)
+ Me.txtEngineSpeed.TabIndex = 4
'
- 'lblEngineSpeed
+ 'txtEngineMotoringPower
'
- Me.lblEngineSpeed.AutoSize = true
- Me.lblEngineSpeed.Location = New System.Drawing.Point(23, 192)
- Me.lblEngineSpeed.Name = "lblEngineSpeed"
- Me.lblEngineSpeed.Size = New System.Drawing.Size(107, 13)
- Me.lblEngineSpeed.TabIndex = 13
- Me.lblEngineSpeed.Text = "Engine Speed (RPM)"
+ Me.txtEngineMotoringPower.Location = New System.Drawing.Point(25, 165)
+ Me.txtEngineMotoringPower.Name = "txtEngineMotoringPower"
+ Me.txtEngineMotoringPower.Size = New System.Drawing.Size(100, 20)
+ Me.txtEngineMotoringPower.TabIndex = 3
'
- 'lblTotalCycleTimeSeconds
+ 'txtEngineDrivelineTorque
'
- Me.lblTotalCycleTimeSeconds.AutoSize = true
- Me.lblTotalCycleTimeSeconds.Location = New System.Drawing.Point(25, 237)
- Me.lblTotalCycleTimeSeconds.Name = "lblTotalCycleTimeSeconds"
- Me.lblTotalCycleTimeSeconds.Size = New System.Drawing.Size(134, 13)
- Me.lblTotalCycleTimeSeconds.TabIndex = 14
- Me.lblTotalCycleTimeSeconds.Text = "Total Cycle Time Seconds "
+ Me.txtEngineDrivelineTorque.Location = New System.Drawing.Point(25, 120)
+ Me.txtEngineDrivelineTorque.Name = "txtEngineDrivelineTorque"
+ Me.txtEngineDrivelineTorque.Size = New System.Drawing.Size(100, 20)
+ Me.txtEngineDrivelineTorque.TabIndex = 2
'
- 'chkClutchEngaged
+ 'txtEngineDrivelinePower
'
- Me.chkClutchEngaged.AutoSize = true
- Me.chkClutchEngaged.Location = New System.Drawing.Point(25, 20)
- Me.chkClutchEngaged.Name = "chkClutchEngaged"
- Me.chkClutchEngaged.Size = New System.Drawing.Size(102, 17)
- Me.chkClutchEngaged.TabIndex = 20
- Me.chkClutchEngaged.Text = "Clutch Engaged"
- Me.chkClutchEngaged.UseVisualStyleBackColor = true
+ Me.txtEngineDrivelinePower.Location = New System.Drawing.Point(25, 76)
+ Me.txtEngineDrivelinePower.Name = "txtEngineDrivelinePower"
+ Me.txtEngineDrivelinePower.Size = New System.Drawing.Size(100, 20)
+ Me.txtEngineDrivelinePower.TabIndex = 1
'
- 'btnStart
+ 'resultCardContextMenu
'
- Me.btnStart.Location = New System.Drawing.Point(25, 392)
- Me.btnStart.Name = "btnStart"
- Me.btnStart.Size = New System.Drawing.Size(102, 23)
- Me.btnStart.TabIndex = 1
- Me.btnStart.Text = "Start Processing"
- Me.btnStart.UseVisualStyleBackColor = true
+ Me.resultCardContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeleteToolStripMenuItem})
+ Me.resultCardContextMenu.Name = "resultCardContextMenu"
+ Me.resultCardContextMenu.Size = New System.Drawing.Size(108, 26)
'
- 'btnFinish
+ 'DeleteToolStripMenuItem
'
- Me.btnFinish.Location = New System.Drawing.Point(25, 448)
- Me.btnFinish.Name = "btnFinish"
- Me.btnFinish.Size = New System.Drawing.Size(100, 23)
- Me.btnFinish.TabIndex = 4
- Me.btnFinish.Text = "Stop Processing"
- Me.btnFinish.UseVisualStyleBackColor = true
+ Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
+ Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(107, 22)
+ Me.DeleteToolStripMenuItem.Text = "Delete"
'
- 'PictureBox1
+ 'ErrorProvider
+ '
+ Me.ErrorProvider.ContainerControl = Me
+ '
+ 'Timer1
'
- Me.PictureBox1.Location = New System.Drawing.Point(28, 280)
- Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(100, 94)
- Me.PictureBox1.TabIndex = 34
- Me.PictureBox1.TabStop = false
'
'Dashboard
'
@@ -1984,6 +1984,9 @@ Partial Class Dashboard
Me.tabHVACConfig.PerformLayout
Me.tabPlayground.ResumeLayout(false)
Me.tabPlayground.PerformLayout
+ Me.Panel3.ResumeLayout(false)
+ Me.Panel3.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
Me.Panel1.ResumeLayout(false)
Me.Panel1.PerformLayout
Me.pnl_M3_Displays.ResumeLayout(false)
@@ -1998,9 +2001,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.PerformLayout
Me.resultCardContextMenu.ResumeLayout(false)
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).EndInit
- Me.Panel3.ResumeLayout(false)
- Me.Panel3.PerformLayout
- CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
Me.ResumeLayout(false)
End Sub
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index 37d5268433910d4a42a8f051cf1780e8bb258e52..39a2f2c7a67401f1507421d18e5f3322c3dee67d 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -18,6 +18,8 @@ Private Sub SetupControls()
Dim cIndex As Integer = 0
+ gvElectricalConsumables.AutoGenerateColumns=false
+
'ElectricalConsumerGrid
'Columns
cIndex = gvElectricalConsumables.Columns.Add("Category", "Category")
@@ -108,7 +110,7 @@ End Sub
Private Sub CreateBindings()
'AuxEnvironment.Vecto Bindings
- txtPowernetVoltage.DataBindings.Add("Text", auxEnvironment.VectoInputs, "PowerNetVoltage")
+ txtPowernetVoltage.DataBindings.Add("Text", auxEnvironment.ElectricalUserInputsConfig, "PowerNetVoltage")
txtVehicleWeightKG.DataBindings.Add("Text", auxEnvironment.VectoInputs, "VehicleWeightKG")
cboCycle.DataBindings.Add("Text", auxEnvironment.VectoInputs, "Cycle")
@@ -186,6 +188,7 @@ Private Sub CreateBindings()
txtEngineDrivelineTorque.DataBindings.Add("Text", auxEnvironment.Signals,"EngineDrivelineTorque")
txtEngineMotoringPower.DataBindings.Add("Text", auxEnvironment.Signals,"EngineMotoringPower")
txtEngineSpeed.DataBindings.Add("Text", auxEnvironment.Signals,"EngineSpeed")
+ txtTotalCycleTimeSeconds.DataBindings.Add("Text",auxEnvironment.Signals,"TotalCycleTimeSeconds")
End Sub
diff --git a/VECTO/GUI/F_VEH_AuxDlog.vb b/VECTO/GUI/F_VEH_AuxDlog.vb
index 9972d93cd64a3f2032082be401d9c569e087c3be..a32d29639ea6898c6c821fa9700c6ed41706b78c 100644
--- a/VECTO/GUI/F_VEH_AuxDlog.vb
+++ b/VECTO/GUI/F_VEH_AuxDlog.vb
@@ -296,28 +296,28 @@ Public Class F_VEH_AuxDlog
If fbAUX.OpenDialog(fFileRepl(Me.TbPath.Text, VehPath)) Then Me.TbPath.Text = fFileWoDir(fbAUX.Files(0), VehPath)
If (TbID.Text = sKey.AUX.HVAC AndAlso Me.TbPath.Text.Length <> 0) Then
- Dim frmHVAC As New VectoAuxiliaries.UI.F_HVAC(Me.TbPath.Text)
+ 'Dim frmHVAC As New VectoAuxiliaries.UI.F_HVAC(Me.TbPath.Text)
- 'If we have results then populate the inputs tab
- If (frmHVAC.ShowDialog() = Windows.Forms.DialogResult.OK) Then
+ ''If we have results then populate the inputs tab
+ 'If (frmHVAC.ShowDialog() = Windows.Forms.DialogResult.OK) Then
- dgvInputs.Rows.Clear()
+ ' dgvInputs.Rows.Clear()
- ListItems.Clear()
+ ' ListItems.Clear()
- For Each item As KeyValuePair(Of String, String) In frmHVAC.Inputs
+ ' For Each item As KeyValuePair(Of String, String) In frmHVAC.Inputs
- Dim row As DataGridViewRow = dgvInputs.Rows(dgvInputs.Rows.Add())
- row.Cells(0).Value = item.Key
- row.Cells(1).Value = item.Value
+ ' Dim row As DataGridViewRow = dgvInputs.Rows(dgvInputs.Rows.Add())
+ ' row.Cells(0).Value = item.Key
+ ' row.Cells(1).Value = item.Value
- ListItems.Add(item.Key, item.Value)
+ ' ListItems.Add(item.Key, item.Value)
- Next
+ ' Next
- End If
+ 'End If
End If
diff --git a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
index ba43ba7b7b7b3c5a2fd6bb72148cf2135105b9b9..082765a3c7ed96ee1c03ad851e62dea580b84631 100644
--- a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
@@ -24,6 +24,10 @@ public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
'Vecto Signals
public Property Signals As ISignals
+
+
+
+
'Test instantiations
@@ -38,6 +42,9 @@ public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
Public Sub Initialise()
+
+
+
Dim alternatoMap As IAlternatorMap = New AlternatorMap(ElectricalUserInputsConfig.AlternatorMap)
alternatoMap.Initialise()
@@ -46,6 +53,7 @@ Dim actuationsMap As IPneumaticActuationsMAP = New PneumaticActuationsMAP( Pneu
Dim compressorMap As ICompressorMap = New CompressorMap( PneumaticUserInputsConfig.CompressorMap)
compressorMap.Initialise()
+ElectricalUserInputsConfig.ElectricalConsumers.DoorDutyCycleFraction = GetDoorActuationTimeFraction()
M0 = New M0_NonSmart_AlternatorsSetEfficiency( ElectricalUserInputsConfig.ElectricalConsumers,
@@ -120,8 +128,12 @@ Private Sub setDefaults()
PneumaticUserInputsConfig = New PneumaticUserInputsConfig(true)
PneumaticAuxillariesConfig = New PneumaticsAuxilliariesConfig(true)
+
+
+
+
+
ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With {.DoorActuationTimeSecond=4,
- .ElectricalConsumers= New ElectricalConsumerList(VectoInputs.PowerNetVoltage,0.1,true),
.AlternatorGearEfficiency=0.8,
.PowerNetVoltage= VectoInputs.PowerNetVoltage,
.ResultCardIdle= New ResultCard( New List(Of SmartResult)),
@@ -134,15 +146,35 @@ Private Sub setDefaults()
HvacUserInputsConfig = New HVACUserInputsConfig( New HVACSteadyStateModel(100,100,100))
+ Signals = New Signals With { .EngineSpeed=2000, .TotalCycleTimeSeconds=3114, .ClutchEngaged=False}
+
+
+ 'Set Electricals.
- Signals = New Signals With { .EngineSpeed=2000, .TotalCycleTimeSeconds=3060, .ClutchEngaged=False}
+ Dim doorDutyCycleFraction as Single = GetDoorActuationTimeFraction
+
+ ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(VectoInputs.PowerNetVoltage,doorDutyCycleFraction,true)
End Sub
+Private Function GetDoorActuationTimeFraction()As Single
+
+ Dim actuationsMap as PneumaticActuationsMAP = New PneumaticActuationsMAP( PneumaticUserInputsConfig.ActuationsMap )
+ Dim actuationsKey As ActuationsKey = New ActuationsKey( "Park brake + 2 doors",VectoInputs.Cycle)
+
+ Dim numActuations as single = actuationsMap.GetNumActuations( actuationsKey)
+ Dim secondsPerActuation As single = ElectricalUserInputsConfig.DoorActuationTimeSecond
+
+ Dim doorDutyCycleFraction as Single = (numActuations * secondsPerActuation)/Signals.TotalCycleTimeSeconds
+
+ Return doorDutyCycleFraction
+
+End Function
+
End Class
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
index 9c2b5d02a755c862f5a9fea07cb21080fc039da1..223ab47185520b1755ac22f8436b2c90cd22146f 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
@@ -30,6 +30,7 @@
End Function
+ <System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
Public Function TotalAvgConsumptionInWatts(Optional PhaseIdle_TractionOnBasedOnCycle As Single = 0.0) As Single Implements Electrics.IElectricalConsumer.TotalAvgConsumptionInWatts
Return TotalAvgConumptionAmps(PhaseIdle_TractionOnBasedOnCycle) * PowerNetVoltage
End Function
@@ -69,6 +70,7 @@
End Function
+ <System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
Public Overrides Function GetHashCode() As Integer
Return 0
End Function
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
index 9f075c712e4363ef79ab5aba20c4c0a0e38ca113..872914e280dd4bcd9290dfb8d7002dc29dc8bf41 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
@@ -11,6 +11,18 @@ Private _items As New List(Of IElectricalConsumer)
Private _powernetVoltage As Single
Private _doorDutyCycleZeroToOne As single
+
+Public Property DoorDutyCycleFraction As single Implements IElectricalConsumerList.DoorDutyCycleFraction
+Get
+Return _doorDutyCycleZeroToOne
+End Get
+Set(value As Single)
+_doorDutyCycleZeroToOne=value
+End Set
+
+end property
+
+
Public ReadOnly Property Items As List(Of IElectricalConsumer) Implements IElectricalConsumerList.Items
Get
Return _items
@@ -47,7 +59,7 @@ Public Sub SetDefaultConsumerList()
Dim c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20 As IElectricalConsumer
-c1 = CType(New ElectricalConsumer(False, "Doors", "Doors per Door", 3.00, 0.96, _powernetVoltage, 3), IElectricalConsumer)
+c1 = CType(New ElectricalConsumer(False, "Doors", "Doors per Door", 3.00, 0.096339, _powernetVoltage, 3), IElectricalConsumer)
c2 = CType(New ElectricalConsumer(True, "Veh Electronics &Engine", "Controllers,Valves etc", 25.00, 1.00, _powernetVoltage, 0), IElectricalConsumer)
c3 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio City", 2.00, 0.80, _powernetVoltage, 1), IElectricalConsumer)
c4 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio Intercity", 5.00, 0.80, _powernetVoltage, 0), IElectricalConsumer)
@@ -58,11 +70,11 @@ c8 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior li
c9 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling city/ontercity + door [1/m]", 0.60, 0.70, _powernetVoltage, 0), IElectricalConsumer)
c10 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior lights Tourism + reading [1/m]", 1.10, 0.70, _powernetVoltage, 0), IElectricalConsumer)
c11 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling Tourism + LED reading [1/m]", 0.66, 0.70, _powernetVoltage, 0), IElectricalConsumer)
-c12 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "External Displays Font/Side/Rear", 2.65, 1.00, _powernetVoltage, 4), IElectricalConsumer)
-c13 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "Internal display per unit ( front side rear)", 1.06, 1.00, _powernetVoltage, 1), IElectricalConsumer)
+c12 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "External Displays Font/Side/Rear", 2.65017667844523, 1.00, _powernetVoltage, 4), IElectricalConsumer)
+c13 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "Internal display per unit ( front side rear)", 1.06007067137809, 1.00, _powernetVoltage, 1), IElectricalConsumer)
c14 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "CityBus Ref EBSF Table4 Devices ITS No Displays", 9.30, 1.00, _powernetVoltage, 1), IElectricalConsumer)
c15 = CType(New ElectricalConsumer(False, "Lights", "Exterior Lights BULB", 7.40, 1.00, _powernetVoltage, 1), IElectricalConsumer)
-c16 = CType(New ElectricalConsumer(False, "Lights", "Day running lights LED bonus", -0.72, 1.00, _powernetVoltage, 1), IElectricalConsumer)
+c16 = CType(New ElectricalConsumer(False, "Lights", "Day running lights LED bonus", -0.723, 1.00, _powernetVoltage, 1), IElectricalConsumer)
c17 = CType(New ElectricalConsumer(False, "Lights", "Antifog rear lights LED bonus", -0.17, 1.00, _powernetVoltage, 1), IElectricalConsumer)
c18 = CType(New ElectricalConsumer(False, "Lights", "Position lights LED bonus", -1.20, 1.00, _powernetVoltage, 1), IElectricalConsumer)
c19 = CType(New ElectricalConsumer(False, "Lights", "Direction lights LED bonus", -0.30, 1.00, _powernetVoltage, 1), IElectricalConsumer)
@@ -129,9 +141,9 @@ End Sub
Dim Amps As Single
If excludeOnBase Then
- Amps = Aggregate item In Items Where item.BaseVehicle = False Into Sum(item.TotalAvgConumptionAmps(_doorDutyCycleZeroToOne))
+ Amps = Aggregate item In Items Where item.BaseVehicle = False Into Sum(item.TotalAvgConumptionAmps(DoorDutyCycleFraction))
Else
- Amps = Aggregate item In Items Into Sum(item.TotalAvgConumptionAmps(_doorDutyCycleZeroToOne))
+ Amps = Aggregate item In Items Into Sum(item.TotalAvgConumptionAmps(DoorDutyCycleFraction))
End If
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumerList.vb
index b111cf1d81fb44228ee8868917e73023d374c355..9d49d0a0af12b94edc9eaa3a79ee4b3f82b5717c 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumerList.vb
@@ -7,6 +7,7 @@ Public Interface IElectricalConsumerList
Sub AddConsumer(consumer As IElectricalConsumer)
Sub RemoveConsumer(consumer As IElectricalConsumer)
Function GetTotalAverageDemandAmps(excludeOnBase As Boolean) As Single
+ Property DoorDutyCycleFraction As single
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
index b66ed5f44eed10ca11804417dd77e9dfa9cf1249..9a641e89201fa198ee0514824e6ca285173f2eb7 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
@@ -1,4 +1,6 @@

+Imports System.Diagnostics.CodeAnalysis
+
Namespace Electrics
@@ -61,7 +63,7 @@ Public readonly property AlternatorsEfficiencyOverrunResultCard() As single Imp
End Property
-
+<ExcludeFromCodeCoverage>
Private function HvacPlusNonBaseCurrents() As Single
Return _m0.GetHVACElectricalPowerDemandAmps() + _electricalConsumables.GetTotalAverageDemandAmps(true)
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
index 168296b6193562efdc60c2305865ec829c66c25f..26d0f5d85a9177e6bbc0f54467136d7c1f5eed1a 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
@@ -33,7 +33,7 @@
Public Function GetAveragePowerDemandAtAlternator() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerDemandAtAlternator
- Return _electricalConsumers.GetTotalAverageDemandAmps(False)
+ Return _electricalConsumers.GetTotalAverageDemandAmps(False) * _powerNetVoltage
End Function
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index f0c326ec0df06e975202fcc87ac2ba1fe9eae2bf..d9301ef5ac41b6ad4dad2a0424e6860d23375fb7 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -91,6 +91,7 @@
<Compile Include="Hvac\HVACConstants.vb" />
<Compile Include="Hvac\HVACInputs.vb" />
<Compile Include="Electrics\IElectricalConsumerList.vb" />
+ <Compile Include="Hvac\HVACMap.vb" />
<Compile Include="Hvac\HVACSteadyStateModel.vb" />
<Compile Include="Hvac\HVACUserInputsConfig.vb" />
<Compile Include="Hvac\IHVACInputs.vb" />
@@ -110,7 +111,6 @@
<Compile Include="Pneumatics\M3_AveragePneumaticLoadDemand.vb" />
<Compile Include="Pneumatics\CompressorMap.vb" />
<Compile Include="Electrics\ElectricalConsumer.vb" />
- <Compile Include="Hvac\HVACMap.vb" />
<Compile Include="Electrics\IAlternatorMap.vb" />
<Compile Include="Pneumatics\IM4_AirCompressor.vb" />
<Compile Include="Pneumatics\ICompressorMap.vb" />
@@ -137,18 +137,6 @@
<Compile Include="Pneumatics\PneumaticsAuxilliariesConfig.vb" />
<Compile Include="Pneumatics\PneumaticUserInputsConfig.vb" />
<Compile Include="Signals.vb" />
- <Compile Include="UI\Dashboard.Designer.vb">
- <DependentUpon>Dashboard.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\Dashboard.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\F_HVAC.Designer.vb">
- <DependentUpon>F_HVAC.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\F_HVAC.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="VectoInputs.vb" />
</ItemGroup>
<ItemGroup>
@@ -158,12 +146,6 @@
<CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="UI\Dashboard.resx">
- <DependentUpon>Dashboard.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\F_HVAC.resx">
- <DependentUpon>F_HVAC.vb</DependentUpon>
- </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="My Project\Application.myapp">
@@ -176,7 +158,9 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <Folder Include="UI\" />
+ </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.
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index feaba65a0ebb2cca80a965754c3b590a78329870..389dcdba4a202812c422453d463fc2eb6b4f12c3 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -23,8 +23,8 @@ Private sub Initialise()
Dim ssm As New HVACSteadyStateModel(100,100,100)
Dim elecConsumers As New ElectricalConsumerList(26.3,0.096,True)
Dim hvacInputs As New HVACInputs(1,1)
-Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
-hvacMap.Initialise()
+'Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
+'hvacMap.Initialise()
Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.csv")
alternatoMap.Initialise()