Merge branch 'issue-619' into 'amdm2/develop'

fix #619: restore wrong exempted techs in XSD

See merge request vecto/vecto!209

VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd

@@ -24,6 +24,7 @@ Changelog:
 	29.03.2024: the entry "Multiple powertrains Article 9 exempted" added on Feb. 9. contains a non-visible character. 
                 added another entry for the same technology without the non-visible character.
 	10.04.2024: change "Fuel cell vehicle" to "FCV Article 9 exempted" according to regulation
+	19.04.2024: restore wrong exempted techs along with correct ones.
 	-->
 	<xs:complexType name="Abstract_ADAS_ConventionalType" abstract="true">
 		<xs:complexContent>
@@ -1799,7 +1800,9 @@ Changelog:
 								<xs:enumeration value="PEV Article 9 exempted"/>
 								<xs:enumeration value="HV Article 9 exempted"/>
 								<xs:enumeration value="FCV Article 9 exempted"/>
+								<xs:enumeration value="Fuel cell vehicle"/>
 								<xs:enumeration value="H2 ICE Article 9 exempted"/>
+								<xs:enumeration value="H2 ICE"/>
 								<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 								<xs:enumeration value="In-motion charging Article 9 exempted"/>
 								<xs:enumeration value="Multiple power­trains Article 9 exempted"/>
@@ -1862,7 +1865,9 @@ Changelog:
 								<xs:enumeration value="PEV Article 9 exempted"/>
 								<xs:enumeration value="HV Article 9 exempted"/>
 								<xs:enumeration value="FCV Article 9 exempted"/>
+								<xs:enumeration value="Fuel cell vehicle"/>
 								<xs:enumeration value="H2 ICE Article 9 exempted"/>
+								<xs:enumeration value="H2 ICE"/>
 								<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 								<xs:enumeration value="In-motion charging Article 9 exempted"/>
 								<xs:enumeration value="Multiple power­trains Article 9 exempted"/>
@@ -1900,7 +1905,9 @@ Changelog:
 								<xs:enumeration value="PEV Article 9 exempted"/>
 								<xs:enumeration value="HV Article 9 exempted"/>
 								<xs:enumeration value="FCV Article 9 exempted"/>
+								<xs:enumeration value="Fuel cell vehicle"/>
 								<xs:enumeration value="H2 ICE Article 9 exempted"/>
+								<xs:enumeration value="H2 ICE"/>
 								<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 								<xs:enumeration value="In-motion charging Article 9 exempted"/>
 								<xs:enumeration value="Multiple power­trains Article 9 exempted"/>

VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd

@@ -9,6 +9,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" targetNamespace
 	<!-- 
 Changelog
 	10.04.2024: change "Fuel cell vehicle" to "FCV Article 9 exempted" according to regulation
+	19.04.2024: restore wrong exempt techs along with the correct ones.
 	-->
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
@@ -909,7 +910,9 @@ Changelog
 								<xs:enumeration value="PEV Article 9 exempted"/>
 								<xs:enumeration value="HV Article 9 exempted"/>
 								<xs:enumeration value="FCV Article 9 exempted"/>
+								<xs:enumeration value="Fuel cell vehicle"/>
 								<xs:enumeration value="H2 ICE Article 9 exempted"/>
+								<xs:enumeration value="H2 ICE"/>
 								<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 								<xs:enumeration value="In-motion charging Article 9 exempted"/>
 								<xs:enumeration value="Other technology Article 9 exempted"/>

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

@@ -6,6 +6,7 @@ Changelog
 	 2.10.2023: adding unit attribute to TPMLM and corrected mass output fields
 	 2.10.2023: make Airdrag component in output mandatory (provide standard values in case no Airdrag is provided in input). make Model and DigestValue optional (only in output for measured component)
 	10.04.2024: change "Fuel cell vehicle" to "FCV Article 9 exempted" according to regulation
+	19.04.2024: restore wrong exempt techs along with the correct ones.
 -->
 	<!-- Imports_______________________________________________ -->
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -3479,7 +3480,9 @@ Changelog
 			<xs:enumeration value="PEV Article 9 exempted"/>
 			<xs:enumeration value="HV Article 9 exempted"/>
 			<xs:enumeration value="FCV Article 9 exempted"/>
+			<xs:enumeration value="Fuel cell vehicle"/>
 			<xs:enumeration value="H2 ICE Article 9 exempted"/>
+			<xs:enumeration value="H2 ICE"/>
 			<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 			<xs:enumeration value="In-motion charging Article 9 exempted"/>
 			<xs:enumeration value="Other technology Article 9 exempted"/>

VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd

@@ -12,6 +12,7 @@
 	Changelog:
 	18.01.2024: change restrictions of EM continuous torque - allow 0.00
 	10.04.2024: change "Fuel cell vehicle" to "FCV Article 9 exempted" according to regulation
+	19.04.2024: restore wrong exempt techs along with the correct ones
 	-->
   <xs:complexType name="ElectricMachineSystemMaxTorqueEntryType">
 		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
@@ -2664,7 +2665,9 @@
 								<xs:enumeration value="PEV Article 9 exempted"/>
 								<xs:enumeration value="HV Article 9 exempted"/>
 								<xs:enumeration value="FCV Article 9 exempted"/>
+								<xs:enumeration value="Fuel cell vehicle"/>
 								<xs:enumeration value="H2 ICE Article 9 exempted"/>
+								<xs:enumeration value="H2 ICE"/>
 								<xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
 								<xs:enumeration value="In-motion charging Article 9 exempted"/>
 								<xs:enumeration value="Other technology Article 9 exempted"/>