From 4d3ac1708239dae246fee986b9509b5cc861aad9 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 22 Aug 2022 17:50:12 +0200 Subject: [PATCH] removing OVC-HEV parameter and max charging power for PEV vehicles in input (schema and sample files) --- .../XSD/VectoDeclarationDefinitions.2.4.xsd | 26 +++++++------------ .../HeavyLorry/IEPC_heavyLorry.xml | 2 -- .../HeavyLorry/PEV_heavyLorry_AMT_E2.xml | 2 -- .../HeavyLorry/PEV_heavyLorry_APT-N_E2.xml | 2 -- .../HeavyLorry/PEV_heavyLorry_E3.xml | 2 -- .../HeavyLorry/PEV_heavyLorry_E4.xml | 2 -- .../MediumLorry/IEPC_mediumLorry.xml | 2 -- .../PrimaryBus/PEV_primaryBus_E3.xml | 2 -- .../PrimaryBus/PEV_primaryBus_E4.xml | 2 -- .../IEPC_heavyLorry_n_opt.xml | 4 +-- .../IEPC_mediumLorry_n_opt.xml | 4 +-- .../IEPC_primaryBus_n_opt.xml | 3 --- .../PEV_heavyLorry_AMT_E2_n_opt.xml | 2 -- .../PEV_heavyLorry_APT-N_E2_n_opt.xml | 1 - .../PEV_heavyLorry_E3_n_opt.xml | 2 -- .../PEV_heavyLorry_E4_n_opt.xml | 2 -- .../PEV_mediumLorry_AMT_E2_n_opt.xml | 2 -- .../PEV_mediumLorry_APT-N_E2_n_opt.xml | 1 - .../PEV_mediumLorry_E3_n_opt.xml | 2 -- .../PEV_mediumLorry_E4_n_opt.xml | 2 -- .../PEV_primaryBus_AMT_E2_n_opt.xml | 3 --- .../PEV_primaryBus_E3_n_opt.xml | 3 --- .../PEV_primaryBus_E4_n_opt.xml | 3 --- 23 files changed, 12 insertions(+), 64 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd index 8246076603..4e8bd20cd7 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd @@ -1961,7 +1961,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/> @@ -1985,7 +1985,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/> @@ -2019,7 +2019,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType"/> @@ -2043,7 +2043,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> @@ -2069,7 +2069,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> @@ -2105,7 +2105,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> @@ -2131,7 +2131,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/> @@ -2155,7 +2155,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/> @@ -2189,7 +2189,7 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> + <xs:group ref="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/> @@ -2250,7 +2250,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/> <xs:element name="Components" type="v2.4:Abstract_Components_IEPC_LorryDeclarationType"/> </xs:sequence> @@ -2268,7 +2267,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/> <xs:element name="Components" type="v2.4:Abstract_Components_IEPC_LorryDeclarationType"/> </xs:sequence> @@ -2296,7 +2294,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/> <xs:element name="Components" type="v2.4:Abstract_Components_IEPC_PrimaryBusDeclarationType"/> </xs:sequence> @@ -2356,7 +2353,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_PEV_LorryDeclarationType"/> @@ -2375,7 +2371,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_PEV_LorryDeclarationType"/> @@ -2404,7 +2399,6 @@ Changelog: <xs:documentation>P400 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/> <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType"/> @@ -3812,7 +3806,7 @@ Changelog: </xs:element> </xs:sequence> </xs:group> - <xs:group name="Vehicle_xEV-Parameters_SequenceGroup"> + <xs:group name="Vehicle_HEV-Parameters_SequenceGroup"> <xs:sequence> <xs:element name="OvcHev" type="xs:boolean"> <xs:annotation> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml index c488cdbd6c..9be7f6da25 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml @@ -22,8 +22,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_IEPC_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml index f0c39eb891..892a924387 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml @@ -23,8 +23,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml index 0646086cb4..ed8be7e64c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml @@ -22,8 +22,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="v2.4:ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml index 9929f9a229..55e2304266 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml @@ -22,8 +22,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml index 7900c34fa0..378a10ef7b 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml @@ -22,8 +22,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml index 317379a196..1bfd878d35 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml @@ -18,8 +18,6 @@ <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_IEPC_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml index 1ebd52aee4..9779f578ec 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml @@ -16,8 +16,6 @@ <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E3</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml index 8721a99919..d140a360be 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml @@ -16,8 +16,6 @@ <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E4</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>30000</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml index 7fb9913eb3..9152cedae3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml @@ -23,8 +23,6 @@ <SleeperCab>true</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_IEPC_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -257,7 +255,7 @@ <Auxiliaries> <Data xsi:type="AUX_IEPC_LorryDataType"> <SteeringPump> - <Technology axleNumber="1">Medium Supply 2-stage + elec. driven</Technology> + <Technology axleNumber="1">Full electric steering gear</Technology> </SteeringPump> <ElectricSystem> <Technology>Standard technology - LED headlights, all</Technology> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml index dc6b87c914..882659b4e9 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml @@ -18,8 +18,6 @@ <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_IEPC_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -252,7 +250,7 @@ <Auxiliaries> <Data xsi:type="AUX_IEPC_LorryDataType"> <SteeringPump> - <Technology axleNumber="1">Vacuum pump + elec. driven</Technology> + <Technology axleNumber="1">Full electric steering gear</Technology> </SteeringPump> <ElectricSystem> <Technology>Standard technology - LED headlights, all</Technology> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml index 0dc738a504..1f11394267 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml @@ -16,8 +16,6 @@ <AngledriveType>Separate Angledrive</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E-IEPC</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_IEPC_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -256,7 +254,6 @@ <CompressorDrive>electrically</CompressorDrive> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> - <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml index ea8b506b84..8dc0b99199 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml @@ -24,8 +24,6 @@ <SleeperCab>true</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml index bf5800e4f1..f03c2223ff 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml @@ -22,7 +22,6 @@ <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>false</OvcHev> <ADAS xsi:type="v2.4:ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml index 689e039b6a..fbb049d5ea 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml @@ -23,8 +23,6 @@ <SleeperCab>true</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml index cbe4407e5a..25808af2d1 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml @@ -23,8 +23,6 @@ <SleeperCab>true</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml index 1620c38899..afdfbcddfe 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml @@ -17,8 +17,6 @@ <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml index 04a0366419..4afad76091 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml @@ -17,7 +17,6 @@ <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> - <OvcHev>false</OvcHev> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml index 89d1c3e1c5..100ba06c35 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml @@ -17,8 +17,6 @@ <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml index 2eb5d10911..5d4b14ebac 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml @@ -17,8 +17,6 @@ <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="v2.4:ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml index 23a4954440..4452420c14 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml @@ -16,8 +16,6 @@ <AngledriveType>Separate Angledrive</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E2</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -341,7 +339,6 @@ <CompressorDrive>electrically</CompressorDrive> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> - <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml index 9cdeb35c70..34074e65a6 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml @@ -16,8 +16,6 @@ <AngledriveType>Separate Angledrive</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E3</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -270,7 +268,6 @@ <CompressorDrive>electrically</CompressorDrive> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> - <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml index a16a250fef..67cadc3b57 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml @@ -16,8 +16,6 @@ <AngledriveType>Separate Angledrive</AngledriveType> <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ArchitectureID>E4</ArchitectureID> - <OvcHev>true</OvcHev> - <MaxChargingPower>11</MaxChargingPower> <ADAS xsi:type="ADAS_PEV_Type"> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> @@ -240,7 +238,6 @@ <CompressorDrive>electrically</CompressorDrive> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> - <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> -- GitLab