Tweak mock dtc

kkonteh97 · Mar 28, 2024 · 62e98b3 · 62e98b3
1 parent 6d98750
commit 62e98b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/Sources/SwiftOBD2/Communication/mockManager.swift b/Sources/SwiftOBD2/Communication/mockManager.swift
@@ -145,10 +145,27 @@ class MOCKComm: CommProtocol {
 
         } else if command == "03" {
             // 03 is a request for DTCs
-            let dtc = ["P0301"]
+            let dtcs = ["P0104", "U0207"]
+            var response = ""
             // convert to hex
-            let hexDTC = dtc.map { $0.utf8.map { String(format: "%02X", $0) }.joined() }
-            let response = header + " 02 " + hexDTC.joined(separator: " ") + "00"
+            for dtc in dtcs {
+                var hexString = String(dtc.suffix(4))
+                // 2 by 2
+                hexString = hexString.chunked(by: 2).joined(separator: " ")
+                response +=  hexString
+                print("hexString", hexString)
+            }
+            if ecuSettings.headerOn {
+                header = "7E8"
+            }
+            let mode = "43"
+            response = mode + " " + response
+            let length = String(format: "%02X", response.count / 3 + 1)
+            response = header + " " + length + " " + response
+            while response.count < 28 {
+                response.append(" 00")
+            }
+            print("response", response)
             return [response]
         } else {
             guard var response = OBDCommand.mockResponse(forCommand: command) else {

diff --git a/Sources/SwiftOBD2/elm327.swift b/Sources/SwiftOBD2/elm327.swift
@@ -249,7 +249,7 @@ class ELM327 {
         let statusResponse = try await sendCommand(statusCommand.properties.command)
         let statueMessages = OBDParcer(statusResponse, idBits: obdProtocol.idBits)?.messages
 
-        guard let statusData = statueMessages?[0].data,
+        guard let statusData = statueMessages?.first?.data,
               let decodedStatus = statusCommand.properties.decode(data: statusData)
         else {
             return nil
@@ -263,7 +263,7 @@ class ELM327 {
 
         let dtcMessages = OBDParcer(dtcResponse, idBits: obdProtocol.idBits)?.messages
 
-        guard let dtcData = dtcMessages?[0].data else {
+        guard let dtcData = dtcMessages?.first?.data else {
             return []
         }
         guard let decodedDtc = dtcCommand.properties.decode(data: dtcData) else {