From f4387871fbb84e0fa61558619ac1a73248d83d39 Mon Sep 17 00:00:00 2001
From: sathwikcs <85106054+sathwikcs@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:31:00 +0530
Subject: [PATCH] Merge remote-tracking branch
 'origin/dev-server-2.1.130-review-retryUsb' into
 dev-server-2.1.130-review-retryUsb

---
 .../usb_teminal/UsbTerminalFragment.kt        | 19 ++++++++++++-------
 .../main/res/layout/fragment_usb_terminal.xml |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt
index 4fd27be..934ffff 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt
@@ -42,6 +42,9 @@ class UsbTerminalFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
         binding = FragmentUsbTerminalBinding.inflate(inflater, container, false)
+        binding.clearQueueButton.setOnClickListener {
+            clearQueue()
+        }
         sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         return binding.root
     }
@@ -75,9 +78,7 @@ class UsbTerminalFragment : Fragment() {
                 binding.etCommands.text.clear()
             }
         }
-        binding.button.setOnClickListener{
 
-        }
 
         listenToHemoCube()
         callCommand("I")
@@ -94,9 +95,7 @@ class UsbTerminalFragment : Fragment() {
     }
 
     private fun addToQueue(commands: List<String>) {
-        commandQueue.clear()
-        currentCommand = null
-
+        // Append new commands to the queue instead of replacing it
         commandQueue.addAll(commands)
 
         // Track commands in the activity
@@ -106,8 +105,14 @@ class UsbTerminalFragment : Fragment() {
             }
         }
 
-        appendFormattedMessage("\nNew priority commands: ${commands.joinToString(" ")}")
-        processNextCommand()
+        appendFormattedMessage("\nAdded commands to queue: ${commands.joinToString(" ")}")
+        processNextCommand() // Start processing if not already in progress
+    }
+
+    fun clearQueue() {
+        commandQueue.clear()
+        currentCommand = null
+        appendFormattedMessage("\nCommand queue cleared")
     }
 
 
diff --git a/app/src/main/res/layout/fragment_usb_terminal.xml b/app/src/main/res/layout/fragment_usb_terminal.xml
index 82abc1c..3f3ec0f 100644
--- a/app/src/main/res/layout/fragment_usb_terminal.xml
+++ b/app/src/main/res/layout/fragment_usb_terminal.xml
@@ -18,7 +18,7 @@
     android:padding="16dp">
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/clearQueueButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Clar All Commands" />