Merge pull request #2 from JiaqiZhao2004/royzhao2

step 3 car control

.idea/.gitignore

+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

electron/index.js

@@ -34,29 +34,36 @@ function client(){
 
 // for detecting which key is been pressed w,a,s,d
 function updateKey(e) {
-
     e = e || window.event;
 
-    if (e.keyCode == '87') {
-        // up (w)
-        document.getElementById("upArrow").style.color = "green";
-        send_data("87");
-    }
-    else if (e.keyCode == '83') {
-        // down (s)
-        document.getElementById("downArrow").style.color = "green";
-        send_data("83");
-    }
-    else if (e.keyCode == '65') {
-        // left (a)
-        document.getElementById("leftArrow").style.color = "green";
-        send_data("65");
-    }
-    else if (e.keyCode == '68') {
-        // right (d)
-        document.getElementById("rightArrow").style.color = "green";
-        send_data("68");
-    }
+    const net = require('net');
+    const client = net.createConnection({ port: server_port, host: server_addr }, () => {
+        if (e.keyCode == '87') {
+            // up (w)
+            document.getElementById("upArrow").style.color = "green";
+            client.write(`87\r\n`);
+        }
+        else if (e.keyCode == '83') {
+            // down (s)
+            document.getElementById("downArrow").style.color = "green";
+            client.write(`83\r\n`);
+        }
+        else if (e.keyCode == '65') {
+            // left (a)
+            document.getElementById("leftArrow").style.color = "green";
+            client.write(`65\r\n`);
+        }
+        else if (e.keyCode == '68') {
+            // right (d)
+            document.getElementById("rightArrow").style.color = "green";
+            client.write(`68\r\n`);
+        }
+        client.end();
+    });
+
+    client.on('error', (err) => {
+        console.log('Error:', err);
+    });
 }
 
 // reset the key to the start state 

electron/server.py

 import socket
+from time import sleep
+
+from picarx import Picarx
+
 
 # HOST = "172.16.213.108" # Khushi's Raspberry PI
 HOST = "100.85.99.31" # Roy's Raspberry PI
-
 PORT = 65432          # Port to listen on (non-privileged ports are > 1023)
 
-def callback(data):
-    if data == '87':
+
+def callback(px, data):
+    data = data.strip()
+    if data == b'87':
+        print("forward (w)")
         # forward (w)
-        pass
-    elif data == '83':
+        px.set_dir_servo_angle(0)
+        px.forward(10)
+        sleep(0.3)
+        px.stop()
+    elif data == b'83':
         # down (s)
-        pass
-    elif data == '65':
+        print("backward (s)")
+        px.set_dir_servo_angle(0)
+        px.backward(10)
+        sleep(0.3)
+        px.stop()
+    elif data == b'65':
         # left (a)
-        pass
-    elif data == '68':
+        print('left (a)')
+        px.set_dir_servo_angle(-35)
+        px.forward(10)
+        sleep(0.3)
+        px.stop()
+    elif data == b'68':
         # right (d)
-        pass
-    
+        print('right (d)')
+        px.set_dir_servo_angle(35)
+        px.forward(10)
+        sleep(0.3)
+        px.stop()
+
 
 with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
     s.bind((HOST, PORT))
     s.listen()
-
+    px = Picarx()
     try:
         while 1:
             client, clientInfo = s.accept()
             print("server recv from: ", clientInfo)
             data = client.recv(1024)      # receive 1024 Bytes of message in binary format
-            callback(data)
-
-            if data != b"":
-                print(data)     
-                client.sendall(data) # Echo back to client
-    except: 
+            callback(px, data)
+  
+    except:
         print("Closing socket")
         client.close()
-        s.close()    
-
+        s.close()
+        px.stop()