Try to resend command if timeout (#296)

chameleonultragui/.gitignore

@@ -52,4 +52,7 @@ app.*.map.json
 android/fastlane/report.xml
 **/upload-keystore.jks
 **/AuthKey*.p8
-**/cert_key
+**/cert_key
+
+# Translation
+untranslated_messages.json

chameleonultragui/lib/bridge/chameleon.dart

@@ -273,6 +273,7 @@ class ChameleonCommunicator {
   int dataStatus = 0;
   int dataLength = 0;
   List<ChameleonMessage> messageQueue = [];
+  List<int> commandQueue = [];
 
   final Logger log;
 
@@ -368,7 +369,8 @@ class ChameleonCommunicator {
   Future<ChameleonMessage?> sendCmd(ChameleonCommand cmd,
       {Uint8List? data,
       Duration timeout = const Duration(seconds: 5),
-      bool skipReceive = false}) async {
+      bool skipReceive = false,
+      bool firstRun = false}) async {
     var startTime = DateTime.now();
     var dataFrame = makeDataFrameBytes(cmd, 0x00, data);
 
@@ -378,6 +380,17 @@ class ChameleonCommunicator {
       _serialInstance!.isOpen = true;
     }
 
+    while (commandQueue.contains(cmd.value)) {
+      if (startTime.millisecondsSinceEpoch + (timeout.inMilliseconds * 2) <
+          DateTime.now().millisecondsSinceEpoch) {
+        throw ("Timeout waiting for queue for command ${cmd.value}");
+      }
+
+      await asyncSleep(1);
+    }
+
+    commandQueue.add(cmd.value);
+
     log.d("Sending: ${bytesToHex(dataFrame)}");
 
     if (skipReceive) {
@@ -393,13 +406,20 @@ class ChameleonCommunicator {
       for (var message in messageQueue) {
         if (message.command == cmd.value) {
           messageQueue.remove(message);
+          commandQueue.remove(cmd.value);
           return message;
         }
       }
 
       if (startTime.millisecondsSinceEpoch + timeout.inMilliseconds <
           DateTime.now().millisecondsSinceEpoch) {
-        throw ("Timeout waiting for response for command ${cmd.value}");
+        commandQueue.remove(cmd.value);
+        if (firstRun) {
+          sendCmd(cmd, data: data, timeout: timeout, firstRun: false);
+        } else {
+          // no luck
+          throw ("Timeout waiting for response for command ${cmd.value}");
+        }
       }
 
       await asyncSleep(1);

chameleonultragui/lib/helpers/github.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:typed_data';
 import 'package:chameleonultragui/connector/serial_abstract.dart';
 import 'package:http/http.dart' as http;
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 List<Map<String, String>> developers = [
   {

chameleonultragui/lib/main.dart

@@ -215,7 +215,7 @@ class _MainPageState extends State<MainPage> {
                             widget.sharedPreferencesProvider.getThemeColor(),
                         brightness: Brightness.light)
                     .surface,
-                statusBarBrightness: Brightness.dark,
+                statusBarBrightness: Brightness.light,
                 statusBarIconBrightness: Brightness.dark)),
       ),
       darkTheme: ThemeData.dark().copyWith(
@@ -231,7 +231,7 @@ class _MainPageState extends State<MainPage> {
                             widget.sharedPreferencesProvider.getThemeColor(),
                         brightness: Brightness.dark)
                     .surface,
-                statusBarBrightness: Brightness.light,
+                statusBarBrightness: Brightness.dark,
                 statusBarIconBrightness: Brightness.light)),
       ),
       themeMode: widget.sharedPreferencesProvider.getTheme(), // Dark Theme