Merge pull request #52 in VECTO/vecto-sim from ~EMLUZRAPH/vecto-sim:master to master

* commit 'a5f9901a': - Updated C-to-C shift strategy with acc_min rule - Bugix: Incorrect torque calculation in AT/TC model caused early up-shifts - Overwrite gear shifts that would cause too high rpm Updated AT demo bus file formats to include Eng./Decl. mode flag

Merge pull request #52 in VECTO/vecto-sim from ~EMLUZRAPH/vecto-sim:master to master
2259465e · Raphael LUZ · b54a07ac · a5f9901a · 2259465e · 2259465e
Commit 2259465e authored 10 years ago by Raphael LUZ
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,10 @@ TODO
 - Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)


+### VECTO 2.1.1
+* Bugfix: Incorrect torque calculation in AT/TC model caused early up-shifts
+* Updated C-to-C shift strategy with acc_min rule (see V2.1)
+
 ### VECTO 2.1
 * Limit engine rpm in torque converter operation acc. > acc_min
 * Shift up (C-to-L, L-to-L) if acc. > acc_min and next-gear-rpm > threshold

--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT Bus Demo.vecto
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT Bus Demo.vecto
 {
  "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "17.06.2014 13:48:52",
-    "AppVersion": "2.0.2-beta2",
-    "FileVersion": 1
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "22.04.2015 15:19:30",
+    "AppVersion": "2.1",
+    "FileVersion": 2
  },
  "Body": {
+    "SavedInDeclMode": false,
    "VehicleFile": "Vehicle.vveh",
    "EngineFile": "Engine.veng",
    "GearboxFile": "Gearbox.vgbx",

--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
 {
  "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "17.06.2014 12:26:40",
-    "AppVersion": "2.0.2-beta1",
-    "FileVersion": 1
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "22.04.2015 15:19:42",
+    "AppVersion": "2.1",
+    "FileVersion": 2
  },
  "Body": {
+    "SavedInDeclMode": false,
    "ModelName": "Demo Engine",
    "Displacement": 7700.0,
    "IdlingSpeed": 600.0,

--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
 {
  "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "23.06.2014 13:46:07",
-    "AppVersion": "2.0.2-beta3",
-    "FileVersion": 3
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "22.04.2015 15:19:44",
+    "AppVersion": "2.1",
+    "FileVersion": 4
  },
  "Body": {
+    "SavedInDeclMode": false,
    "ModelName": "Gearbox",
    "Inertia": 0.0,
    "TracInt": 0.0,

--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh
 {
  "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "17.06.2014 12:25:51",
-    "AppVersion": "2.0.2-beta1",
-    "FileVersion": 4
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "22.04.2015 15:19:41",
+    "AppVersion": "2.1",
+    "FileVersion": 5
  },
  "Body": {
+    "SavedInDeclMode": false,
    "VehCat": "Citybus",
    "CurbWeight": 11500.0,
    "CurbWeightExtra": 0.0,

--- a/Tools/PicCoordLogger.exe
+++ b/Tools/PicCoordLogger.exe
--- a/User Manual/main/changelog.html
+++ b/User Manual/main/changelog.html
@@ -3,11 +3,23 @@



+
+
 <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO Changelog</title></head><body>

 <div style="text-align: center;"><div style="text-align: left;"><span style="font-family: Verdana;"><big><big><big><span style="font-weight: bold;">Changelog</span></big></big></big></span><br><hr style="width: 100%; height: 0px;"><br><span style="font-family: Verdana;"></span></div><span style="font-family: Verdana;"></span>

-<div style="text-align: left;"><span style="font-family: Tahoma;">VECTO 2.1<br>
+<div style="text-align: left;"><span style="font-family: Tahoma;">VECTO 2.1.1<br>
+</span>
+<ul>
+  
+  <li><span style="font-family: Tahoma;">Bugfix: Incorrect torque calculation in AT/TC model caused early up-shifts</span></li>
+  <li><span style="font-family: Tahoma;">Updated C-to-C shift strategy with </span><span style="font-family: Tahoma;">acc_min rule (see V2.1)<br>
+    </span></li>
+
+</ul>
+<span style="font-family: Tahoma;"><br>
+VECTO 2.1<br>
 </span>
 <ul>
  

--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
--- a/VECTO/My Project/AssemblyInfo.vb
+++ b/VECTO/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by entering "*" in them:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.1.0.0")> 
-<Assembly: AssemblyFileVersion("2.1.0.0")> 
+<Assembly: AssemblyVersion("2.1.1.0")> 
+<Assembly: AssemblyFileVersion("2.1.1.0")> 
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -11,7 +11,7 @@
 Imports System.Collections.Generic

 Module VECTO_Global
-	Public Const VECTOvers As String = "2.1"
+	Public Const VECTOvers As String = "2.1.1"
 	Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
 	Public MyAppPath As String
 	Public MyConfPath As String