Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into develop

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx

Documentation/User Manual/6-changelog/changelog.md

@@ -2,7 +2,7 @@
 
 **VECTO 3.3.0**
 
-***Build 1432 (2018-12-03) OFFICIAL RELEASE***
+***Build 1433 (2018-12-03) OFFICIAL RELEASE***
 
 - Bugfixes (compared to 3.3.0.1250)
     * [VECTO-723] - Simulation aborts with engine speed too high in RD cycle
@@ -18,6 +18,7 @@
     * [VECTO-704] - Allow VTP-simulations for AT gearboxes
 - Changes (compared to 3.3.0.1398)
     * [VECTO-795] - VECTO Hashing Tool crashes
+    * [VECTO-802] - Error in XML schema for manufacturer's record file
 
 
 ***Build 1398 (2018-10-30) RELEASE CANDIDATE***

Documentation/User Manual/help.html

@@ -6624,7 +6624,7 @@ CycleTime,UnknownCycleName,3600</code></pre>
 <div id="changelog" class="section level1">
 <h1>Changelog</h1>
 <p><strong>VECTO 3.3.0</strong></p>
-<p><strong><em>Build 1432 (2018-12-03) OFFICIAL RELEASE</em></strong></p>
+<p><strong><em>Build 1433 (2018-12-03) OFFICIAL RELEASE</em></strong></p>
 <ul>
 <li>Bugfixes (compared to 3.3.0.1250)
 <ul>
@@ -6643,6 +6643,7 @@ CycleTime,UnknownCycleName,3600</code></pre>
 <li>Changes (compared to 3.3.0.1398)
 <ul>
 <li>[VECTO-795] - VECTO Hashing Tool crashes</li>
+<li>[VECTO-802] - Error in XML schema for manufacturer’s record file</li>
 </ul></li>
 </ul>
 <p><strong><em>Build 1398 (2018-10-30) RELEASE CANDIDATE</em></strong></p>

Documentation/checksum_3.3.0.1432.txt

-Algorithm       Hash                                                                   Path                                                                                              
----------       ----                                                                   ----                                                                                              
-SHA256          54306C3A4B293EAD9D4FC5C81AA542869CD7B030D1B13DAA4BA0292E70A58662       2018_12_03-VECTO-3.3.0.1432.zip                                                          
-
-
-Algorithm       Hash                                                                   Path                                                                                              
----------       ----                                                                   ----                                                                                              
-SHA256          5079E9018FE8EA71C60A5BB3C8286D4FE0133D7AED1A5158996246EC7FA49C44       2018_12_03-VECTO-3.3.0.1432\hashingcmd.exe                                               
-SHA256          C040E49DAD9B019D06EA40BCF1FAAEB9768A5F1CA0E6C346BA248B82653D9826       2018_12_03-VECTO-3.3.0.1432\HashingTool.exe                                              
-SHA256          077ADC8F0D2C4612800AF4811B13AA8192E0216D8AC57A87C926F7B0C1938C02       2018_12_03-VECTO-3.3.0.1432\VECTO.exe                                                    
-SHA256          9ACE0DAF3C731743DDA2ECB2AD58386238F94221E0F0ED03699851015DFC316F       2018_12_03-VECTO-3.3.0.1432\vectocmd.exe                                                 
-SHA256          86FF886C8BD9A23F691B0D14C82DEFEFBA12FAEFAD1BD0ED2BFC67E9CB178B72       2018_12_03-VECTO-3.3.0.1432\AdvancedAuxiliaryInterfaces.dll                              
-SHA256          507C99C0368A873B7BD03B7230C820E9FBD507ABC65807E1FC4BAF92BC85AC3A       2018_12_03-VECTO-3.3.0.1432\BusAuxiliaries.dll                                           
-SHA256          DF8EC2E0245829DDEC5B79F1918C3AE3A3FA540A5A0E3C410E2B6EF0BEBC7927       2018_12_03-VECTO-3.3.0.1432\Newtonsoft.Json.dll                                          
-SHA256          A4E7600C2A9CBC0CF12334FD5E313EE47F61F669E3D3FCB098968D33D9FB0521       2018_12_03-VECTO-3.3.0.1432\NLog.dll                                                     
-SHA256          9B7EB6DE62FF1E6A812FA47697FDB2ABCEAD85AA2554ABF12416FC569DD4462E       2018_12_03-VECTO-3.3.0.1432\Omu.ValueInjecter.dll                                        
-SHA256          30ED578DA60B799DDD998D69A1687B42168D3C1118189400AD3D0FDC7C60FE63       2018_12_03-VECTO-3.3.0.1432\VectoCommon.dll                                              
-SHA256          80CBF3989436A78D34B15D70782292AEF1CBF51521D171D12A854C9895ABFD2C       2018_12_03-VECTO-3.3.0.1432\VectoCore.dll                                                
-SHA256          A9914DE5B70580B44EE27AA5D12A83931FF56B843485647F071067B1ACD05E8C       2018_12_03-VECTO-3.3.0.1432\VectoHashing.dll                                             

HashingTool/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1432")]
-[assembly: AssemblyFileVersion("0.2.0.1432")]
+[assembly: AssemblyVersion("0.2.0.1433")]
+[assembly: AssemblyFileVersion("0.2.0.1433")]

VECTO.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
 	ProjectSection(ProjectDependencies) = postProject
+		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A} = {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}
+		{33F9848E-9257-4BE2-915F-68E748AEB204} = {33F9848E-9257-4BE2-915F-68E748AEB204}
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391} = {60AD4DF0-6648-4374-83CB-C7A162EFB391}
 	EndProjectSection
 EndProject

VectoCommon/VectoCommon/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1432")]
-[assembly: AssemblyFileVersion("3.3.0.1432")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1433")]
+[assembly: AssemblyFileVersion("3.3.0.1433")]
\ No newline at end of file

VectoCommon/VectoHashing/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1432")]
-[assembly: AssemblyFileVersion("1.2.0.1432")]
+[assembly: AssemblyVersion("1.2.0.1433")]
+[assembly: AssemblyFileVersion("1.2.0.1433")]

VectoConsole/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1432")]
-[assembly: AssemblyFileVersion("3.3.0.1432")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1433")]
+[assembly: AssemblyFileVersion("3.3.0.1433")]
\ No newline at end of file

VectoCore/VectoCore/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1432")]
-[assembly: AssemblyFileVersion("3.3.0.1432")]
+[assembly: AssemblyVersion("3.3.0.1433")]
+[assembly: AssemblyFileVersion("3.3.0.1433")]

VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.6.xsd

@@ -519,7 +519,7 @@
 			<xs:element name="Model" type="vdecdef:ModelType"/>
 			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
 			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
-			<xs:element name="VIN">
+			<xs:element name="VIN" type="xs:string">
 				<xs:annotation>
 					<xs:documentation>P238</xs:documentation>
 				</xs:annotation>

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "3.3.0.1432" + SUFFIX;
+				return "3.3.0.1433" + SUFFIX;
 			}
 		}
 

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml

@@ -27,6 +27,7 @@
 		<TorqueLimits>
 			<Entry gear="1" maxTorque="2000"/>
 			<Entry gear="2" maxTorque="2000"/>
+      <Entry gear="11" maxTorque="2000"/>
 			<Entry gear="12" maxTorque="1500"/>
 		</TorqueLimits>
 		<Components>