Added more auxiliary paremeters and ADAS Groups for Conventional, HEV and PEV Vehicles

VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd

@@ -11,7 +11,6 @@
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
 	<!-- End imports___________________________________________ -->
-	<xs:import/>
 	<xs:element name="VectoOutput" type="mrf:VectoManufacturerOutputType">
 		<xs:annotation>
 			<xs:documentation>Comment describing your root element</xs:documentation>
@@ -124,6 +123,7 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:group>
+	<!--Auxiliaries-->
 	<xs:complexType name="ConventionalLorryAuxOutputType">
 		<xs:sequence>
 			<xs:element name="CoolingFanTechnology"/>
@@ -152,6 +152,82 @@
 	<xs:complexType name="ConventionalCompletedBusAuxOutputType"/>
 	<xs:complexType name="HEVCompletedBusAuxOutputType"/>
 	<xs:complexType name="PEVCompletedBusAuxOutputType"/>
+	<xs:group name="PrimaryBusElectricSystemGroup">
+		<xs:sequence>
+			<xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnologyType"/>
+			<xs:element name="MaxAlternatorPower" type="mrf:PowerType" minOccurs="0"/>
+			<xs:element name="ElectricStorageCapacity" type="mrf:StorageCapacityType" minOccurs="0"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="CompletedBusElectricSystemGroup">
+		<xs:sequence>
+			<xs:element name="DayRunningLightsLED" type="xs:boolean"/>
+			<xs:element name="HeadLightsLED" type="xs:boolean"/>
+			<xs:element name="PositionLightsLED" type="xs:boolean"/>
+			<xs:element name="BrakeLightsLED" type="xs:boolean"/>
+			<xs:element name="InteriorLightsLED" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="LorryPneumaticSystemGroup">
+		<xs:sequence>
+			<xs:element name="Technology" type="v1.0:AuxPSTechnologyType"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="PrimaryBusPneumaticSystemGroup">
+		<xs:sequence>
+			<xs:element name="Technology" type="v1.0:AuxPSTechnologyType"/>
+			<xs:element name="CompressorRatio" type="v1.0:Double3"/>
+			<xs:element name="SmartCompressionSystem" type="xs:boolean"/>
+			<xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+			<xs:element name="AirSuspensionControl" type="v2.10.2:AirsuspensionControlType"/>
+			<xs:element name="ReagentDosing" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="xEVHVACGroup">
+		<xs:sequence>
+			<xs:group ref="mrf:HVACSystemGroup"/>
+			<xs:element name="WaterElectricHeater" type="xs:boolean"/>
+			<xs:element name="AirElectricHeater" type="xs:boolean"/>
+			<xs:element name="OtherHeatingTechnology" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="HVACSystemGroup">
+		<xs:sequence>
+			<xs:group ref="v2.10.2:BusAuxHVACHeatPumpSequenceGroup"/>
+			<xs:element name="DoubleGlasing" type="xs:boolean"/>
+			<xs:element name="AdjustableAuxiliaryHeater" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<!--ADAS-->
+	<xs:group name="ConventionalADASGroup">
+		<xs:sequence>
+			<xs:element name="EngineStopStart" type="xs:boolean"/>
+			<xs:element name="EcoRollWithoutEngineStopStart" type="xs:boolean"/>
+			<xs:element name="EcoRollWithEngineStopStart" type="xs:boolean"/>
+			<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="HEVADASGroup">
+		<xs:sequence>
+			<xs:element name="EngineStopStart" type="xs:boolean"/>
+			<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="PEVADASGroup">
+		<xs:sequence>
+			<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="EngineTorqueLimitationsGroup">
+		<xs:sequence>
+			<xs:element name="EngineTorqueLimit" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="Gear" type="xs:int"/>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<!--Axles-->
 	<xs:complexType name="TyresOutputType">
 		<xs:sequence>
 			<xs:sequence minOccurs="2" maxOccurs="unbounded">
@@ -173,21 +249,6 @@
 			<xs:element name="DigestValue" type="xs:token"/>
 		</xs:sequence>
 	</xs:group>
-	<xs:group name="AerodynamicsGroup">
-		<xs:sequence>
-			<xs:element name="Model" type="v1.0:ModelType"/>
-			<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
-			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0"/>
-			<xs:element name="CdxA" type="v1.0:AirdragCdxAType"/>
-			<xs:element name="DigestValue" type="xs:token"/>
-		</xs:sequence>
-	</xs:group>
-	<xs:group name="PrimaryBusGeneralVehicleOutputGroup">
-		<xs:sequence>
-			<xs:group ref="mrf:ManufacturerGroup"/>
-			<xs:group ref="mrf:GeneralVehicleOutputGroup"/>
-		</xs:sequence>
-	</xs:group>
 	<xs:group name="AxleGroup">
 		<xs:sequence>
 			<xs:group ref="mrf:ComponentCommonOutputGroup"/>
@@ -203,6 +264,21 @@
 			<xs:element name="AngledriveRatio" type="v1.0:AngledriveRatioType"/>
 		</xs:sequence>
 	</xs:group>
+	<xs:group name="AerodynamicsGroup">
+		<xs:sequence>
+			<xs:element name="Model" type="v1.0:ModelType"/>
+			<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0"/>
+			<xs:element name="CdxA" type="v1.0:AirdragCdxAType"/>
+			<xs:element name="DigestValue" type="xs:token"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="PrimaryBusGeneralVehicleOutputGroup">
+		<xs:sequence>
+			<xs:group ref="mrf:ManufacturerGroup"/>
+			<xs:group ref="mrf:GeneralVehicleOutputGroup"/>
+		</xs:sequence>
+	</xs:group>
 	<xs:group name="TorqueConverterGroup">
 		<xs:sequence>
 			<xs:group ref="mrf:ComponentCommonOutputGroup"/>
@@ -497,4 +573,11 @@
 			<xs:extension base="xs:double"/>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:complexType name="AlternatorTechnologyType"/>
+	<xs:simpleType name="PowerType">
+		<xs:restriction base="xs:double"/>
+	</xs:simpleType>
+	<xs:simpleType name="StorageCapacityType">
+		<xs:restriction base="xs:double"/>
+	</xs:simpleType>
 </xs:schema>