diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd index 4604e0dd47da22455d0fcb1ed0d42dfd4dfb5cdb..c16bf19c43784b0948c9f25c295bc493cf94ef74 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) --> +<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdecdef1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/> @@ -21,7 +21,7 @@ <xs:element name="ElectricMachineSystem" type="v2.10.1:ElectricMachineSystemComponentDeclarationType"/> <xs:element name="IEPC" type="v2.10.1:IEPCComponentDeclarationType"/> <xs:element name="BatterySystem" type="v2.10.1:BatteryComponentDeclarationType"/> - <xs:element name="CapacitorSystem" type="v2.10.1:CapacitorComponentDeclarationType"/> + <xs:element name="CapacitorSystem" type="v2.10.1:CapacitorSystemComponentDeclarationType"/> <xs:element name="ADC" type="v2.10.1:ADCComponentDeclarationType"/> </xs:choice> <xs:attribute name="schemaVersion" use="required"> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd index e946bdccb5dea192f7d9eadc73a59f5f414d832a..73db2aac1b69f7a793ba78518e13f59ba9466c00 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd @@ -553,11 +553,6 @@ </xs:simpleType> </xs:element> <xs:group ref="v2.10.1:ElectricMachineSystemPowerRatingsSequenceGroup"/> - <xs:element name="TestVoltageOverload" type="v2.10.1:TestVoltageOverloadType"> - <xs:annotation> - <xs:documentation>P464 - [V]</xs:documentation> - </xs:annotation> - </xs:element> <xs:element name="DcDcConverterIncluded" type="xs:boolean"> <xs:annotation> <xs:documentation>P465 - bool</xs:documentation> @@ -613,6 +608,31 @@ <xs:documentation>P467 - [V]</xs:documentation> </xs:annotation> </xs:element> + <xs:element name="ContinuousTorque" type="v2.10.1:MaxTorqueType"> + <xs:annotation> + <xs:documentation>P459 - [Nm]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TestSpeedContinuousTorque" type="v2.10.1:TestSpeedType"> + <xs:annotation> + <xs:documentation>P460 - [1/min]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="OverloadTorque" type="v2.10.1:MaxTorqueType"> + <xs:annotation> + <xs:documentation>P461 - [Nm]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TestSpeedOverloadTorque" type="v2.10.1:TestSpeedType"> + <xs:annotation> + <xs:documentation>P462 - [1/min]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="OverloadDuration" type="v2.10.1:OverloadDurationType"> + <xs:annotation> + <xs:documentation>P463 - [s]</xs:documentation> + </xs:annotation> + </xs:element> <xs:element name="MaxTorqueCurve"> <xs:complexType> <xs:sequence> @@ -693,10 +713,15 @@ </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="IHPCType" type="v2.10.1:IHPCTypeType"> + <xs:element name="IHPCType"> <xs:annotation> <xs:documentation>P466 - enum</xs:documentation> </xs:annotation> + <xs:simpleType> + <xs:restriction base="v2.10.1:IHPCTypeType"> + <xs:enumeration value="None"/> + </xs:restriction> + </xs:simpleType> </xs:element> <xs:element name="VoltageLevel" type="v2.10.1:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/> <xs:element name="DragCurve"> @@ -829,6 +854,7 @@ <xs:documentation>P463 - [s]</xs:documentation> </xs:annotation> </xs:element> + <xs:element name="MaxTorqueCurve" type="v2.10.1:ElectricMachineSystemMaxTorqueCurveType"/> <xs:element name="PowerMap"> <xs:complexType> <xs:sequence> @@ -836,7 +862,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="MaxTorqueCurve" type="v2.10.1:ElectricMachineSystemMaxTorqueCurveType"/> </xs:sequence> </xs:extension> </xs:complexContent> 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 b995fcde47a43a7acb6eeff3d935d9771807c022..7f3f817cdc9d5d0c86eb091702ed4eb6b62cef5f 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Josef Kober (Technische Universität Graz) --> +<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> @@ -1441,7 +1441,7 @@ <xs:element name="REESS"> <xs:complexType> <xs:sequence> - <xs:element name="Data" type="v2.10.1:AbstractBatteryDataType"/> + <xs:element name="Data" type="v2.10.1:AbstractBatterySystemDataType"/> <xs:element name="Signature" type="v2.0:SignatureType"/> </xs:sequence> </xs:complexType> @@ -1474,7 +1474,7 @@ </xs:complexType> <xs:complexType name="REESSCapacitorType"> <xs:sequence> - <xs:element name="Data" type="v2.10.1:AbstractCapacitorDataType"/> + <xs:element name="Data" type="v2.10.1:AbstractCapacitorSystemDataType"/> <xs:element name="Signature" type="v2.0:SignatureType"/> </xs:sequence> </xs:complexType>