Merge pull request #42 in VECTO/vecto-dev from...

Merge pull request #42 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1240_hybrid-P0_with_APT to develop

* commit 'cb4bc6b1':
  do no allow engine stop during drive for p1 hybrid

VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs

@@ -665,6 +665,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			if (!ModelData.VehicleData.ADAS.EngineStopStart) {
 				return false;
 			}
+			var emPos = ModelData.ElectricMachinesData.First().Item1;
+			if (ModelData.VehicleData.ADAS.EngineStopStart && emPos == PowertrainPosition.HybridP1) {
+				return false;
+			}
 			return PreviousState.ICEStartTStmp == null ||
 					(PreviousState.ICEStartTStmp + StrategyParameters.MinICEOnTime).IsSmaller(absTime);
 		}

VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vveh

@@ -39,7 +39,7 @@
         }
       ]
     },
-    "EngineStopStart": false,
+    "EngineStopStart": true,
     "EcoRoll": "None",
     "PredictiveCruiseControl": "None",
     "ATEcoRollReleaseLockupClutch": false,