Pre-1.1: Optimizations/cleanup (FINAL)

eric-lindau · Jul 7, 2017 · 637e3eb · 637e3eb
1 parent da8fd45
commit 637e3eb
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 64 deletions.
diff --git a/SmartInterface/.idea/workspace.xml b/SmartInterface/.idea/workspace.xml
diff --git a/SmartInterface/out/production/SmartInterface/Client.class b/SmartInterface/out/production/SmartInterface/Client.class
diff --git a/SmartInterface/out/production/SmartInterface/SmartInterface$1.class b/SmartInterface/out/production/SmartInterface/SmartInterface$1.class
diff --git a/SmartInterface/out/production/SmartInterface/SmartInterface$2.class b/SmartInterface/out/production/SmartInterface/SmartInterface$2.class
diff --git a/SmartInterface/out/production/SmartInterface/SmartInterface.class b/SmartInterface/out/production/SmartInterface/SmartInterface.class
diff --git a/SmartInterface/src/Client.java b/SmartInterface/src/Client.java
@@ -20,15 +20,18 @@ class Client extends Thread {
     // Output stream
     private PrintWriter output;
 
+    // Buffers for combined analog flight control values
+    private int aileron, elevator, rudder, tiller;
+
     // Constructor
     Client(String address, int port) {
         try {
             this.socket = new Socket(address, port);
             this.input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             this.output = new PrintWriter(socket.getOutputStream(), true);
         } catch (IOException ioe) {
-            String error = "Error connecting to PSX! Please ensure that a PSX" +
-                    " server is running and that port 10747 is unrestricted.";
+            String error = "Error connecting to PSX! Please ensure that a PSX server " +
+                    "is running and that port 10747 is unrestricted.";
             JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
                     error, "PSX SmartInterface Error",
                     JOptionPane.ERROR_MESSAGE);
@@ -39,24 +42,39 @@ class Client extends Thread {
     public void run() {
         try {
             while(true) {
-                System.out.print("x");
-                SmartInterface.aileron = SmartInterface.combineAnalog(SmartInterface.aileronCpt, SmartInterface.aileronFo);
-                SmartInterface.elevator = SmartInterface.combineAnalog(SmartInterface.elevatorCpt, SmartInterface.elevatorFo);
-                SmartInterface.rudder = SmartInterface.combineAnalog(SmartInterface.rudderCpt, SmartInterface.rudderFo);
-                SmartInterface.tiller = SmartInterface.combineAnalog(SmartInterface.tillerCpt, SmartInterface.tillerFo);
+                //* Update combined analog flight controls
+                aileron = SmartInterface.combineAnalog(SmartInterface.aileronCpt,
+                        SmartInterface.aileronFo);
+                elevator = SmartInterface.combineAnalog(SmartInterface.elevatorCpt,
+                        SmartInterface.elevatorFo);
+                rudder = SmartInterface.combineAnalog(SmartInterface.rudderCpt,
+                        SmartInterface.rudderFo);
+                tiller = SmartInterface.combineAnalog(SmartInterface.tillerCpt,
+                        SmartInterface.tillerFo);
+                //*
+
+                // Receive to prevent PSX buffers filling
                 receive();
+
+                //* Update flight controls
                 if (SmartInterface.elevatorCpt != null || SmartInterface.elevatorFo != null ||
                         SmartInterface.aileronCpt != null || SmartInterface.aileronFo != null ||
                         SmartInterface.rudderCpt != null || SmartInterface.rudderFo != null)
-                    send("Qs120=" + Integer.toString(SmartInterface.elevator) + ";" +
-                            Integer.toString(SmartInterface.aileron) + ";" + Integer.toString(SmartInterface.rudder));
-                // Update tiller
+                    send("Qs120=" + Integer.toString(elevator) + ";" + Integer.toString(aileron)
+                            + ";" + Integer.toString(rudder));
+                //*
+
+                //* Update tiller
                 if (SmartInterface.tillerCpt != null || SmartInterface.tillerFo != null)
-                    send("Qh426=" + Integer.toString(SmartInterface.tiller));
+                    send("Qh426=" + Integer.toString(tiller));
+                //*
+
+                // Delay to prevent network flooding
                 sleep(20);
             }
         } catch(Exception e) {
-
+            JOptionPane.showMessageDialog(JOptionPane.getRootFrame(), e.getMessage(),
+                    "Error", JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -65,7 +83,6 @@ void destroyConnection() {
         try {
             this.socket.close();
         } catch (Exception e) {
-            System.out.println("Error detected while closing socket. Exiting!");
             System.exit(1);
         }