From 459a27355d5a4484f71a5aa5e89e8dbd8095eb77 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Tue, 18 Jan 2022 16:39:08 +0100 Subject: [PATCH] update PTO technologies --- ...arationDefinitions.2.10.2_JobInputData.xsd | 198 +++++++++++------- 1 file changed, 120 insertions(+), 78 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd index 95c535955a..1a18e1edfb 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd @@ -20,8 +20,8 @@ <xs:complexType name="Abstract_AUX_Conventional_PrimaryBusDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_HEV_CompletedBusDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_HEV-P_LorryDeclarationType" abstract="true"/> - <xs:complexType name="Abstract_AUX_HEV-S_LorryDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_HEV-P_PrimaryBusDeclarationType" abstract="true"/> + <xs:complexType name="Abstract_AUX_HEV-S_LorryDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_HEV-S_PrimaryBusDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_IEPC_CompletedBusDeclarationType" abstract="true"/> <xs:complexType name="Abstract_AUX_IEPC_LorryDeclarationType" abstract="true"/> @@ -91,6 +91,11 @@ </xs:complexContent> </xs:complexType> <xs:complexType name="AbstractElectricMotorVehicleTorqueLimitsDeclarationType" abstract="true"/> + <xs:complexType name="AbstractPTODataType" abstract="true"> + <xs:complexContent> + <xs:extension base="v2.0:AbstractPTODataType"/> + </xs:complexContent> + </xs:complexType> <xs:complexType name="ADAS_Conventional_Type"> <xs:complexContent> <xs:extension base="v2.10.2:Abstract_ADAS_ConventionalType"> @@ -199,14 +204,14 @@ <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_LorryDeclarationType"/> </xs:sequence> </xs:complexType> - <xs:complexType name="AUX_Component_HEV-S_Lorry_Type"> + <xs:complexType name="AUX_Component_HEV-P_PrimaryBus_Type"> <xs:sequence> - <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType"/> + <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/> </xs:sequence> </xs:complexType> - <xs:complexType name="AUX_Component_HEV-P_PrimaryBus_Type"> + <xs:complexType name="AUX_Component_HEV-S_Lorry_Type"> <xs:sequence> - <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/> + <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType"/> </xs:sequence> </xs:complexType> <xs:complexType name="AUX_Component_HEV-S_PrimaryBus_Type"> @@ -486,14 +491,14 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="AUX_HEV-S_LorryDataType"> + <xs:complexType name="AUX_HEV-P_PrimaryBusType"> <xs:complexContent> - <xs:extension base="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType"> + <xs:extension base="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"> <xs:sequence> <xs:element name="Fan"> <xs:complexType> <xs:sequence> - <xs:element name="Technology" type="v2.10.2:AuxFanTechnologyLorryType"> + <xs:element name="Technology" type="v2.10.2:AuxFanTechnologyPrimaryBusType"> <xs:annotation> <xs:documentation>P181 - enum</xs:documentation> </xs:annotation> @@ -510,7 +515,7 @@ </xs:annotation> <xs:complexType> <xs:simpleContent> - <xs:extension base="v2.10.2:AuxSPTechnology_HEV-S_LorryType"> + <xs:extension base="v2.10.2:AuxSPTechnologyPrimaryBusType"> <xs:attribute name="axleNumber" use="required"> <xs:simpleType> <xs:restriction base="xs:int"> @@ -529,9 +534,15 @@ <xs:element name="ElectricSystem"> <xs:complexType> <xs:sequence> - <xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType"> + <xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnology_HEV_Type"> <xs:annotation> - <xs:documentation>P183 - enum</xs:documentation> + <xs:documentation>P294 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:group ref="v2.10.2:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/> + <xs:element name="SupplyFromHEVPossible" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P303 - bool</xs:documentation> </xs:annotation> </xs:element> </xs:sequence> @@ -540,20 +551,22 @@ <xs:element name="PneumaticSystem"> <xs:complexType> <xs:sequence> - <xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType"> - <xs:annotation> - <xs:documentation>P184 - enum</xs:documentation> - </xs:annotation> - </xs:element> + <xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/> + <xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="HVAC"> <xs:complexType> <xs:sequence> - <xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType"> + <xs:element name="AdjustableCoolantThermostat" type="xs:boolean"> <xs:annotation> - <xs:documentation>P185 - enum</xs:documentation> + <xs:documentation>P324 - bool</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P326 - bool</xs:documentation> </xs:annotation> </xs:element> </xs:sequence> @@ -563,14 +576,14 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="AUX_HEV-P_PrimaryBusType"> + <xs:complexType name="AUX_HEV-S_LorryDataType"> <xs:complexContent> - <xs:extension base="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"> + <xs:extension base="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType"> <xs:sequence> <xs:element name="Fan"> <xs:complexType> <xs:sequence> - <xs:element name="Technology" type="v2.10.2:AuxFanTechnologyPrimaryBusType"> + <xs:element name="Technology" type="v2.10.2:AuxFanTechnologyLorryType"> <xs:annotation> <xs:documentation>P181 - enum</xs:documentation> </xs:annotation> @@ -587,7 +600,7 @@ </xs:annotation> <xs:complexType> <xs:simpleContent> - <xs:extension base="v2.10.2:AuxSPTechnologyPrimaryBusType"> + <xs:extension base="v2.10.2:AuxSPTechnology_HEV-S_LorryType"> <xs:attribute name="axleNumber" use="required"> <xs:simpleType> <xs:restriction base="xs:int"> @@ -606,15 +619,9 @@ <xs:element name="ElectricSystem"> <xs:complexType> <xs:sequence> - <xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnology_HEV_Type"> - <xs:annotation> - <xs:documentation>P294 - enum</xs:documentation> - </xs:annotation> - </xs:element> - <xs:group ref="v2.10.2:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/> - <xs:element name="SupplyFromHEVPossible" type="xs:boolean"> + <xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType"> <xs:annotation> - <xs:documentation>P303 - bool</xs:documentation> + <xs:documentation>P183 - enum</xs:documentation> </xs:annotation> </xs:element> </xs:sequence> @@ -623,22 +630,20 @@ <xs:element name="PneumaticSystem"> <xs:complexType> <xs:sequence> - <xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/> - <xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/> + <xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType"> + <xs:annotation> + <xs:documentation>P184 - enum</xs:documentation> + </xs:annotation> + </xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="HVAC"> <xs:complexType> <xs:sequence> - <xs:element name="AdjustableCoolantThermostat" type="xs:boolean"> - <xs:annotation> - <xs:documentation>P324 - bool</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean"> + <xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType"> <xs:annotation> - <xs:documentation>P326 - bool</xs:documentation> + <xs:documentation>P185 - enum</xs:documentation> </xs:annotation> </xs:element> </xs:sequence> @@ -1438,6 +1443,24 @@ </xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="PTOType"> + <xs:complexContent> + <xs:extension base="v2.10.2:AbstractPTODataType"> + <xs:sequence> + <xs:element name="PTOShaftsGearWheels" type="v2.10.2:PTOShaftsGearWheelsType"> + <xs:annotation> + <xs:documentation>P247 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="PTOOtherElements" type="v1.0:PTOOtherElementsType"> + <xs:annotation> + <xs:documentation>P248 - enum</xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="REESSBatteryType"> <xs:sequence> <xs:element name="StringID"> @@ -2449,6 +2472,19 @@ <xs:enumeration value="Default"/> </xs:restriction> </xs:simpleType> + <xs:simpleType name="AuxPSTechnology_PEV_LorryType"> + <xs:restriction base="v2.10.2:AuxPSTechnologyLorryType"> + <xs:enumeration value="Small + elec. driven"/> + <xs:enumeration value="Small + ESS + elec. driven "/> + <xs:enumeration value="Medium Supply 1-stage + elec. driven"/> + <xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven "/> + <xs:enumeration value="Medium Supply 2-stage + elec. driven"/> + <xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/> + <xs:enumeration value="Large Supply + elec. driven"/> + <xs:enumeration value="Large Supply + AMS + elec. driven"/> + <xs:enumeration value="Vacuum pump + elec. driven"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="AuxPSTechnologyLorryType"> <xs:restriction base="xs:string"> <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/> @@ -2492,46 +2528,33 @@ <xs:enumeration value="Vacuum pump + elec. driven"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxPSTechnology_PEV_LorryType"> - <xs:restriction base="v2.10.2:AuxPSTechnologyLorryType"> - <xs:enumeration value="Small + elec. driven"/> - <xs:enumeration value="Small + ESS + elec. driven "/> - <xs:enumeration value="Medium Supply 1-stage + elec. driven"/> - <xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven "/> - <xs:enumeration value="Medium Supply 2-stage + elec. driven"/> - <xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/> - <xs:enumeration value="Large Supply + elec. driven"/> - <xs:enumeration value="Large Supply + AMS + elec. driven"/> - <xs:enumeration value="Vacuum pump + elec. driven"/> + <xs:simpleType name="AuxSPTechnology_HEV-S_LorryType"> + <xs:restriction base="v2.10.2:AuxSPTechnologyLorryType"> + <xs:enumeration value="Electric driven pump"/> + <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxSPTechnologyLorryType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/> - <xs:enumeration value="Fixed displacement"/> - <xs:enumeration value="Fixed displacement with elec. control"/> - <xs:enumeration value="Dual displacement"/> - <xs:enumeration value="Dual displacement with elec. control"/> - <xs:enumeration value="Variable displacement mech. controlled"/> - <xs:enumeration value="Variable displacement elec. controlled"/> + <xs:simpleType name="AuxSPTechnology_HEV-S_PrimaryBusType"> + <xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType"> <xs:enumeration value="Electric driven pump"/> <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxSPTechnology_HEV-S_LorryType"> + <xs:simpleType name="AuxSPTechnology_PEV_LorryType"> <xs:restriction base="v2.10.2:AuxSPTechnologyLorryType"> <xs:enumeration value="Electric driven pump"/> <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxSPTechnology_PEV_LorryType"> - <xs:restriction base="v2.10.2:AuxSPTechnologyLorryType"> + <xs:simpleType name="AuxSPTechnology_PEV_PrimaryBusType"> + <xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType"> <xs:enumeration value="Electric driven pump"/> <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxSPTechnologyPrimaryBusType"> + <xs:simpleType name="AuxSPTechnologyLorryType"> <xs:restriction base="xs:string"> + <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/> <xs:enumeration value="Fixed displacement"/> <xs:enumeration value="Fixed displacement with elec. control"/> <xs:enumeration value="Dual displacement"/> @@ -2542,14 +2565,14 @@ <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxSPTechnology_PEV_PrimaryBusType"> - <xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType"> - <xs:enumeration value="Electric driven pump"/> - <xs:enumeration value="Full electric steering gear"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="AuxSPTechnology_HEV-S_PrimaryBusType"> - <xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType"> + <xs:simpleType name="AuxSPTechnologyPrimaryBusType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="Fixed displacement"/> + <xs:enumeration value="Fixed displacement with elec. control"/> + <xs:enumeration value="Dual displacement"/> + <xs:enumeration value="Dual displacement with elec. control"/> + <xs:enumeration value="Variable displacement mech. controlled"/> + <xs:enumeration value="Variable displacement elec. controlled"/> <xs:enumeration value="Electric driven pump"/> <xs:enumeration value="Full electric steering gear"/> </xs:restriction> @@ -2796,6 +2819,25 @@ <xs:simpleType name="PowertrainPositionType"> <xs:union memberTypes="v2.10.2:PowertrainPositionDriveType v2.10.2:PowertrainPositionGENType"/> </xs:simpleType> + <xs:simpleType name="PTOShaftsGearWheelsType"> + <xs:annotation> + <xs:documentation>P247 - enum</xs:documentation> + <xs:appinfo> + <vectoParam:description> + <vectoParam:parameterId component="Vehicle">247</vectoParam:parameterId> + <vectoParam:unit>-</vectoParam:unit> + </vectoParam:description> + </xs:appinfo> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="none"/> + <xs:enumeration value="only the drive shaft of the PTO"/> + <xs:enumeration value="drive shaft and/or up to 2 gear wheels"/> + <xs:enumeration value="drive shaft and/or more than 2 gear wheels"/> + <xs:enumeration value="only one engaged gearwheel above oil level"/> + <xs:enumeration value="PTO which includes 1 or mmore additional gearmesh(es), without disconnect clutch"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="RegisteredClassType"> <xs:annotation> <xs:appinfo> @@ -2853,6 +2895,11 @@ </xs:annotation> <xs:restriction base="xs:int"/> </xs:simpleType> + <xs:simpleType name="VehicleTypeApprovalNumberType"> + <xs:restriction base="xs:token"> + <xs:minLength value="1"/> + </xs:restriction> + </xs:simpleType> <xs:group name="BusAuxElectricSystemLightsGroup"> <xs:sequence> <xs:element name="LEDLights"> @@ -3542,7 +3589,7 @@ <xs:documentation>P180 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="PTO" type="v2.0:AbstractPTODataType"/> + <xs:element name="PTO" type="v2.10.2:AbstractPTODataType"/> <xs:element name="ZeroEmissionVehicle" type="xs:boolean"> <xs:annotation> <xs:documentation>P269 - bool</xs:documentation> @@ -3578,7 +3625,7 @@ <xs:documentation>P180 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="PTO" type="v2.0:AbstractPTODataType"/> + <xs:element name="PTO" type="v2.10.2:AbstractPTODataType"/> <xs:element name="ZeroEmissionVehicle" type="xs:boolean"> <xs:annotation> <xs:documentation>P269 - bool</xs:documentation> @@ -3726,9 +3773,4 @@ </xs:element> </xs:sequence> </xs:group> - <xs:simpleType name="VehicleTypeApprovalNumberType"> - <xs:restriction base="xs:token"> - <xs:minLength value="1"/> - </xs:restriction> - </xs:simpleType> </xs:schema> -- GitLab