Internal and external fix

tainfante · Jan 22, 2018 · 75a4722 · 75a4722
1 parent 5078b07
commit 75a4722
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 41 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/KCC_App/sample/Controller.class b/out/production/KCC_App/sample/Controller.class
diff --git a/out/production/KCC_App/sample/Port.class b/out/production/KCC_App/sample/Port.class
diff --git a/src/sample/Controller.java b/src/sample/Controller.java
@@ -67,8 +67,10 @@ public void onStartAction(ActionEvent actionEvent) {
             float time = calculateTime(impulses);
             log("Estimated time is: " + time + " " + units + "\n");
         }
-        Port.getInstance().SendStop();
+        else{
+            log("Estimated time is 0 s\n");
 
+        }
     }
 
     private float calculateTime(long impulses) {
@@ -161,6 +163,5 @@ public void onChooseMode(ActionEvent actionEvent) {
             Port.getInstance().SendComment(new Commend((byte)96,(byte)1));
 
         }
-        Port.getInstance().SendStop();
     }
 }
diff --git a/src/sample/Port.java b/src/sample/Port.java
@@ -89,7 +89,9 @@ public long readTime() {
         int numberOfBytes=0;
         byte data;
         while(time==0){
-            Stop=false;
+            if(Stop){
+                return 0;
+            }
             while (!Stop)
             {
                 try {
@@ -168,7 +170,7 @@ public void SendRead(byte b) {
     }
     public void SendStop(){
         try {
-            serialPort.getOutputStream().write(0);
+            serialPort.getOutputStream().write(2);
         } catch (IOException e) {
             e.printStackTrace();
         }