Merge pull request #199 from AugmentOS-Community/dev

AugmentOS v1.2.0

Author: nic-olo

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/AndroidManifest.xml

@@ -28,6 +28,10 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 
+    <!--    CALENDAR-->
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+
   <queries>
         <intent>
             <action android:name="android.intent.action.TTS_SERVICE" />

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/augmentos/smartglassesmanager/smartglassescommunicators/EvenRealitiesG1SGC.java

@@ -231,63 +231,70 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
                     } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
                         Log.d(TAG, side + " glass disconnected, stopping heartbeats");
 
-                        //set services as not ready
+                        // Mark both sides as not ready (you could also clear both if one disconnects)
                         leftServicesWaiter.setTrue();
                         rightServicesWaiter.setTrue();
 
+                        // Force disconnection from the other side if necessary
                         if ("Left".equals(side)) {
                             isLeftConnected = false;
                             leftReconnectAttempts++;
                             leftGlassGatt = null;
-                        } else {
+                            // If right is still connected, disconnect it too
+                            if (rightGlassGatt != null) {
+                                Log.d(TAG, "Left glass disconnected - forcing disconnection from right glass.");
+                                rightGlassGatt.disconnect();
+                                rightGlassGatt.close();
+                                rightGlassGatt = null;
+                                isRightConnected = false;
+                                rightReconnectAttempts++;
+                            }
+                        } else { // side equals "Right"
                             isRightConnected = false;
                             rightReconnectAttempts++;
                             rightGlassGatt = null;
+                            // If left is still connected, disconnect it too
+                            if (leftGlassGatt != null) {
+                                Log.d(TAG, "Right glass disconnected - forcing disconnection from left glass.");
+                                leftGlassGatt.disconnect();
+                                leftGlassGatt.close();
+                                leftGlassGatt = null;
+                                isLeftConnected = false;
+                                leftReconnectAttempts++;
+                            }
                         }
 
+                        // Stop any periodic transmissions
                         stopHeartbeat();
                         stopMicBeat();
                         sendQueue.clear();
                         updateConnectionState();
 
-                        long delay;
-                        if ("Left".equals(side)) {
-                            delay = Math.min(BASE_RECONNECT_DELAY_MS * (1L << leftReconnectAttempts), MAX_RECONNECT_DELAY_MS);
-                            Log.d(TAG, side + " glass disconnected. Attempting to reconnect " + side + " in " + delay + " ms (Attempt " + leftReconnectAttempts + ")");
-                        } else {
-                            delay = Math.min(BASE_RECONNECT_DELAY_MS * (1L << rightReconnectAttempts), MAX_RECONNECT_DELAY_MS);
-                            Log.d(TAG, side + " glass disconnected. Attempting to reconnect " + side + " in " + delay + " ms (Attempt " + rightReconnectAttempts + ")");
-                        }
-//                    reconnectHandler.postDelayed(() -> {
-//                        if (gatt.getDevice() != null) {
-//                            gatt.close();
-//                            Log.d(TAG, "Reconnecting to gatt. Are we scanning?: " + isScanning);
-//                            reconnectToGatt(gatt.getDevice());
-//                        }
-//                    }, delay);
-
-                        // Do this ~carefully~ to compensate for old BLE stacks
-                        // reconnectHandler.postDelayed(() -> {
-                        //Log.d(TAG, "Manually disconnecting gatt. Are we scanning?: " + isScanning);
-                        // gatt.disconnect();
-                        // }, 0);
+                        // Compute reconnection delay for both sides (here you could choose the maximum of the two delays or a new delay)
+                        long delayLeft = Math.min(BASE_RECONNECT_DELAY_MS * (1L << leftReconnectAttempts), MAX_RECONNECT_DELAY_MS);
+                        long delayRight = Math.min(BASE_RECONNECT_DELAY_MS * (1L << rightReconnectAttempts), MAX_RECONNECT_DELAY_MS);
+                        long delay = Math.max(delayLeft, delayRight); // or choose another strategy
+
+                        Log.d(TAG, side + " glass disconnected. Scheduling reconnection for both glasses in " + delay + " ms (Left attempts: " + leftReconnectAttempts + ", Right attempts: " + rightReconnectAttempts + ")");
 
                         if (gatt.getDevice() != null) {
-                            Log.d(TAG, "Closing gatt. Are we scanning?: " + isScanning);
-                            //gatt.disconnect();
+                            // Close the current gatt connection
                             gatt.close();
                         }
 
+                        // Schedule a reconnection for both devices after the delay
                         reconnectHandler.postDelayed(() -> {
-                            if (gatt.getDevice() != null) {
-                                if (isKilled){
-                                    return;
+                            if (gatt.getDevice() != null && !isKilled) {
+                                Log.d(TAG, "Reconnecting to both glasses.");
+                                // Assuming you have stored references to both devices:
+                                if (leftDevice != null) {
+                                    reconnectToGatt(leftDevice);
+                                }
+                                if (rightDevice != null) {
+                                    reconnectToGatt(rightDevice);
                                 }
-                                Log.d(TAG, "Reconnecting to gatt. Are we scanning?: " + isScanning);
-                                reconnectToGatt(gatt.getDevice());
                             }
-                        }, delay); // 2 seconds after close
-
+                        }, delay);
                     }
                 } else {
                     stopHeartbeat();
@@ -1746,7 +1753,7 @@ public void run() {
     // Constants for text wall display
     private static final int TEXT_COMMAND = 0x4E;  // Text command
     private static final int DISPLAY_WIDTH = 640;  // Display width in pixels
-    private static final int DISPLAY_USE_WIDTH = 340;  // How much of the display to use
+    private static final int DISPLAY_USE_WIDTH = 380;  // How much of the display to use
     private static final int FONT_SIZE = 21;      // Font size
     private static final float FONT_DIVIDER = 2.0f;
     private static final int LINES_PER_SCREEN = 5; // Lines per screen

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/augmentos/smartglassesmanager/speechrecognition/augmentos/AudioInputStream.java

@@ -1,5 +1,7 @@
 package com.augmentos.smartglassesmanager.speechrecognition.augmentos;
 
+import android.util.Log;
+
 import com.microsoft.cognitiveservices.speech.audio.AudioStreamFormat;
 import com.microsoft.cognitiveservices.speech.audio.PullAudioInputStreamCallback;
 

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/augmentos/smartglassesmanager/speechrecognition/augmentos/SpeechRecAugmentos.java

@@ -114,7 +114,7 @@ public void onInterimTranscript(String text, String language, long timestamp) {
 
             @Override
             public void onFinalTranscript(String text, String language, long timestamp) {
-//                Log.d(TAG, "Got final transcription: " + text + " (language: " + language + ")");
+                Log.d(TAG, "Got final transcription: " + text + " (language: " + language + ")");
                 if (text != null && !text.trim().isEmpty()) {
                     EventBus.getDefault().post(new SpeechRecOutputEvent(text, language, timestamp, true));
                 }

augmentos_android_library/AugmentOSLib/src/main/java/com/augmentos/augmentoslib/SmartGlassesAndroidService.java

@@ -92,6 +92,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     // start the service in the foreground
                     Log.d("TEST", "starting foreground");
                     startForeground(NOTIFICATION_ID, updateNotification());
+                    setup();
                     break;
                 case ACTION_STOP_FOREGROUND_SERVICE:
                     stopForeground(true);
@@ -146,4 +147,6 @@ public void onDestroy(){
         super.onDestroy();
         Log.d(TAG, "ran onDestroy");
     }
+
+    public abstract void setup();
 }

augmentos_android_library/AugmentOSLib/src/main/java/com/augmentos/augmentoslib/SpeechRecUtils.java

@@ -153,6 +153,7 @@ public static String languageToLocale(String localeString) {
                 return "eu-ES";
             case "Persian (Iran)":
                 return "fa-IR";
+            case "Finnish":
             case "Finnish (Finland)":
                 return "fi-FI";
             case "Filipino (Philippines)":
@@ -311,5 +312,4 @@ public static String languageToLocale(String localeString) {
                 return "en-US";
         }
     }
-
 }

augmentos_android_library/AugmentOSLib/src/main/java/com/augmentos/augmentoslib/TPABroadcastSender.java

@@ -140,7 +140,6 @@ public void onSendDataFromManagerToCore(ManagerToCoreRequestEvent e){
         sendEventToAugmentOS(e.eventId, e);
     }
 
-
     @Subscribe
     public void onSendHomeScreen(HomeScreenEvent e){
         sendEventToAugmentOS(e.eventId, e);