Merge branch 'release/2.1.0'

leka · Nov 6, 2017 · f648981 · f648981
2 parents 7a9a8f9 + 98478dd
commit f648981
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/ports.js b/app/ports.js
@@ -23,7 +23,7 @@ function refreshPortList() {
 
 		if (stdout) {
 			ports = stdout.replace(/^\s+|\s+$/g, '').split('\n');
-			output('info', ports);
+			output('info', 'Port(s) available: ' + ports);
 		}
 
 		if (stderr) {
@@ -40,7 +40,7 @@ function getSelectedPort() {
 	if (portListEl.value != undefined || portListEl.value != 'Choose port') {
 		setButtonsState('ready');
 		selectedPort = portListEl.value;
-		output('info', selectedPort + ' selected')
+		output('info', 'Port ' + selectedPort + ' selected')
 		status('You can now press the update button');
 	}
 	else {

diff --git a/app/upload.js b/app/upload.js
@@ -58,6 +58,7 @@ function resetProgress() {
 	document.getElementById('writingProgress').value = 0;
 	document.getElementById('verifyingProgress').value = 0;
 	currentState = state.off;
+	timeoutCount = 0;
 }
 
 function analyze(data) {
@@ -123,7 +124,7 @@ function upload() {
 
 	resetProgress();
 
-	output('info', getAvrdudeCommand() + '\n');
+	output('info', 'Running ' + getAvrdudeCommand() + '\n');
 	cmd = spawn(getAvrdudeCommand(), [], {shell: true});
 
 	cmd.on('error', function( err ){
@@ -156,7 +157,7 @@ function upload() {
 		}
 
 		if (currentState == state.timeout || currentState == state.mismatch) {
-			output('info', 'Timeout or mismatch encountered, restart the upload process');
+			output('info', 'Timeout or mismatch encountered, restarting the upload process');
 			upload();
 		}
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "LekaAlphaUploader",
 	"productName": "LekaAlphaUploader",
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"description": "Simple app to update your Leka Alpha on Windows, macOS & Linux",
 	"license": "MIT",
 	"repository": "https://github.com/weareleka/LekaAlphaUploader",
@@ -24,7 +24,7 @@
 		"test": "xo",
 		"start": "electron app/main.js",
 		"pack": "electron-builder --dir",
-		"dist": "electron-builder --mac --win",
+		"dist": "electron-builder --mac --win --ia32 --x64",
 		"dist-osx": "electron-builder --mac",
 		"dist-win": "electron-builder --win --x64",
 		"build-osx": "electron-packager . --out=dist --overwrite --platform=darwin",