From 4c7e00810e9a0ac633b3111502aff670ec5ddcfd Mon Sep 17 00:00:00 2001 From: Harald Martini <harald.martini@student.tugraz.at> Date: Wed, 3 Nov 2021 11:04:14 +0100 Subject: [PATCH] Added AbstractBatteryDataType and AbstractCapacitorDataType --- ...ationDefinitions.2.10.1_xEV_Components.xsd | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) 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 a0697bf1ec..1d458855de 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 @@ -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 v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) --> <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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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"/> @@ -28,6 +28,16 @@ <xs:extension base="v1.0:VectoSimulationComponent"/> </xs:complexContent> </xs:complexType> + <xs:complexType name="AbstractBatteryDataType" abstract="true"> + <xs:complexContent> + <xs:extension base="v2.10.1:AbstractREESSDataType"/> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="AbstractCapacitorDataType" abstract="true"> + <xs:complexContent> + <xs:extension base="v2.10.1:AbstractREESSDataType"/> + </xs:complexContent> + </xs:complexType> <xs:complexType name="ADCComponentDeclarationType"> <xs:sequence> <xs:element name="Data" type="v2.10.1:AbstractADCDataDeclarationType"/> @@ -103,7 +113,7 @@ </xs:complexType> <xs:complexType name="BatterySystemDataType"> <xs:complexContent> - <xs:extension base="v2.10.1:AbstractREESSDataType"> + <xs:extension base="v2.10.1:AbstractBatteryDataType"> <xs:sequence> <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> <xs:annotation> @@ -255,7 +265,7 @@ </xs:complexType> <xs:complexType name="CapacitorDataType"> <xs:complexContent> - <xs:extension base="v2.10.1:AbstractREESSDataType"> + <xs:extension base="v2.10.1:AbstractCapacitorDataType"> <xs:sequence> <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> <xs:annotation> @@ -1077,6 +1087,18 @@ <xs:element name="Signature" type="v2.0:SignatureType"/> </xs:sequence> </xs:complexType> + <xs:complexType name="BatteryComponentDeclarationType"> + <xs:sequence> + <xs:element name="Data" type="v2.10.1:AbstractBatteryDataType"/> + <xs:element name="Signature" type="v2.0:SignatureType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="CapacitorComponentDeclarationType"> + <xs:sequence> + <xs:element name="Data" type="v2.10.1:AbstractCapacitorDataType"/> + <xs:element name="Signature" type="v2.0:SignatureType"/> + </xs:sequence> + </xs:complexType> <xs:simpleType name="BatteryMaxCurrentType"> <xs:annotation> <xs:appinfo> -- GitLab