Add 1.4.1 changes

OpenAcousticDevices · May 16, 2022 · 665d866 · 665d866
1 parent 3d4de20
commit 665d866
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/builder.js b/builder.js
@@ -9,35 +9,36 @@
 const builder = require('electron-builder');
 const Platform = builder.Platform;
 
-var config, target;
-var argTarget = process.argv[2];
+var config, target, argTarget;
+
+argTarget = process.argv[2];
 
 switch (argTarget) {
 
 case 'win':
-case 'win64':
-    console.log('Using build configuration to Windows (64-bit).');
+case 'win32':
+    console.log('Using build configuration to Windows (32-bit).');
     target = Platform.WINDOWS.createTarget();
     config = {
         win: {
             target: [
                 {
                     target: 'nsis',
-                    arch: 'x64'
+                    arch: 'ia32'
                 }
             ]
         }
     };
     break;
-case 'win32':
-    console.log('Using build configuration to Windows (32-bit).');
+case 'win64':
+    console.log('Using build configuration to Windows (64-bit).');
     target = Platform.WINDOWS.createTarget();
     config = {
         win: {
             target: [
                 {
                     target: 'nsis',
-                    arch: 'ia32'
+                    arch: 'x64'
                 }
             ]
         }

diff --git a/instructions/instructions.html b/instructions/instructions.html
@@ -29,7 +29,7 @@
                 </div>
 
                 <div class="row" style="margin-top: 5px;">
-                    <div class="col-lg-12">Set the switch on the side of your AudioMoth device to CUSTOM, remove the device's batteries and then connect it to your computer via USB.</br>Both LEDs should start to flash.</div>
+                    <div class="col-lg-12">Set the switch on the side of your AudioMoth device to DEFAULT, remove the device's batteries and SD card, and then connect it to your computer via USB.</br>Both LEDs should start to flash.</div>
                 </div>
             </div>
 
@@ -46,7 +46,7 @@
                 </div>
 
                 <div class="row" style="margin-top: 5px;">
-                    <div class="col-lg-12">Let's try starting your AudioMoth directly into flash mode. Disconnect the USB cable and use a metal paperclip to connect the two contacts marked "PROG".</br>With the contacts connected, reattach the USB cable.</div>
+                    <div class="col-lg-12">Let's try starting your AudioMoth directly into flash mode. Disconnect the USB cable and use a metal paperclip to connect the two contacts marked with the white band.</br>With the contacts connected, reattach the USB cable.</div>
                 </div>
             </div>
 
@@ -63,7 +63,7 @@
                 </div>
 
                 <div class="row" style="margin-top: 5px;">
-                    <div class="col-lg-12">Use a metal paperclip to connect the two contacts marked "PROG". Be sure to hold the paperclip tightly against the contacts.</br>Hold until the LEDs stop flashing.</div>
+                    <div class="col-lg-12">Use a metal paperclip to connect the two contacts marked with the white band.</br>Be sure to hold the paperclip tightly against the contacts.</br>Hold until the LEDs stop flashing.</div>
                 </div>
             </div>
 

diff --git a/main.js b/main.js
@@ -473,7 +473,7 @@ app.on('ready', () => {
         }, {
             type: 'checkbox',
             checked: false,
-            label: 'Enable Bootloader Overwrite Option',
+            label: 'Enable Overwrite Bootloader Option',
             click: () => {
 
                 mainWindow.webContents.send('toggle-bootloader-overwrite');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "AudioMoth-Flash",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "The flashing app used to apply firmware to the AudioMoth acoustic monitoring device.",
   "main": "main.js",
   "author": "openacousticdevices.info",
@@ -12,7 +12,8 @@
   "scripts": {
     "postinstall": "install-app-deps",
     "start": "electron .",
-    "dist": "node builder.js"
+    "dist": "node builder.js",
+    "rebuild": "electron-rebuild -f -w drivelist"
   },
   "build": {
     "asar": {
@@ -62,6 +63,7 @@
   "devDependencies": {
     "electron": "8.5.2",
     "electron-builder": "^22.8.1",
+    "electron-rebuild": "^3.2.7",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.22.1",