From da4899bed51b72ea11bc232d1dd7977709056931 Mon Sep 17 00:00:00 2001
From: skaman82 <albert@wd-design.de>
Date: Tue, 10 Nov 2015 09:47:42 +0100
Subject: [PATCH] Merge remote-tracking branch 'cleanflight/development' into
 GUI-rework

Conflicts:
	tabs/motors.css
---
 tabs/firmware_flasher.js |  6 ++----
 tabs/motors.css          | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
index 6b9d75d5..156b6784 100755
--- a/tabs/firmware_flasher.js
+++ b/tabs/firmware_flasher.js
@@ -43,7 +43,7 @@ TABS.firmware_flasher.initialize = function (callback) {
             var releaseDescriptors = [];
             TABS.firmware_flasher.releases.forEach(function(release){
                 release.assets.forEach(function(asset){
-                    var targetFromFilenameExpression = /.*_(.*)\.(.*)/;
+                    var targetFromFilenameExpression = /w*_(.*)\.(.*)/;
                     var match = targetFromFilenameExpression.exec(asset.name);
 
                     if (!showDevReleases && release.prerelease) {
@@ -54,7 +54,7 @@ TABS.firmware_flasher.initialize = function (callback) {
                         return;
                     }
 
-                    var target = match[1];
+                    var target = match[1].replace("_", " ");
                     var format = match[2];
 
                     if (format != 'hex') {
@@ -530,5 +530,3 @@ TABS.firmware_flasher.cleanup = function (callback) {
     if (callback) callback();
 };
 
-
-
diff --git a/tabs/motors.css b/tabs/motors.css
index fdef599e..3c29813c 100644
--- a/tabs/motors.css
+++ b/tabs/motors.css
@@ -197,14 +197,14 @@
 
 .tab-motors .titles li {
     float: left;
-    width: calc(( 100% / 9) - 10px);
+    width: calc((100% / 9) - 10px);
     margin-right: 10px;
     text-align: center;
 }
 
 .tab-motors .servos .titles li {
     float: right;
-    width: calc(( 100% / 8) - 10px);
+    width: calc((100% / 8) - 10px);
     margin: 0 0 0 10px;
 }
 
@@ -214,7 +214,7 @@
 
 .tab-motors .m-block {
     float: left;
-    width: calc(( 100% / 9) - 10px);
+    width: calc((100% / 9) - 10px);
     height: 100px;
     margin-right: 10px;
     text-align: center;
@@ -248,7 +248,7 @@
 
 .tab-motors .servos .m-block {
     float: right;
-    width: calc(( 100% / 8) - 10px);
+    width: calc((100% / 8) - 10px);
     margin: 0 0 0 10px;
     border-radius: 3px;
 }
@@ -271,7 +271,7 @@
 
 .tab-motors .motor_testing .sliders input {
     -webkit-appearance: slider-vertical;
-    width: calc(( 100% / 9) - 13px);
+    width: calc((100% / 9) - 13px);
     height: 73px;
     margin-left: 10px;
 }
@@ -290,7 +290,7 @@
 
 .tab-motors .motor_testing .values li {
     float: left;
-    width: calc(( 100% / 9)- 10px);
+    width: calc((100% / 9) - 10px);
     margin-left: 10px;
     text-align: center;
 }