Bladeren bron

Fixed bluetooth code

Janco Kock 11 jaren geleden
bovenliggende
commit
944f56b2d4
1 gewijzigde bestanden met toevoegingen van 47 en 42 verwijderingen
  1. 47 42
      Bluetooth.java

+ 47 - 42
Bluetooth.java

@@ -37,74 +37,74 @@ public class Bluetooth
             route[i] = tempChar;
             i ++;
           }
+
+        }
+
+                }
         }
-		
-		if (tempChar == '!')
-		{
-			int i = 0;
-			clearRoute();
-
-			while (true)
-			{
-			  if (rxUart.byteAvailable())
-			  {
-				tempChar = (char)rxUart.receiveByte();
-
-				if(tempChar == '!')
-				{
-				  route[i] = tempChar;
-				  return 3;
-				}
-
-				route[i] = tempChar;
-				i ++;
-			  }
-			}
-		}
-
-      else if ((tempChar == 'a') || (tempChar =='v') || (tempChar == 'l') || (tempChar == 'r') || (tempChar == 's'))
+        else if (tempChar == '!')
+        {
+                        int i = 0;
+                        clearRoute();
+
+                        while (true)
+                        {
+                          if (rxUart.byteAvailable())
+                          {
+                                        tempChar = (char)rxUart.receiveByte();
+
+                                        if(tempChar == '!')
+                                        {
+                                          route[i] = tempChar;
+                                          return 3;
+                                        }
+
+                                        route[i] = tempChar;
+                                        i ++;
+                          }
+                        }
+        }else if ((tempChar == 'a') || (tempChar =='v') || (tempChar == 'l') || (tempChar == 'r') || (tempChar == 's'))
       {
         romoteControl = tempChar;
         return 1;
       }
 
-      return 0;
-    }
-
-    return 0;
+       return 0;
   }
 
   public char[] getRoute()
   {
     return route;
   }
-  
+
   public int[] getCoordinates()
   {
-	String[] dataString = new String[40];
+    String[] dataString = new String[40];
     int[] dataInt = new int[7];
     String coordinate = "";
     int StringArrayCount = 0;
     int intArrayCount = 0;
-	
-	for (int i = 0; route.length > i; i ++)
-    { 
+
+    for (int i = 0; route.length > i; i ++)
+    {
+
       if (route[i] != ',' && route[i] != '!')
       {
-        coordinate += String.valueOf(route[i]);
+        coordinate += new String(new char[]{route[i]});
       }
 
       if (route[i] == ',')
       {
+
         dataString[StringArrayCount] = coordinate;
         coordinate = "";
         StringArrayCount ++;
       }
-      
+
       if (route[i] == '!')
       {
           i = route.length;
-		  StringArrayCount = 0;
+                  StringArrayCount = 0;
       }
     }
 
@@ -112,19 +112,21 @@ public class Bluetooth
     {
         if (dataString[i] != null)
         {
+
             dataInt[intArrayCount] = Integer.parseInt(dataString[i]);
             intArrayCount ++;
         }
-        
+
         if (dataString[i] == null)
         {
-			intArrayCount = 0;
-			return dataInt;
+                        intArrayCount = 0;
+                        return dataInt;
         }
     }
+    return dataInt;
   }
 
-  public int getromoteControl()
+  public int getRemoteControl()
   {
     int value = 4;
 
@@ -145,6 +147,9 @@ public class Bluetooth
       case 'l':
         value = 3;
         break;
+      default:
+        value = 4;
+        break;
     }
 
     return value;
@@ -157,4 +162,4 @@ public class Bluetooth
       route[i] = ' ';
     }
   }
-}
+}