From 9a80ec1410f89bae48abea7c776e7217c0f64325 Mon Sep 17 00:00:00 2001 From: TimZnr Date: Tue, 7 Feb 2023 21:25:38 +0100 Subject: [PATCH 1/4] SChneller --- .../java/com/example/lfrmobileapp/ui/home/HomeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java index e81f938..f85d093 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java @@ -98,7 +98,7 @@ public class HomeFragment extends Fragment { @Override public boolean onTouch(View v, MotionEvent event) { boolean send = false; - if (System.currentTimeMillis() - lastOnMoveCall > 250){ + if (System.currentTimeMillis() - lastOnMoveCall > 50){ send = true; lastOnMoveCall = System.currentTimeMillis(); } From 1f172a8b7a88941863e044364688cda7903ec41e Mon Sep 17 00:00:00 2001 From: TimZnr Date: Tue, 7 Feb 2023 21:29:24 +0100 Subject: [PATCH 2/4] start stop token --- .../src/main/java/com/example/lfrmobileapp/Communication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java index 190edd1..3894a0c 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java @@ -29,7 +29,7 @@ public class Communication { } public String telegram(boolean startStop, ArrayList list){ - String tel = ""; + String tel = "aa"; tel += "1"; //Autonomous mode if(startStop){ tel += ";1"; @@ -44,6 +44,7 @@ public class Communication { tel += ";1"; } } + tel += "zz"; return tel; } From bc3484acae05e676837f5444375456c2656f9fbb Mon Sep 17 00:00:00 2001 From: TimZnr Date: Tue, 7 Feb 2023 21:32:19 +0100 Subject: [PATCH 3/4] Implement correct interface for manual mode. --- .../src/main/java/com/example/lfrmobileapp/Communication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java index 3894a0c..eaf1b51 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java @@ -34,7 +34,7 @@ public class Communication { if(startStop){ tel += ";1"; }else{ - tel += ";0"; + return "aa0;0.0;0.0;0.0;0.0zz"; } for (String i : list) { From ce6ca2749071bd0218d6372f67161d8f6818dfc2 Mon Sep 17 00:00:00 2001 From: Vanessa Bock Date: Wed, 8 Feb 2023 12:13:18 +0100 Subject: [PATCH 4/4] Error Handling --- .../lfrmobileapp/ui/home/HomeFragment.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java index f85d093..c3e53c7 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java @@ -75,18 +75,13 @@ public class HomeFragment extends Fragment { @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { - boolean send = false; - if (System.currentTimeMillis() - lastOnMoveCall > 250){ - send = true; - lastOnMoveCall = System.currentTimeMillis(); - } - if (send && mainActivity.connected) { + if (mainActivity.connected) { if (event.getAction() == MotionEvent.ACTION_UP) { binding.rotateLeft.performClick(); mainActivity.sendTelegram(com.telegram(new int[]{0, 0, 0, 0}, 0)); return true; } else { - mainActivity.sendTelegram(com.telegram(new int[]{-1, 1, -1, 1}, 100)); + mainActivity.sendTelegram(com.telegram(new int[]{-1, 1, -1, 1}, 50)); } } return false; @@ -97,18 +92,13 @@ public class HomeFragment extends Fragment { @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { - boolean send = false; - if (System.currentTimeMillis() - lastOnMoveCall > 50){ - send = true; - lastOnMoveCall = System.currentTimeMillis(); - } - if (send && mainActivity.connected){ + if (mainActivity.connected){ if(event.getAction() == MotionEvent.ACTION_UP){ binding.rotateRight.performClick(); mainActivity.sendTelegram(com.telegram(new int[]{0, 0, 0, 0}, 0)); return true; }else{ - mainActivity.sendTelegram(com.telegram(new int[]{1, -1, 1, -1}, 100)); + mainActivity.sendTelegram(com.telegram(new int[]{1, -1, 1, -1}, 50)); } } return false; @@ -157,6 +147,7 @@ public class HomeFragment extends Fragment { else{ joystick.setBackgroundResource(R.mipmap.blank); telegram = com.telegram(new int[]{0, 0, 0, 0}, strength); + send=true; } if (send && mainActivity.connected) {