Merge branch 'fix/steering_technology_auxform' into 'amdm2/develop'

Fix correct vehicle type assignation for electric steering pumps

See merge request vecto/vecto!167

VECTO/GUI/VehicleAuxiliariesDialog.vb

@@ -72,16 +72,20 @@ Public Class VehicleAuxiliariesDialog
 
 		If CbType.SelectedItem Is Nothing Then Exit Sub
 
-		dim batteryElectricAuxOnly = JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E)
         Select Case CbType.SelectedValue.ToString()
             Case VectoCore.Configuration.Constants.Auxiliaries.IDs.Fan
                 CbTech.DataSource =
-					if(batteryElectricAuxOnly, DeclarationData.Fan.FullyElectricTechnologies(), DeclarationData.Fan.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                    DeclarationData.Fan.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
             Case VectoCore.Configuration.Constants.Auxiliaries.IDs.SteeringPump
+                Dim batteryElectricAuxOnly = JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_S, VectoSimulationJobType.SerialHybridVehicle)
                 Dim notSteered = (New String() {AxleNotSteered}).Concat(If(batteryElectricAuxOnly, DeclarationData.SteeringPump.FullyElectricTechnologies(), DeclarationData.SteeringPump.GetTechnologies())).ToArray()
-				CbTech.DataSource =
-				    If(batteryElectricAuxOnly,DeclarationData.SteeringPump.FullyElectricTechnologies() ,DeclarationData.SteeringPump.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                Dim steeringTechs = If(
+                        batteryElectricAuxOnly,
+                        DeclarationData.SteeringPump.FullyElectricTechnologies(),
+                        DeclarationData.SteeringPump.GetTechnologies()
+                    )
 
+                CbTech.DataSource = steeringTechs.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                 CbTech2.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                 CbTech3.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                 CbTech4.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
@@ -94,7 +98,7 @@ Public Class VehicleAuxiliariesDialog
                     DeclarationData.ElectricSystem.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
             Case VectoCore.Configuration.Constants.Auxiliaries.IDs.PneumaticSystem
                 CbTech.DataSource =
-					if(batteryElectricAuxOnly, DeclarationData.PneumaticSystem.FullyElectricTechnologies(), DeclarationData.PneumaticSystem.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                    If(JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle), DeclarationData.PneumaticSystem.FullyElectricTechnologies(), DeclarationData.PneumaticSystem.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
         End Select
         If CbTech.Items.Count > 0 Then
 			'CbTech.SelectedIndex = 0

VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv

@@ -5,6 +5,5 @@ Dual displacement                      ,           1 ,    1 ,    0 ,  0 ,
 Dual displacement with elec. control   ,           1 ,    1 ,    0 ,  0 ,             0 ,0.80  ,0.85  ,0.85
 Variable displacement mech. controlled ,           1 ,    1 ,    0 ,  0 ,             0 ,0.75  ,0.75  ,0.75
 Variable displacement elec. controlled ,           1 ,    1 ,    0 ,  0 ,             0 ,0.6   ,0.6   ,0.6
-Electric                               ,           1 ,    1 ,    0 ,  0 ,             0 ,0     ,2.143 ,1.429
 Electric driven pump                   ,           1 ,    1 ,    1 ,  1 ,             1 ,0.857 ,0.857 ,0.857
 Full electric steering gear            ,           1 ,    1 ,    1 ,  1 ,             1 ,0     ,0.143 ,1.429
\ No newline at end of file