diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd index 8246076603eae78661a433f46a373f28d48a27d0..4e8bd20cd706dfff1ccc065e8a67c16de52617fe 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 c488cdbd6c6b1f7629eaea7589e2ebd6325f3b7a..9be7f6da25b1b6be33fe529b3b8014d5f221a049 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 f0c39eb8910edb7559a5acf14471f00274bbdd31..892a9243877a3c7fc62176ad8877fe68e0eff89a 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 0646086cb4fb980e07e204b47a64ee31c2a92df7..ed8be7e64cd6f8aa587c5c48b7f84779a94e5cb2 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 9929f9a229bdb9ae050e96f558d1367e04a9cbe2..55e23042661fe693f6b3991cea0a9a15001364cd 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 7900c34fa0476e6a032d3577ceb0cdc2c2587d10..378a10ef7b5133211d15eec735ce6336d9b66df9 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 317379a196e960b7eda1da9931d0eb3c20b22ec4..1bfd878d3504090a5d93c6edd2662be0fc1adde9 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 1ebd52aee4944e6b3469bbfc85d678babf85ced3..9779f578ec4cf6c61eadf20c192f02f7ce9c05a9 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 8721a9991918623df14b4f31057d4825f3eabb6a..d140a360be02439f4742d2cb8cf0092cf4124023 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 7fb9913eb374f51b02bae564ea5b7cf0b0980ce2..9152cedae3433e213d71aaf5797a9155d1bcb22f 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 dc6b87c914223eb5bcc6d416fee9842c7bba4a41..882659b4e968850ba2f937943184a70f745034a4 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 0dc738a50460311a37f0941f44331088bde4f0c1..1f113942672b03a85595de9828dff0f96918d1ea 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 ea8b506b84009fb595df21acc9334ed4a71c1391..8dc0b991998924977e131ad97ff6f5daa0840033 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 bf5800e4f1c754250010bc8d7d408f6bfd06b58b..f03c2223ff9a13e5899b5a92fda5461bbb2263e7 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 689e039b6a1374b7ccba2bd9aea5015246bab642..fbb049d5eaf0f0ea0478f2fbca4c6e55e36326b9 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 cbe4407e5a0c8dae794a5daef909a488a7112748..25808af2d1ac6ee4223b28c293a781d676cd2b88 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 1620c38899dfbd6a314776031d527f255326e590..afdfbcddfe3e8b120d9894634083325405ba7fae 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 04a036641988a30ef8fc6366d3dcc8cf854e9fff..4afad7609191aab1afeb2370e15d5d9d0c60a0b6 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 89d1c3e1c54a5f5d4035b827b80e39902fa90d36..100ba06c35e7e0c57dd88358686da224356f16d3 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 2eb5d109114e17a27a10b8403bfa4186142114eb..5d4b14ebacd9380db15fba0c04c1102265b0c2c4 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 23a49544403cc5ed78f2320d4911567002a9ea5d..4452420c14a47ecad525083541b0e92a2a338602 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 9cdeb35c70106764e7a1d1d240bde0bf33218a89..34074e65a66a36bc9ab43fd30a8a6f1a2532d03a 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 a16a250fef7b7394bd50d986555947caccc97dd8..67cadc3b5714c94ef463cd7c06281fe454177d9a 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>