Merge branch 'main' of github.com:TeamOpenSmartGlasses/SmartGlassesDr…

…iveAssistant
TeamOpenSmartGlasses · May 9, 2023 · 4782416 · 4782416
2 parents 0640daf + 0eee1af
commit 4782416
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/com/teamopensmartglasses/driveassistant/DriveService.java b/app/src/main/java/com/teamopensmartglasses/driveassistant/DriveService.java
@@ -84,6 +84,7 @@ public void driveCommandCallback(String args, long commandTriggeredTime){
 
         // Make sure we aren't already connected...
         stopObdTasks();
+        obdManager = new ObdManager();
 
         sgmLib.sendReferenceCard(appName, "Searching for OBDII connection...");
         obdManager.Connect();
@@ -97,7 +98,7 @@ public void listenToDriveStuff(){
                     @Override
                     public void onTachChanged(ObdManager manager) {
                         //tachString = String.format("%.1f", (manager.getTach() / 1000f));
-                        //Log.d(TAG,"HOLYFUCK NEW TACH: " + manager.getTach());
+                        //Log.d(TAG,"NEW TACH: " + manager.getTach());
                         tachString = String.valueOf(manager.getTach());
 
                         if(!displayRefreshStarted)
@@ -127,9 +128,9 @@ public void startDriveDisplayRefresh(){
         handler.postDelayed(new Runnable() {
             public void run() {
                 String toSend = padding;
-                toSend += speedString + "mph | " + tachString + "rpm";
+                toSend += tachString + "rpm | " + speedString + "mph";
 
-                sgmLib.sendReferenceCard(appName, toSend);
+                sgmLib.sendReferenceCard("", toSend);
 
                 handler.postDelayed(this, delay);
             }
@@ -157,19 +158,19 @@ public void onObdDisonnectedEvent(ObdDisconnectedEvent receivedEvent){
     public String maybeGeneratePadding(){
         String pad = "";
         if(displayBottom) {
-            for (int i = 0; i < 8; i++) {
+            for (int i = 0; i < 7; i++) {
                 //25 spaces = 1 line on ActiveLook Engo 2
                 pad += "                         ";
             }
         }
         if(displayRight){
-            pad += "  ";
+            pad += ""; //TODO: investigate weirdness here
         }
         return pad;
     }
 
     public void displayAppStopped(String reason){
-        sgmLib.sendReferenceCard(appName, appName + " stopped:\n" + reason);
+        sgmLib.sendReferenceCard(appName, appName + " stopped:    " + reason);
     }
 
     public void stopObdTasks(){

diff --git a/app/src/main/java/com/teamopensmartglasses/driveassistant/FocusHandler.java b/app/src/main/java/com/teamopensmartglasses/driveassistant/FocusHandler.java
@@ -1,5 +1,7 @@
 package com.teamopensmartglasses.driveassistant;
 
+import android.util.Log;
+
 import com.teamopensmartglasses.driveassistant.events.FocusChangedEvent;
 import com.teamopensmartglasses.driveassistant.events.ObdDisconnectedEvent;
 import com.teamopensmartglasses.sgmlib.FocusCallback;
@@ -8,10 +10,9 @@
 import org.greenrobot.eventbus.EventBus;
 
 public class FocusHandler implements FocusCallback {
-
+    final String TAG = "SmartGlassesDriveAssistant_FocusHandler";
     @Override
     public void runFocusChange(FocusStates focusState) {
-        if(focusState == FocusStates.OUT_FOCUS)
-            EventBus.getDefault().post(new ObdDisconnectedEvent("Lost focus"));
+        if(focusState == FocusStates.OUT_FOCUS){}
     }
 }
diff --git a/app/src/main/java/com/teamopensmartglasses/driveassistant/ObdManager.java b/app/src/main/java/com/teamopensmartglasses/driveassistant/ObdManager.java
@@ -397,6 +397,7 @@ else if (words[1].equals("10")) {
                 //    throw new RuntimeException(e);
                 //}
             }
+            EventBus.getDefault().post(new ObdDisconnectedEvent("Dead connection"));
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -397,6 +397,7 @@ else if (words[1].equals("10")) { @@
                     //    throw new RuntimeException(e);
                     //}
                 }
+                EventBus.getDefault().post(new ObdDisconnectedEvent("Dead connection"));
             }
@@ Expand Down @@