Merge remote-tracking branch 'cleanflight/development' into GUI-rework

Conflicts:
	_locales/en/messages.json
	changelog.html
	tabs/configuration.css
	tabs/configuration.html
	tabs/landing.js
	tabs/ports.css
	tabs/ports.html
	tabs/setup.css
	tabs/setup.html

.gitignore

@@ -1,2 +1,3 @@
 .DS_store
+nbproject/
 

changelog.html

@@ -1,9 +1,15 @@
-<span>2015.10.02 - 0.66.0 - cleanflight</span>
+<span>2015.10.31 - 0.67.0 - cleanflight</span>
+<p>
+    - Support flashing of boards that have USB directly connected to MCU. (Device Firmware Update/DFU support).<br />
+</p>
+<span>2015.10.31 - 0.66.0 - cleanflight</span>
 <p>
     - Update servo configuration (requires firmware &gt;= 1.10.0).<br />
     - Add some notes and help messages for common issues.<br />
     - Update sponsors panel and add links to new boards.<br />
     - Upgrade some JS libraries to latest versions (Three, JQuery/UI, D3)<br />
+    - Allow stick input from UI (when using RX_MSP)<br />
+    - Align servo numbering with firmware and documentation<br />
 </p>
 <span>2015.05.23 - 0.65.0 - cleanflight</span>
 <p>

tabs/configuration.css

@@ -112,7 +112,6 @@
     background-color: #ececec;
 }
 
-
 .tab-configuration .number span {
     margin-left: 0px;
 }

tabs/configuration.html

@@ -278,6 +278,7 @@
             <!-- table generated here -->
           </tbody>
         </table>
+
         <div class="number">
           <label>
           <input type="number" name="currentscale" step="1" min="-1000" max="1000" />

tabs/landing.js

@@ -10,10 +10,7 @@ TABS.landing.initialize = function (callback) {
     }
 
     $('#content').load("./tabs/landing.html", function () {
-        //check_usb_permissions(); // temporary enabled in dev branch, should be commented out untill DFU support goes live
+        // translate to user-selected language
-
-
-// translate to user-selected language
         localize();
 
         // load changelog content
@@ -29,10 +26,4 @@ TABS.landing.initialize = function (callback) {
 
 TABS.landing.cleanup = function (callback) {
     if (callback) callback();
-};
+};
-
-
-
-
-
-

tabs/ports.css

@@ -89,6 +89,12 @@ table.ports tr:first-child td:last-child { border-top-right-radius: 0px; }
     background-color: #dedcdc;
 }
 
+
+.tab-ports .note {
+    padding: 5px;
+    border: 1px dashed silver;
+    margin-bottom: 8px;
+}
 .tab-ports .require-support {
     display:none;
 }

tabs/ports.html

@@ -1,4 +1,5 @@
 <div class="tab-ports">
+<<<<<<< HEAD
   <div class="tab_title" i18n="tabPorts">Ports</div>
   <div class="cf_doc_version_bt">
     <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
@@ -9,6 +10,37 @@
         <p i18n="portsHelp"></p>
         <p i18n="portsMSPHelp"></p>
       </div>
+=======
+    <div class="require-support">
+        <div class="help">
+            <p i18n="portsHelp"></p>
+        </div>
+        <table class="ports">
+            <thead>
+                <tr>
+                    <td>Identifier</td>
+                    <td>Data</td>
+                    <td>Logging</td>
+                    <td>Telemetry</td>
+                    <td>RX</td>
+                    <td>GPS</td>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+        
+        <div class="help">
+            <p i18n="portsMSPHelp"></p>
+        </div>
+        
+        <div class="clear-both"></div>
+        <div class="buttons">
+            <a class="save" href="#" i18n="portsButtonSave"></a>
+        </div>
+    </div>
+    <div class="note require-upgrade" i18n="portsFirmwareUpgradeRequired">
+>>>>>>> cleanflight/development
     </div>
     <table class="ports" style="margin-bottom:20px;">
       <thead>

tabs/setup.css

@@ -53,6 +53,27 @@ margin-bottom:10px;
 
 
 #interactive_block a.reset {
+/*
+.tab-setup #interactive_block .attitude {
+    float: right;
+    margin: 10px 10px 0px 0px
+}
+
+.tab-setup #interactive_block .attitude dt {
+    float: left;
+    width: 64px;
+    font-weight: 700;
+    text-align: right
+}
+
+.tab-setup #interactive_block .attitude dd {
+    display: block;
+    margin-left: 64px;
+    width: 64px;
+    text-align: right
+} */
+
+.tab-setup #interactive_block a.reset {
     position: absolute;
     display: block;
 	top: 10px;

tabs/setup.html

@@ -36,6 +36,7 @@
     <div class="spacer_right">
       <div class="model-and-info">
         <div id="interactive_block">
+<<<<<<< HEAD
           <div id="canvas_wrapper" style="">
             <canvas id="canvas"></canvas>
             <div class="attitude_info">
@@ -47,6 +48,29 @@
                 <dt>Roll:</dt>
                 <dd class="roll">&nbsp;</dd>
               </dl>
+=======
+            <div id="canvas_wrapper">
+                <canvas id="canvas"></canvas>
+            </div>
+            <div class="attitude">
+                <dl>
+                    <dt>Heading:</dt><dd class="heading">&nbsp;</dd>
+                    <dt>Pitch:</dt><dd class="pitch">&nbsp;</dd>
+                    <dt>Roll:</dt><dd class="roll">&nbsp;</dd>
+                </dl>
+            </div>
+            <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>
+        </div>
+        <div class="block info">
+            <span class="head" i18n="initialSetupInfoHead"></span>
+            <div class="fields">
+                <dl>
+                    <dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
+                    <dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd>
+                    <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 A</dd>
+                    <dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
+                </dl>
+>>>>>>> cleanflight/development
             </div>
           </div>
           <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>