From 06071e5417fb3353702fd4c4c3da5b8fa7caa804 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Tue, 2 Jan 2018 23:06:26 +0200
Subject: Allegedly improved USB adapter on C# on PREPEND_HEADER mode. (tested
 !)

---
 .../transport/adapters/TcpTransportAdapter.java    |  3 ---
 .../transport/adapters/UsbTransportAdapter.java    | 24 ++++++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'Software/Android_Studio')

diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
index bbec3501a..7f63bc76f 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
+++ b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
@@ -165,9 +165,6 @@ public class TcpTransportAdapter extends TransportAdapterBase
     
     private void pullThreadMethod()
     {
-        
-        int counter = 0;
-        
         try
         {
             
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
index 60efe976a..0d8d36060 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
+++ b/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
@@ -86,7 +86,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
                     break;
                 }
             }
-        } catch (Exception ex)
+        }
+        catch (Exception ex)
         {
             notifyConnectionFailed(ex);
         }
@@ -124,7 +125,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
                 serial.read(this::onUsbReceiveData);
                 notifyConnectionSuccess();
             }
-        } catch (Exception ex)
+        }
+        catch (Exception ex)
         {
             notifyConnectionFailed(ex);
         }
@@ -135,7 +137,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
         if (getAdapterMode() == TransportAdapterMode.NO_HEADER)
         {
             onDataAvailable(data);
-        } else
+        }
+        else
         {
             if (current_buffer == null)
             {
@@ -147,12 +150,14 @@ public class UsbTransportAdapter extends TransportAdapterBase
                 {
                     current_buffer = null;
                     onDataAvailable(rest);
-                } else
+                }
+                else
                 {
                     current_buffer_bar = rest.length;
                     ByteBuffer.wrap(current_buffer).put(rest);
                 }
-            } else
+            }
+            else
             {
                 int remaining = current_buffer.length - current_buffer_bar;
                 
@@ -160,7 +165,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
                 {
                     current_buffer_bar += data.length;
                     ByteBuffer.wrap(current_buffer).put(data);
-                } else if (data.length > remaining)
+                }
+                else if (data.length > remaining)
                 {
                     byte[] end = Arrays.copyOfRange(data, 0, remaining);
                     ByteBuffer.wrap(current_buffer).put(end);
@@ -195,7 +201,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
                     setState(TransportComponentState.Disconnected);
                     x.onComplete();
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 x.onError(ex);
             }
@@ -222,7 +229,8 @@ public class UsbTransportAdapter extends TransportAdapterBase
                             hasPermission = true;
                             initConnection(device);
                         }
-                    } else
+                    }
+                    else
                     {
                         notifyConnectionFailed(new IllegalAccessException("Permission denied for device " + device.getDeviceName()));
                     }
-- 
cgit v1.3.1