Merge pull request #2408 from chmelevskij/fix/hex_parser

Author: mikeller

src/js/ConfigInserter.js

@@ -86,8 +86,10 @@ function generateData(firmware, input, startAddress) {
     firmware.bytes_total += input.length;
 }
 
+const CONFIG_LABEL = `Custom defaults inserted in`;
+
 ConfigInserter.prototype.insertConfig = function (firmware, input) {
-    const timeParsingStart = microtime(); // track time
+    console.time(CONFIG_LABEL);
 
     const customDefaultsArea = getCustomDefaultsArea(firmware);
 
@@ -99,7 +101,7 @@ ConfigInserter.prototype.insertConfig = function (firmware, input) {
 
     generateData(firmware, input, customDefaultsArea.startAddress);
 
-    console.log(`Custom defaults inserted in: ${microtime() - timeParsingStart.toFixed(4)} seconds.`);
+    console.timeEnd(CONFIG_LABEL);
 
     return true;
 }

src/js/utils/common.js

@@ -1,9 +1,5 @@
 import semver from "semver";
 
-export function microtime() {
-    return new Date().getTime() / 1000;
-}
-
 export function millitime() {
     return new Date().getTime();
 }
@@ -85,3 +81,4 @@ window.degToRad = degToRad;
 window.bytesToSize = bytesToSize;
 window.checkChromeRuntimeError = checkChromeRuntimeError;
 window.generateVirtualApiVersions = generateVirtualApiVersions;
+window.millitime = millitime;

src/js/workers/hex_parser.js

@@ -93,13 +93,14 @@ function read_hex_file(data) {
     }
 }
 
+const TIME_LABEL = 'HEX_PARSER - File parsed in';
+
 onmessage = function(event) {
-    const timeParsingStart = microtime(); // track time
+    console.time(TIME_LABEL);
 
     read_hex_file(event.data);
 
-    console.log(`HEX_PARSER - File parsed in: ${(microtime() - timeParsingStart).toFixed(4)} seconds`);
-
     // terminate worker
+    console.timeEnd(TIME_LABEL);
     close();
 };