From fe12821d45d735d985ca7f3a62931e22049f742b Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 17 Feb 2020 20:38:00 +0100 Subject: [PATCH] allow 8x2 axle configuration for (primary) buses --- .../VectoDeclarationDefinitions.2.6_Buses.xsd | 81 ++++++++----------- .../Resources/XSD/VectoOutputPrimaryBus.xsd | 2 +- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd index eef939da1c..e2cd2a56c4 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd @@ -373,7 +373,7 @@ <xs:documentation>P036 - enum</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"> + <xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationDeclarationType"> <xs:annotation> <xs:documentation>P037 - enum</xs:documentation> </xs:annotation> @@ -577,9 +577,43 @@ <xs:enumeration value="M3"/> </xs:restriction> </xs:simpleType> + <xs:simpleType name="PneumaticSystemClutchTypeType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="none"/> + <xs:enumeration value="visco"/> + <xs:enumeration value="mechanically"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="PneumaticSystemTechnologyType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="Small"/> + <xs:enumeration value="Medium Supply 1-stage"/> + <xs:enumeration value="Medium Supply 2-stage"/> + <xs:enumeration value="Large Supply 1-stage"/> + <xs:enumeration value="Large Supply 2-stage"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="RegisteredClassType"> <xs:restriction base="xs:string"/> </xs:simpleType> + <xs:simpleType name="VehicleAxleConfigurationDeclarationType"> + <xs:annotation> + <xs:appinfo> + <vectoParam:description> + <vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId> + <vectoParam:unit>-</vectoParam:unit> + </vectoParam:description> + </xs:appinfo> + <xs:documentation>P037</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="4x2"/> + <xs:enumeration value="6x2"/> + <xs:enumeration value="6x4"/> + <xs:enumeration value="8x2"/> + <xs:enumeration value="8x4"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="VehicleCategoryDeclarationType"> <xs:annotation> <xs:appinfo> @@ -608,49 +642,4 @@ <xs:enumeration value="CJ"/> </xs:restriction> </xs:simpleType> - <xs:complexType name="ResultCardEntryType"> - <xs:attribute name="current" type="v1.0:Double2" use="required"/> - <xs:attribute name="smartCurrent" type="v1.0:Double2" use="required"/> - </xs:complexType> - <xs:simpleType name="PneumaticSystemTechnologyType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="Small"/> - <xs:enumeration value="Medium Supply 1-stage"/> - <xs:enumeration value="Medium Supply 2-stage"/> - <xs:enumeration value="Large Supply 1-stage"/> - <xs:enumeration value="Large Supply 2-stage"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="PneumaticSystemClutchTypeType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="none"/> - <xs:enumeration value="visco"/> - <xs:enumeration value="mechanically"/> - </xs:restriction> - </xs:simpleType> - <xs:complexType name="ResultCardsType"> - <xs:sequence> - <xs:element name="Idle"> - <xs:complexType> - <xs:sequence> - <xs:element name="Entry" type="tns:ResultCardEntryType" minOccurs="2" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Traction"> - <xs:complexType> - <xs:sequence> - <xs:element name="Entry" type="tns:ResultCardEntryType" minOccurs="2" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Overrun"> - <xs:complexType> - <xs:sequence> - <xs:element name="Entry" type="tns:ResultCardEntryType" minOccurs="2" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> </xs:schema> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd index 34e6f5b792..c37837a94c 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd @@ -555,7 +555,7 @@ <xs:element name="VIN" type="v1.0:VINType"/> <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/> <xs:element name="VehicleCategory" type="v2.6:VehicleCategoryDeclarationType"/> - <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/> + <xs:element name="AxleConfiguration" type="v2.6:VehicleAxleConfigurationDeclarationType"/> <xs:element name="Articulated" type="xs:boolean"/> <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/> <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/> -- GitLab