From 35548a5a5b130541df180ad874e14f5f1bdce604 Mon Sep 17 00:00:00 2001
From: SanjayramVempati <101228879+SanjayramVempati@users.noreply.github.com>
Date: Sat, 14 Jan 2023 14:38:50 -0500
Subject: [PATCH 1/2] Update server.py

---
 RaspPi-flask-recieve/server.py | 42 ++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/RaspPi-flask-recieve/server.py b/RaspPi-flask-recieve/server.py
index 6438a8b..6fab164 100644
--- a/RaspPi-flask-recieve/server.py
+++ b/RaspPi-flask-recieve/server.py
@@ -1,13 +1,35 @@
 import socket
-host='0.0.0.0'
-port=2345
-s=socket.socket()
-s.bind((host,port))
+#!/usr/bin/env python
+
+import serial
+import time
+
+ser = serial.Serial('/dev/ttyACM0', 9600, timeout=2)
+
+
+host = '0.0.0.0'
+port = 2345
+s = socket.socket()
+s.bind((host, port))
 s.listen(2)
 while True:
-	conn,addr=s.accept()
-	print("Connected by",addr)
-	data=conn.recv(1024)
-	print("received data:",data)
-	conn.send(data)
-	conn.close()
+    conn, addr = s.accept()
+    print("Connected by", addr)
+    data = conn.recv(1024)
+
+    print("received data:", data)
+    # Get rid of garbage/incomplete data
+    ser.flush()
+
+    # Infinite loop
+    i = 0
+    while (1):
+        i += 1
+        send_string = ("Data\n")
+        ser.write(send_string.encode('utf-8'))
+        time.sleep(0.01)
+        receive_string = ser.readline().decode('utf-8').rstrip()
+        print(receive_string)
+
+    conn.send(data)
+    conn.close()

From f93a2fff465c1231f1a43c6182b8a865107b7461 Mon Sep 17 00:00:00 2001
From: Vrishak Vemuri <53585843+FluffyCube9343@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:03:44 -0500
Subject: [PATCH 2/2] Merge Pi<->Arduino and Gui<->Pi

---
 RaspPi-flask-recieve/server.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/RaspPi-flask-recieve/server.py b/RaspPi-flask-recieve/server.py
index 6fab164..483af40 100644
--- a/RaspPi-flask-recieve/server.py
+++ b/RaspPi-flask-recieve/server.py
@@ -5,7 +5,7 @@ import serial
 import time
 
 ser = serial.Serial('/dev/ttyACM0', 9600, timeout=2)
-
+ser.flush()
 
 host = '0.0.0.0'
 port = 2345
@@ -19,17 +19,14 @@ while True:
 
     print("received data:", data)
     # Get rid of garbage/incomplete data
-    ser.flush()
+    
 
     # Infinite loop
-    i = 0
-    while (1):
-        i += 1
-        send_string = ("Data\n")
-        ser.write(send_string.encode('utf-8'))
-        time.sleep(0.01)
-        receive_string = ser.readline().decode('utf-8').rstrip()
-        print(receive_string)
 
-    conn.send(data)
+    ser.write(data)
+    time.sleep(0.01)
+    receive_string = ser.readline().decode('utf-8').rstrip()
+    print(receive_string)
+
+    conn.send(receive_string.encode())
     conn.close()