From 5f666078ee5a69b828d276c78bff6ae3a61526cd Mon Sep 17 00:00:00 2001
From: Caleb Fontenot <foley2431@gmail.com>
Date: Wed, 3 Jun 2020 16:28:03 -0500
Subject: [PATCH] pickler rick

---
 Client.py |  6 +++---
 Server.py | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Client.py b/Client.py
index 89e6e51..0761a36 100644
--- a/Client.py
+++ b/Client.py
@@ -12,10 +12,10 @@ MyVirtual = pyxinput.vController()
 # Connect to Server
 client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 client.connect((ip, port))
+from_server = client.makefile(mode='rb')
+#Decode Sever message
+unpickler = pickle.Unpickler(from_server)
 while True:
-    from_server = client.makefile(mode='rb')
-    #Decode Sever message
-    unpickler = pickle.Unpickler(from_server)
     decodedServerData = unpickler.load()
     print("Raw Data:", decodedServerData)
     # pyxinput will only accept values one at a time, so we need to apply the itme in the dictionary one by one
diff --git a/Server.py b/Server.py
index cbd0bec..496796d 100644
--- a/Server.py
+++ b/Server.py
@@ -20,20 +20,19 @@ controllerDataDict = {'AxisLx': 0, 'AxisLy': 0, 'AxisRx': 0, 'AxisRy': 0, 'BtnBa
 lookup_table = {'ABS_X': 'AxisLx', 'ABS_Y': 'AxisLy', 'ABS_RX': 'AxisRx', 'ABS_RY': 'AxisRy', 'BTN_SELECT': 'BtnBack', 'BTN_START': 'BtnStart', 'BTN_SOUTH': 'BtnA', 'BTN_EAST': 'BtnB', 'BTN_NORTH': 'BtnX', 'BTN_WEST': 'BtnY', 'BTN_THUMBL': 'BtnThumbL', 'BTN_THUMBR': 'BtnThumbR', 'BTN_TL': 'BtnShoulderL', 'BTN_TR': 'BtnShoulderR', 'ABS_Z': 'TriggerL', 'ABS_RZ': 'TriggerR'}
 def sendData():
     #Pickle for transmittion
-    #print(encodedControllerData)    
-    pickler.dump(controllerDataDict)    
     file.flush()
+    pickler.dump(controllerDataDict)
 #Create Socket
-conn = socket.create_server((ip, port))
+socket = socket.create_server((ip, port))
 #Create pickler :D
-file = conn.makefile(mode='wb')
+file = socket.makefile(mode='wb')
 pickler = pickle.Pickler(file)
 #Wait for connections before continuing
 print("Waiting for connection...")
-conn.accept()
+socket.accept()
 #print(colored('Connected by', 'red'), addr)
 print(controllerDataDict)
-with conn:
+with socket:
     while True:
             events = get_gamepad()
             for event in events: