fix: initialization of scienceLabCommon and In-Built MIC (#2629)

fossasia · Feb 11, 2025 · 5d8d1e4 · 5d8d1e4
1 parent a939c40
commit 5d8d1e4
Show file tree

Hide file tree

Showing 5 changed files with 283 additions and 276 deletions.
diff --git a/lib/others/audio_jack.dart b/lib/others/audio_jack.dart
@@ -3,17 +3,21 @@ import 'package:pslab/others/logger_service.dart';
 
 class AudioJack {
   static const int samplingRate = 44100;
+  bool _isListening = false;
   final FlutterAudioCapture flutterAudioCapture = FlutterAudioCapture();
 
   List<double> _audioBuffer = [];
 
   AudioJack();
 
-  Future<bool> configure() async {
+  Future<void> initialize() async {
     await flutterAudioCapture.init();
+  }
+
+  Future<void> start() async {
     await flutterAudioCapture.start(_listener, _onError,
         sampleRate: samplingRate);
-    return true;
+    _isListening = true;
   }
 
   List<double> read() {
@@ -28,7 +32,12 @@ class AudioJack {
     logger.e(e);
   }
 
-  void close() async {
+  Future<void> close() async {
     await flutterAudioCapture.stop();
+    _isListening = false;
+  }
+
+  bool isListening() {
+    return _isListening;
   }
 }
diff --git a/lib/others/science_lab_common.dart b/lib/others/science_lab_common.dart
@@ -28,8 +28,8 @@ class ScienceLabCommon {
     return communicationHandler.initialize();
   }
 
-  void setConnected() {
-    communicationHandler.connected = true;
+  void setConnected(bool connected) {
+    communicationHandler.connected = connected;
   }
 
   bool isConnected() {

diff --git a/lib/providers/board_state_provider.dart b/lib/providers/board_state_provider.dart
@@ -21,19 +21,21 @@ class BoardStateProvider extends ChangeNotifier {
     await scienceLabCommon.initialize();
     pslabIsConnected = await scienceLabCommon.openDevice();
     setPSLabVersionIDs();
-    UsbSerial.usbEventStream?.listen((UsbEvent usbEvent) async {
-      if (usbEvent.event == UsbEvent.ACTION_USB_ATTACHED) {
-        if (await attemptToConnectPSLab()) {
-          pslabIsConnected = await scienceLabCommon.openDevice();
-          setPSLabVersionIDs();
+    UsbSerial.usbEventStream?.listen(
+      (UsbEvent usbEvent) async {
+        if (usbEvent.event == UsbEvent.ACTION_USB_ATTACHED) {
+          if (await attemptToConnectPSLab()) {
+            pslabIsConnected = await scienceLabCommon.openDevice();
+            setPSLabVersionIDs();
+          }
+        } else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
+          scienceLabCommon.setConnected(false);
+          pslabIsConnected = false;
+          pslabVersionID = 'Not Connected';
+          notifyListeners();
         }
-      } else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
-        scienceLabCommon.setConnected();
-        pslabIsConnected = false;
-        pslabVersionID = 'Not Connected';
-        notifyListeners();
-      }
-    });
+      },
+    );
   }
 
   Future<void> setPSLabVersionIDs() async {

diff --git a/lib/providers/oscilloscope_state_provider.dart b/lib/providers/oscilloscope_state_provider.dart
@@ -24,9 +24,8 @@ enum ChannelMeasurements {
   negativePeak
 }
 
-AudioJack? _audioJack;
-
 class OscilloscopeStateProvider extends ChangeNotifier {
+  late AudioJack _audioJack;
   late int _selectedIndex;
 
   int get selectedIndex => _selectedIndex;
@@ -88,6 +87,7 @@ class OscilloscopeStateProvider extends ChangeNotifier {
   late Timer _timer;
 
   OscilloscopeStateProvider() {
+    _audioJack = AudioJack();
     _selectedIndex = 0;
 
     isCH1Selected = false;
@@ -160,9 +160,9 @@ class OscilloscopeStateProvider extends ChangeNotifier {
         _isProcessing = true;
 
         if (_isRunning) {
-          if (isInBuiltMICSelected && _audioJack == null) {
-            _audioJack = AudioJack();
-            await _audioJack?.configure();
+          if (isInBuiltMICSelected && !_audioJack.isListening()) {
+            await _audioJack.initialize();
+            await _audioJack.start();
           }
 
           List<String> channels = [];
@@ -191,6 +191,9 @@ class OscilloscopeStateProvider extends ChangeNotifier {
               dataEntries = [];
             }
           }
+          if (!isInBuiltMICSelected && _audioJack.isListening()) {
+            await _audioJack.close();
+          }
         }
         _isProcessing = false;
       },
@@ -348,8 +351,7 @@ class OscilloscopeStateProvider extends ChangeNotifier {
         noOfChannels++;
         isTriggered = false;
         entries.add([]);
-        _audioJack ??= AudioJack();
-        List<double> buffer = _audioJack!.read();
+        List<double> buffer = _audioJack.read();
         xDataString = List.filled(buffer.length, '');
         yDataString.add(List.filled(buffer.length, ''));
 
@@ -513,17 +515,20 @@ class OscilloscopeStateProvider extends ChangeNotifier {
       Colors.white,
       Colors.deepPurple
     ];
-    return List<LineChartBarData>.generate(dataEntries.length, (index) {
-      return LineChartBarData(
-        spots: dataEntries[index],
-        isCurved: true,
-        color: colors[index % colors.length],
-        barWidth: 1,
-        dotData: const FlDotData(
-          show: false,
-        ),
-      );
-    });
+    return List<LineChartBarData>.generate(
+      dataEntries.length,
+      (index) {
+        return LineChartBarData(
+          spots: dataEntries[index],
+          isCurved: true,
+          color: colors[index % colors.length],
+          barWidth: 1,
+          dotData: const FlDotData(
+            show: false,
+          ),
+        );
+      },
+    );
   }
 
   @override
@@ -532,6 +537,7 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     if (_timer.isActive) {
       _timer.cancel();
     }
+    _audioJack.close();
     super.dispose();
   }
 }