From 690b06133fb9c7656d5794c5a4052075b523bec3 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 24 May 2022 21:36:40 -0400
Subject: [PATCH] read config error

---
 .../src/main/java/com/rusefi/app/rusEFI.java  | 14 +++++++++++
 .../app/src/main/res/layout/activity_usb.xml  | 13 ++++++++++
 .../rusefi/io/commands/ErrorInfoCommand.java  | 24 +++++++++++++++++++
 .../com/rusefi/io/commands/HelloCommand.java  |  7 +++++-
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 java_console/io/src/main/java/com/rusefi/io/commands/ErrorInfoCommand.java

diff --git a/android/app/src/main/java/com/rusefi/app/rusEFI.java b/android/app/src/main/java/com/rusefi/app/rusEFI.java
index e5c5073eb8..86e8c98c01 100644
--- a/android/app/src/main/java/com/rusefi/app/rusEFI.java
+++ b/android/app/src/main/java/com/rusefi/app/rusEFI.java
@@ -35,6 +35,7 @@ import android.text.util.Linkify;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -55,6 +56,7 @@ import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.DfuHelper;
 import com.rusefi.io.IoStream;
 import com.rusefi.io.LinkManager;
+import com.rusefi.io.commands.ErrorInfoCommand;
 import com.rusefi.io.serial.StreamConnector;
 import com.rusefi.proxy.NetworkConnector;
 import com.rusefi.proxy.NetworkConnectorContext;
@@ -74,6 +76,8 @@ public class rusEFI extends Activity {
 
     private static final String VERSION = "rusEFI app v0.20220524\n";
 
+    private static final int LOCAL_PORT = 29001;
+
     /* UI elements */
     private TextView mStatusView;
     private TextView mResultView; // global dump of all messages
@@ -102,6 +106,9 @@ public class rusEFI extends Activity {
         findViewById(R.id.buttonSound).setVisibility(View.GONE);
         findViewById(R.id.buttonDfu).setVisibility(View.GONE);
 
+        Button view = findViewById(R.id.localBroadcast);
+        view.setText("Local broadcast on " + LOCAL_PORT);
+
         broadcastStatus = findViewById(R.id.broadcastStatus);
         broadcastStatus.setVisibility(View.GONE);
 
@@ -264,6 +271,9 @@ public class rusEFI extends Activity {
         connectDashboard();
     }
 
+    public void onLocalBroadcast(View view) {
+    }
+
     /**
      * Called when the user touches a button
      */
@@ -344,6 +354,10 @@ public class rusEFI extends Activity {
         try {
             String signature = BinaryProtocol.getSignature(serial);
             visibleLogAppend("Connected to " + signature);
+            ErrorInfoCommand.send(serial);
+            String configError = ErrorInfoCommand.getResponse(serial.getDataBuffer());
+            if (configError != null)
+                visibleLogAppend("[CRITICAL] " + configError);
 
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/android/app/src/main/res/layout/activity_usb.xml b/android/app/src/main/res/layout/activity_usb.xml
index 0a117a9453..862ad53317 100644
--- a/android/app/src/main/res/layout/activity_usb.xml
+++ b/android/app/src/main/res/layout/activity_usb.xml
@@ -60,6 +60,13 @@
             android:onClick="onConnectButton"
             android:text="Connect" />
 
+        <Button
+            android:id="@+id/localBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="onLocalBroadcast"
+            android:text="local" />
+
         <Button
             android:id="@+id/buttonBroadcast"
             android:layout_width="match_parent"
@@ -83,5 +90,11 @@
                 android:layout_height="wrap_content" />
         </ScrollView>
 
+        <Button
+            android:id="@+id/button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Button" />
+
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/ErrorInfoCommand.java b/java_console/io/src/main/java/com/rusefi/io/commands/ErrorInfoCommand.java
new file mode 100644
index 0000000000..3a6e1156fa
--- /dev/null
+++ b/java_console/io/src/main/java/com/rusefi/io/commands/ErrorInfoCommand.java
@@ -0,0 +1,24 @@
+package com.rusefi.io.commands;
+
+import com.rusefi.binaryprotocol.IncomingDataBuffer;
+import com.rusefi.config.generated.Fields;
+import com.rusefi.io.IoStream;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import static com.rusefi.io.commands.HelloCommand.getStringResponse;
+
+public class ErrorInfoCommand {
+    public static void send(IoStream stream) throws IOException {
+        stream.sendPacket(new byte[]{Fields.TS_GET_CONFIG_ERROR});
+    }
+
+    @Nullable
+    public static String getResponse(IncomingDataBuffer incomingData) throws EOFException {
+        return getStringResponse("[config_error]", incomingData);
+    }
+
+}
diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java b/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java
index 12ce19516b..339ca534da 100644
--- a/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java
+++ b/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java
@@ -24,7 +24,12 @@ public class HelloCommand implements Command {
 
     @Nullable
     public static String getHelloResponse(IncomingDataBuffer incomingData) throws EOFException {
-        byte[] response = incomingData.getPacket("[hello]");
+        return getStringResponse("[hello]", incomingData);
+    }
+
+    @Nullable
+    public static String getStringResponse(String msg, IncomingDataBuffer incomingData) throws EOFException {
+        byte[] response = incomingData.getPacket(msg);
         if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK))
             return null;
         return new String(response, 1, response.length - 1);