From c12f74fea206191877d4a727547bfdb0c9b938cc Mon Sep 17 00:00:00 2001
From: edvalley <52469633+edvalley@users.noreply.github.com>
Date: Fri, 7 Jul 2023 08:08:48 -0400
Subject: Keep same structure as before

---
 .../traccar/protocol/LaipacProtocolDecoder.java    | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
index 3b654db0c..dbac159b3 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
@@ -110,26 +110,25 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeEvent(String event, Position position) {
 
-        if (event.length() != 1) {
-            return event;
-        }
-
-        int inputStatusInt = 0;
-        char inputStatus = event.charAt(0);
-
-        if (inputStatus >= 'A' && inputStatus <= 'D') {
-            inputStatusInt = inputStatus - 'A';
-        } else if (inputStatus >= 'O' && inputStatus <= 'R') {
-            inputStatusInt = inputStatus - 'O' + 4;
-        } else {
-            return event;
-        }
-
-        position.set(Position.PREFIX_IN + 1, inputStatusInt & 1);
-        position.set(Position.PREFIX_IN + 2, inputStatusInt & 2);
-        position.set(Position.PREFIX_IN + 3, inputStatusInt & 4);
-
-        return null;
+        if (event.length() == 1) {
+    		char inputStatus = event.charAt(0);
+    		if (inputStatus >= 'A' && inputStatus <= 'D') {
+    			int inputStatusInt = inputStatus - 'A';
+    			position.set(Position.PREFIX_IN + 1, inputStatusInt & 1);
+    			position.set(Position.PREFIX_IN + 2, inputStatusInt & 2);
+                position.set(Position.PREFIX_IN + 3, 0);
+    			return null;
+    		} else if (inputStatus >= 'O' && inputStatus <= 'R') {
+                int inputStatusInt = inputStatus - 'O';
+                position.set(Position.PREFIX_IN + 1, inputStatusInt & 1);
+    			position.set(Position.PREFIX_IN + 2, inputStatusInt & 2);
+                position.set(Position.PREFIX_IN + 3, 1);
+                return null;
+            }
+    	}
+    
+    	return event;
+        
     }
 
     private void sendEventResponse(
-- 
cgit v1.2.3