Merge branch 'official/develop' into 'official/main'

creating new official release

See merge request !31

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

@@ -2,7 +2,14 @@
 
 **VECTO-3.3.15 RELEASE CANDIDATE**
 
-***Buile 3073***
+***Build 3102 (2023-06-30) OFFICIAL RELEASE***
+
+- Bugfixes (compared to VECTO 3.3.15.3073)
+   - [CodeEU-41] – Article 10 notification
+   - [CodeEU-45] - Simulation Abort: Unexpected Response: ResponseUnderload (bugfix for CodeEU-41)
+
+
+***Build 3073 (2023-06-01) RELEASE CANDIDATE***
 
 - Bugfixes 
     * [VECTO-1741] - XML Schema for BatterySystem with standard values

Documentation/User Manual/help.html

@@ -8303,7 +8303,18 @@ stored as LOG_backup.txt.</p>
 <section id="changelog" class="level1">
 <h1>Changelog</h1>
 <p><strong>VECTO-3.3.15 RELEASE CANDIDATE</strong></p>
-<p><strong><em>Buile 3073</em></strong></p>
+<p><strong><em>Build 3102 (2023-06-30) OFFICIAL
+RELEASE</em></strong></p>
+<ul>
+<li>Bugfixes (compared to VECTO 3.3.15.3073)
+<ul>
+<li>[CodeEU-41] – Article 10 notification</li>
+<li>[CodeEU-45] - Simulation Abort: Unexpected Response:
+ResponseUnderload (bugfix for CodeEU-41)</li>
+</ul></li>
+</ul>
+<p><strong><em>Build 3073 (2023-06-01) RELEASE
+CANDIDATE</em></strong></p>
 <ul>
 <li>Bugfixes
 <ul>

HashingTool/Properties/Version.cs

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

VectoCommon/VectoCommon/Properties/Version.cs

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

VectoCommon/VectoHashing/Properties/Version.cs

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

VectoConsole/Properties/Version.cs

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

VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -977,9 +977,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 			bool xmlVersionNewer = VersioningUtil.CompareVersions(simToolVersionStr, vectoVersionStr) > 0;
 
+#if !DEBUG
 			if (xmlVersionNewer) {
 				throw new VectoException($"Not allowed to run simulation because VECTO version is older than <SimulationToolVersion> in Manufacturer Report ({simToolVersionStr}).");
 			}
+#endif
 		}
 
 		public void ValidateHash()

VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

@@ -264,6 +264,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 			if (halted || (driverDeceleratingNegTorque && vehicleSpeedBelowThreshold)) {
 				EngageTime = VectoMath.Max(EngageTime, absTime + dt);
+				Log.Debug("disengaged due to low vehicle speed", dt);
+				postponeEngage = true;
                 _strategy?.Disengage(absTime, dt, outTorque, outAngularVelocity);
 				//if (_strategy != null && DataBus.HybridControllerInfo != null &&
 				//	DataBus.HybridControllerInfo.SelectedGear.Gear > 0 &&

VectoCore/VectoCore/Properties/Version.cs

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

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "3.3.15.3073" + SUFFIX;
+				return "3.3.15.3102" + SUFFIX;
 			}
 		}
 

VectoCore/VectoCore/VectoCore.csproj

@@ -76,7 +76,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
+    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>