From 1a269e261b18ee9239d8481275f67e914ac8ca99 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 21 Dec 2021 22:46:02 -0500
Subject: [PATCH] Something is still odd with some F7 boards - bricking on
 incremental flash #3566

---
 .../java/com/rusefi/autoupdate/Autoupdate.java |  8 ++++++++
 .../main/java/com/rusefi/rusEFIVersion.java    |  2 +-
 .../src/main/java/com/rusefi/StartupFrame.java | 18 ++++++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
index 34ba482897..d19efd5e45 100644
--- a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
+++ b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
@@ -4,6 +4,7 @@ import com.rusefi.shared.ConnectionAndMeta;
 import com.rusefi.shared.FileUtil;
 import com.rusefi.ui.storage.PersistentConfiguration;
 import com.rusefi.ui.util.FrameHelper;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -204,6 +205,13 @@ public class Autoupdate {
         }
     }
 
+    @NotNull
+    public static String readBundleFullNameNotNull() {
+        String bundle = readBundleFullName();
+        bundle = bundle == null ? "unknown bundle" : bundle;
+        return bundle;
+    }
+
     enum UpdateMode {
         ALWAYS,
         NEVER,
diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
index 0dd0ccb691..adab2b7564 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
@@ -6,7 +6,7 @@ import java.net.URL;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class rusEFIVersion {
-    public static final int CONSOLE_VERSION = 20211216;
+    public static final int CONSOLE_VERSION = 20211221;
     public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
 
     public static long classBuildTimeMillis() {
diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
index 7ca689f5be..2f5cc445f4 100644
--- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
@@ -89,8 +89,8 @@ public class StartupFrame {
 
     @NotNull
     public static String appendBundleName(String title) {
-        String bundleName = Autoupdate.readBundleFullName();
-        return title + " " + (bundleName != null ? bundleName : "Unknown bundle");
+        String bundleName = Autoupdate.readBundleFullNameNotNull();
+        return title + " " + bundleName;
     }
 
     public void chooseSerialPort() {
@@ -183,6 +183,17 @@ public class StartupFrame {
 
         JPanel rightPanel = new JPanel(new VerticalFlowLayout());
 
+        if (Autoupdate.readBundleFullNameNotNull().contains("proteus_f7")) {
+            URLLabel urlLabel = new URLLabel("WARNING: Proteus F7", "https://github.com/rusefi/rusefi/wiki/F7-requires-full-erase");
+            new Timer(500, new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    urlLabel.setVisible(!urlLabel.isVisible());
+                }
+            }).start();
+            rightPanel.add(urlLabel);
+        }
+
         JLabel logo = createLogoLabel();
         if (logo != null)
             rightPanel.add(logo);
@@ -241,8 +252,7 @@ public class StartupFrame {
 
     @Nullable
     private static ImageIcon getBundleIcon() {
-        String bundle = Autoupdate.readBundleFullName();
-        bundle = bundle == null ? "" : bundle;
+        String bundle = Autoupdate.readBundleFullNameNotNull();
         String logoName;
         if (bundle.contains("proteus")) {
             logoName = LOGO_PATH + "logo_proteus.png";