Merge pull request #68 from Omega-Numworks/recovery

Added recovery button in installer

Author: M4xi1m3

package.json

@@ -7,22 +7,22 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
-    "firebase": "^7.17.2",
-    "jszip": "^3.5.0",
+    "firebase": "^7.24.0",
+    "jszip": "^3.6.0",
     "monaco-editor": "^0.20.0",
-    "monaco-editor-webpack-plugin": "^1.9.0",
+    "monaco-editor-webpack-plugin": "^1.9.1",
     "node-sass": "^4.14.1",
-    "numworks.js": "^1.1.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "react-intl": "^5.8.2",
+    "numworks.js": "^1.2.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-intl": "^5.17.6",
     "react-intl-cra": "^0.3.4",
     "react-intl-translations-manager": "^5.0.3",
     "react-monaco-editor": "^0.34.0",
     "react-resize-detector": "^4.2.3",
     "react-reveal": "^1.2.2",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^3.4.1"
+    "react-scripts": "^3.4.4"
   },
   "scripts": {
     "start": "react-app-rewired start",
@@ -48,6 +48,6 @@
     ]
   },
   "devDependencies": {
-    "react-app-rewired": "^2.1.6"
+    "react-app-rewired": "^2.1.8"
   }
 }

src/dfu/installer.js

@@ -29,6 +29,7 @@ export default class Installer {
 
         this.calculator = new Numworks();
         this.storage_content = new Numworks.Storage();
+        this.calculator_recovery = new Numworks.Recovery();
         this.downloader = new Downloader();
     }
 
@@ -248,6 +249,23 @@ export default class Installer {
         });
     }
 
+    async __installRecovery(callback) {
+        var _this = this;
+        var file_name = "flasher.verbose.bin";
+        
+        _this.downloader.downloadFirmwareCheck(_this.installInstance.state.model, "flasher", file_name, async (flasher_check, flasher_blob) => {
+            if (!flasher_check) {
+                _this.installInstance.calculatorError(true, "Download of flasher seems corrupted, please retry.");
+            }
+
+            let flasher = await flasher_blob.arrayBuffer();
+            
+            await _this.calculator_recovery.flashRecovery(flasher);
+            
+            await callback();
+        });
+    }
+    
     async __detectCallback() {
         await this.__setCalculatorInfos();
     }
@@ -261,6 +279,18 @@ export default class Installer {
         this.calculator.detect(this.__detectCallback.bind(this), this.__detectErrorCallback.bind(this));
     }
 
+    async __recoveryDetectCallback() {
+        this.installInstance.setModel("N" + this.calculator_recovery.getModel());
+        await this.__installRecovery(async function() {
+        
+        });
+    }
+    
+    recovery() {
+        this.installInstance.calculatorError(false, null);
+        this.calculator_recovery.detect(this.__recoveryDetectCallback.bind(this), this.__detectErrorCallback.bind(this));
+    }
+    
     __onUnexpectedDisconnectCallback(event) {
         if (this.ignore_disconnect === false)
             this.installInstance.calculatorError(true, event);

src/pages/Install.js

@@ -95,6 +95,13 @@ export default class Install extends Component {
         this.enableName = this.enableName.bind(this);
         this.disableName = this.disableName.bind(this);
         this.nameChanged = this.nameChanged.bind(this);
+        
+        // Recovery
+        this.recoveryCalculator = this.recoveryCalculator.bind(this);
+    }
+    
+    recoveryCalculator(e) {
+        this.state.installerInstance.recovery();
     }
 
     nameChanged(e) {
@@ -287,6 +294,9 @@ export default class Install extends Component {
                             <Button onClick={this.detectCalculator} className={"installer__content__buttons__button " +  (!this.state.calculatorDetected ? "installer__content__buttons__button-active" : "")} blue>
                                 <FormattedMessage id="installer.detect" defaultMessage="DETECT CALCULATOR" />
                             </Button>
+                            <Button onClick={this.recoveryCalculator} className={"installer__content__buttons__button " +  (!this.state.calculatorDetected ? "installer__content__buttons__button-active" : "")} blue>
+                                <FormattedMessage id="installer.recovery" defaultMessage="RECOVERY" />
+                            </Button>
                             <Button onClick={this.install} className={"installer__content__buttons__button" + ((this.state.calculatorDetected && !this.state.install && !this.state.installationFinished) ? " installer__content__buttons__button-active" : "")} disabled={this.state.showPopup} blue>
                                 <FormattedMessage id="installer.install" defaultMessage="INSTALL OMEGA" />
                             </Button>

src/pages/sass/installer.sass

@@ -173,6 +173,7 @@
             &__button
                 float: right
                 display: none
+                margin-left: 8px
 
                 &-active
                     display: inherit