Support 3A+

procount · Nov 25, 2018 · 78962ad · 78962ad
1 parent ee25f9e
commit 78962ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/recovery/config.h b/recovery/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8.5.7"
+#define VERSION_NUMBER "2.8.5.8"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -523,6 +523,16 @@ void MainWindow::untarFirmware()
     }
 }
 
+bool MainWindow::isLegacyHardware()
+{
+    bool legacy = true;
+
+    if ( _model.contains("Raspberry Pi 3 Model B Plus Rev", Qt::CaseInsensitive) ||
+         _model.contains("Raspberry Pi 3 Model A Plus Rev", Qt::CaseInsensitive) )
+        legacy=false;
+    return legacy;
+}
+
 void MainWindow::checkPinnFirmware()
 {
     TRACE
@@ -565,7 +575,7 @@ void MainWindow::checkPinnFirmware()
     //precondition: already read g_nofirmware setting but not processed
 
     //If we are not on 3B+,
-    if ( !_model.contains("Raspberry Pi 3 Model B Plus Rev", Qt::CaseInsensitive))
+    if ( isLegacyHardware())
     {
         // on legacy h/w
 
@@ -602,7 +612,7 @@ void MainWindow::updateFirmware_button()
     else
         ui->actionFirmware->setIcon(QIcon(":/icons/arrow_down.png"));
 
-    ui->actionFirmware->setEnabled( ! _model.contains("Raspberry Pi 3 Model B Plus Rev", Qt::CaseInsensitive));
+    ui->actionFirmware->setEnabled( isLegacyHardware() );
 }
 
 void MainWindow::on_actionFirmware_triggered()

diff --git a/recovery/mainwindow.h b/recovery/mainwindow.h
@@ -104,6 +104,7 @@ class MainWindow : public QMainWindow
     QProcess * _proc;
 
     void untarFirmware();
+    bool isLegacyHardware();
     void checkPinnFirmware();
     virtual void changeEvent(QEvent * event);
     virtual bool eventFilter(QObject *obj, QEvent *event);