feat: Switch diagnosis session to extended when executing routine

tzebrowski · Feb 1, 2024 · 9ccd0a9 · 9ccd0a9
1 parent e653daf
commit 9ccd0a9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/main/java/org/obd/metrics/api/DefaultWorkflow.java b/src/main/java/org/obd/metrics/api/DefaultWorkflow.java
@@ -69,6 +69,7 @@
 @Slf4j
 final class DefaultWorkflow implements Workflow {
 
+
 	private transient Future<?> tasks;
 
 	@Getter
@@ -185,7 +186,7 @@ public void stop(boolean gracefulStop) {
 	public WorkflowExecutionStatus executeRoutine(@NonNull Query query, @NonNull Init init,
 			@NonNull Adjustments adjustments) {
 
-		log.info("[Routine] Updating running workflow with new query");
+		log.info("[Routine] Executing routine");
 		log.info("[Routine] Selected PID's: {}", query.getPids());
 		log.info("[Routine] Protocol: {}, headers: {}",init.getProtocol(), init.getHeaders());
 		log.info("[Routine] Debug: {}", adjustments.isDebugEnabled());
@@ -204,7 +205,8 @@ public WorkflowExecutionStatus executeRoutine(@NonNull Query query, @NonNull Ini
 					if (pid != null) {
 						final Optional<Header> findFirst = init.getHeaders().stream().filter(w -> w.getMode().equals(pid.findMode())).findFirst();
 
-						forceResolve.addFirst(new ObdCommand("10 03"));
+						// extended diagnosis session
+						forceResolve.addFirst(UdsConstants.UDS_EXTENDED_SESSION);
 
 						if (findFirst.isPresent()) {
 							forceResolve.addFirst(new ATCommand("SH" + findFirst.get().getHeader()));
@@ -247,8 +249,12 @@ public WorkflowExecutionStatus updateQuery(@NonNull Query query, @NonNull Init i
 				diagnostics.rate().reset();
 				commandProducer.pause();
 
-				it.forceResolve(CommandsBuffer.class).clear();
-
+				final CommandsBuffer buffer = it.forceResolve(CommandsBuffer.class);
+				buffer.clear();
+
+				// defult diagnosis session
+				buffer.addFirst(UdsConstants.UDS_DEFAULT_SESSION);
+
 				commandProducer.updateSettings(adjustments, getCommandsSupplier(init, adjustments, query), diagnostics,
 						init);
 

diff --git a/src/main/java/org/obd/metrics/api/UdsConstants.java b/src/main/java/org/obd/metrics/api/UdsConstants.java
@@ -0,0 +1,12 @@
+package org.obd.metrics.api;
+
+import org.obd.metrics.command.obd.ObdCommand;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+final class UdsConstants {
+	static ObdCommand UDS_EXTENDED_SESSION = new ObdCommand("10 03");
+	static ObdCommand UDS_DEFAULT_SESSION = new ObdCommand("10 01");
+}
diff --git a/src/test/java/org/obd/metrics/api/WorkflowRoutineTest.java b/src/test/java/org/obd/metrics/api/WorkflowRoutineTest.java
@@ -28,13 +28,12 @@
 import org.obd.metrics.api.model.BatchPolicy;
 import org.obd.metrics.api.model.CachePolicy;
 import org.obd.metrics.api.model.Init;
-import org.obd.metrics.api.model.ProducerPolicy;
-import org.obd.metrics.api.model.Query;
 import org.obd.metrics.api.model.Init.Header;
 import org.obd.metrics.api.model.Init.Protocol;
+import org.obd.metrics.api.model.ProducerPolicy;
+import org.obd.metrics.api.model.Query;
 import org.obd.metrics.command.group.DefaultCommandGroup;
 import org.obd.metrics.connection.MockAdapterConnection;
-import org.obd.metrics.pid.PidDefinition;
 
 public class WorkflowRoutineTest {
 

diff --git a/src/test/java/org/obd/metrics/api/WorkflowUpdateQueryTest.java b/src/test/java/org/obd/metrics/api/WorkflowUpdateQueryTest.java
@@ -163,13 +163,16 @@ public void canHeaderChangeTest(boolean batchEnabled, String adapterGivenRespons
 		// switching CAN header to mode 555
 		boolean changeCanAferUpdate = false;
 		for (int i=0; i<6; i++) {
-			changeCanAferUpdate = recordedQueries.pop().equals("ATSHDA18F1");
+			changeCanAferUpdate = recordedQueries.pop().equals("10 01");
 			if (changeCanAferUpdate) {
 				break;
 			}
 		}
-		Assertions.assertThat(changeCanAferUpdate).isTrue().describedAs("Did not found: ATSHDA18F1");
+		Assertions.assertThat(changeCanAferUpdate).isTrue().describedAs("Did not found: 10 01");
 
+
+		Assertions.assertThat(recordedQueries.pop()).isEqualTo("ATSHDA18F1");
+
 		Assertions.assertThat(recordedQueries.pop()).isEqualTo(batchEnabled ? "22 04FE" : "2204FE");
 		Assertions.assertThat(recordedQueries.pop()).isEqualTo(batchEnabled ? "22 04FE" : "2204FE");