From 3fb3c337e6c9de19e28d619bf850f7521adfd575 Mon Sep 17 00:00:00 2001
From: cTn <ctndesigner@gmail.com>
Date: Sun, 2 Feb 2014 18:40:16 +0100
Subject: [PATCH] moving Vario below ALT in PID tab

---
 tabs/pid_tuning.html | 13 +++----
 tabs/pid_tuning.js   | 92 +++++++++++++++++++++++++++-----------------
 2 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 238b2114..4bce8f2a 100644
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -30,6 +30,12 @@
             <td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
             <td><input type="number" name="d" step="1"     min="0" max="255" /></td>
         </tr>
+        <tr class="Vario"><!-- 9 -->
+            <td>Vario</td>
+            <td><input type="number" name="p" step="0.1"   min="0" max="25.5" /></td>
+            <td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
+            <td><input type="number" name="d" step="1"     min="0" max="255" /></td>
+        </tr>
         <tr class="Pos"><!-- 4 -->
             <td>Pos</td>
             <td><input type="number" name="p" step="0.01" min="0" max="2.55" /></td>
@@ -57,13 +63,6 @@
             <td>MAG</td>
             <td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
         </tr>
-        <tr class="Vario"><!-- 9 -->
-            <td>Vario</td>
-            <td><input type="number" name="p" step="0.1"   min="0" max="25.5" /></td>
-            <td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
-            <td><input type="number" name="d" step="1"     min="0" max="255" /></td>
-        </tr>
-
     </table>
     <table class="rate-tpa">
         <tr>
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 032b41e6..c5250aaf 100644
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -149,35 +149,58 @@ function tab_initialize_pid_tuning() {
                 
                 $('a.update').click(function() {
                     // Catch all the changes and stuff the inside PIDs array
-                    var needle_main = 0;
-                    var needle_secondary = 0;
+                    var i = 0;
+                    $('table.pid_tuning tr.ROLL input').each(function() {
+                        PIDs[0][i++] = parseFloat($(this).val());
+                    });
                     
-                    $('.pid_tuning input').each(function() {
-                        PIDs[needle_main][needle_secondary] = parseFloat($(this).val());
-                        needle_secondary++;
-                        
-                        // exceptions (required for the "shorter" PID arrays, 2 fields, 1 field, etc)
-                        if (needle_main == 4) {
-                            if (needle_secondary >= 2) {
-                                needle_main++;
-                                needle_secondary = 0;
-                            }
-                        } else if (needle_main == 8) {
-                            if (needle_secondary >= 1) {
-                                needle_main++;
-                                needle_secondary = 0;
-                            }
-                        } else {
-                            if (needle_secondary >= 3) {
-                                needle_main++;
-                                needle_secondary = 0;
-                            }
-                        }
+                    i = 0;
+                    $('table.pid_tuning tr.PITCH input').each(function() {
+                        PIDs[1][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.YAW input').each(function() {
+                        PIDs[2][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.ALT input').each(function() {
+                        PIDs[3][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.Vario input').each(function() {
+                        PIDs[9][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.Pos input').each(function() {
+                        PIDs[4][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.PosR input').each(function() {
+                        PIDs[5][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.NavR input').each(function() {
+                        PIDs[6][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.LEVEL input').each(function() {
+                        PIDs[7][i++] = parseFloat($(this).val());
+                    });
+                    
+                    i = 0;
+                    $('table.pid_tuning tr.MAG input').each(function() {
+                        PIDs[8][i++] = parseFloat($(this).val());
                     });
                     
                     var PID_buffer_out = new Array();
-                    var PID_buffer_needle = 0;
-                    for (var i = 0; i < PIDs.length; i++) {
+                    for (var i = 0, needle = 0; i < PIDs.length; i++, needle += 3) {
                         switch (i) {
                             case 0: 
                             case 1: 
@@ -186,23 +209,22 @@ function tab_initialize_pid_tuning() {
                             case 7: 
                             case 8:
                             case 9:
-                                PID_buffer_out[PID_buffer_needle]     = parseInt(PIDs[i][0] * 10);
-                                PID_buffer_out[PID_buffer_needle + 1] = parseInt(PIDs[i][1] * 1000);
-                                PID_buffer_out[PID_buffer_needle + 2] = parseInt(PIDs[i][2]);
+                                PID_buffer_out[needle]     = parseInt(PIDs[i][0] * 10);
+                                PID_buffer_out[needle + 1] = parseInt(PIDs[i][1] * 1000);
+                                PID_buffer_out[needle + 2] = parseInt(PIDs[i][2]);
                                 break;
                             case 4:
-                                PID_buffer_out[PID_buffer_needle]     = parseInt(PIDs[i][0] * 100);
-                                PID_buffer_out[PID_buffer_needle + 1] = parseInt(PIDs[i][1] * 100);
-                                PID_buffer_out[PID_buffer_needle + 2] = parseInt(PIDs[i][2]);
+                                PID_buffer_out[needle]     = parseInt(PIDs[i][0] * 100);
+                                PID_buffer_out[needle + 1] = parseInt(PIDs[i][1] * 100);
+                                PID_buffer_out[needle + 2] = parseInt(PIDs[i][2]);
                                 break;
                             case 5: 
                             case 6:
-                                PID_buffer_out[PID_buffer_needle]     = parseInt(PIDs[i][0] * 10);
-                                PID_buffer_out[PID_buffer_needle + 1] = parseInt(PIDs[i][1] * 100);
-                                PID_buffer_out[PID_buffer_needle + 2] = parseInt(PIDs[i][2] * 1000);
+                                PID_buffer_out[needle]     = parseInt(PIDs[i][0] * 10);
+                                PID_buffer_out[needle + 1] = parseInt(PIDs[i][1] * 100);
+                                PID_buffer_out[needle + 2] = parseInt(PIDs[i][2] * 1000);
                                 break;                     
                         }
-                        PID_buffer_needle += 3;
                     }
                     
                     // Send over the PID changes