From cc2ff6901db7e417ba9f3d0bef661eb579ee0dc1 Mon Sep 17 00:00:00 2001
From: Yeongdo Park <ignis@postech.ac.kr>
Date: Tue, 6 Oct 2020 16:57:48 -0700
Subject: [PATCH] merge group1 request into the loop

---
 Main.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Main.py b/Main.py
index 8367933..3281f3a 100644
--- a/Main.py
+++ b/Main.py
@@ -87,18 +87,11 @@ while True:
     #PCAN.FilterMessages(PCAN_USBBUS1, 1979, 1979, PCAN_MESSAGE_STANDARD)
 
     group1_msg = []
-
-    PCAN.Write(PCAN_USBBUS1, Messages.request_group1)
-    time.sleep(.014)
-    p_message = True
-    while p_message:
-        MSG = PCAN.Read(PCAN_USBBUS1)
-        MSG = MSG[1]
-        if MSG.ID == 1979:
-            p_message = False
-            group1_msg.append(MSG)
-    for i in range(0, 4):
-        PCAN.Write(PCAN_USBBUS1, Messages.request_additional_line)
+    for i in range(0, 5):
+        if i == 0:
+            PCAN.Write(PCAN_USBBUS1, Messages.request_group1)
+        else:
+            PCAN.Write(PCAN_USBBUS1, Messages.request_additional_line)
         time.sleep(.014)
         p_message = True
         while p_message:
@@ -107,6 +100,7 @@ while True:
             if MSG.ID == 1979:
                 p_message = False
                 group1_msg.append(MSG)
+
     health_byte1 = "{0:08b}".format(MSG.DATA[2])
     health_byte2 = "{0:08b}".format(MSG.DATA[3])
     pack_health_string = health_byte1 + health_byte2