From 933d316bcc989428f99cd60f4613ffee2bf9b0f8 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 27 Jun 2022 15:25:49 +0200
Subject: [PATCH] allow overspeed in case overspeed is disabled but PCC option
 3 is enabled and we are on a highway

---
 .../Models/SimulationComponent/Impl/DefaultDriverStrategy.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 0683d8833c..5a40c85b10 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -753,7 +753,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public bool IsOverspeedAllowed(MeterPerSecond velocity, bool prohibitOverspeed = false) =>
 			!prohibitOverspeed
-			&& Driver.DriverData.OverSpeed.Enabled
+			// allow overspeed either if enabled in the driver model, or ADAS PCC option 3 is enabled in the vehicle and we are on a highway
+			&& (Driver.DriverData.OverSpeed.Enabled || ADAS.PredictiveCruiseControl == PredictiveCruiseControlType.Option_1_2_3 && DataBus.DrivingCycleInfo.CycleData.LeftSample.Highway)
 			&& velocity > Driver.DriverData.OverSpeed.MinSpeed
 			&& ApplyOverspeed(velocity) < (DataBus.VehicleInfo.MaxVehicleSpeed ?? 500.KMPHtoMeterPerSecond());
 	}
-- 
GitLab