Merge branch 'error414-update-for-api-1.33.0'

cleanflight · Apr 12, 2017 · e595cf6 · e595cf6
2 parents ff7478d + a13680e
commit e595cf6
Show file tree

Hide file tree

Showing 4 changed files with 317 additions and 86 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -876,9 +876,6 @@
     "receiverRcInterpolationIntervalHelp": {
         "message": "Interpolation interval for manual RC interpolation mode in milliseconds"
     },
-    "receiverRcInterpolation": {
-        "message": "RC Interpolation"
-    },
     "receiverRcInterpolationOff": {
         "message": "Off"
     },
@@ -1219,24 +1216,48 @@
     "transponderNotSupported": {
         "message": "Your flight controller's firmware does not support transponder functionality."
     },
-    "transponderHelp": {
-        "message": "Configure your transponder code here.  Note: Only valid codes will be recognised by race timing systems.  Valid transponder codes can be obtained from <a href=\"http://seriouslypro.com/transponder-codes\" target=\"_blank\">Seriously Pro</a>."
-    },
     "transponderInformation": {
         "message": "Transponders systems allow race organizers to time your laps.  The transponder is fitted to your aircraft and when your aircraft passes the timing gate the track-side receiver registers your code and records your laptime.  When fitting an IR based transponder your should ensure that it points outward from your aircraft towards the track-side receivers and that the light beam is not obstructed by your airframe, battery-straps, cables, propellers, etc."
     },
-    "transponderConfiguration": {
-        "message": "Configuration"
+    "transponderConfigurationType": {
+        "message": "Transponder type"
+    },
+    "transponderType0": {
+        "message": "None"
+    },
+    "transponderType1": {
+        "message": "iLap"
+    },
+    "transponderType2": {
+        "message": "aRCiTimer"
     },
-    "transponderData": {
+    "transponderConfiguration1": {
+        "message": "Configuration iLap"
+    },
+    "transponderConfiguration2": {
+        "message": "Configuration aRCiTimer"
+    },
+    "transponderData1": {
         "message": "Data"
     },
-    "transponderDataHelp": {
+    "transponderData2": {
+        "message": "Transponder ID"
+    },
+    "transponderDataHelp1": {
         "message": "Hexadecimal digits only, 0-9, A-F"
     },
+    "transponderHelp1": {
+        "message": "Configure your transponder code here.  Note: Only valid codes will be recognised by race timing systems.  Valid transponder codes can be obtained from <a href=\"http://seriouslypro.com/transponder-codes\" target=\"_blank\">Seriously Pro</a>."
+    },
+    "transponderHelp2": {
+        "message": "For more information please visit <a href=\"http://www.arcitimer.com/\" title=\"aRCiTimer\" target=\"_blank\">aRCiTimer site</a>"
+    },
     "transponderButtonSave": {
         "message": "Save"
     },
+    "transponderButtonSaveReboot": {
+        "message": "Save and Reboot"
+    },
     "transponderDataInvalid": {
         "message": "Transponder data is <span style=\"color: red\">invalid</span>"
     },

diff --git a/tabs/transponder.css b/tabs/transponder.css
@@ -1,3 +1,7 @@
+#tab-transponder-templates {
+    display: none;
+}
+
 .tab-transponder .spacer_box {
     padding-bottom: 10px;
     float: left;
@@ -73,3 +77,11 @@
 .tab-transponder.transponder-supported .require-transponder-supported {
     display: block;
 }
+
+.textspacer-small {
+    margin-bottom: 15px;
+}
+
+.tab-transponder select {
+    min-width: 100px;
+}
diff --git a/tabs/transponder.html b/tabs/transponder.html
@@ -1,52 +1,80 @@
 <div class="tab-transponder toolbar_fixed_bottom">
     <div class="content_wrapper">
+
         <div class="tab_title" i18n="tabTransponder">Transponder</div>
+
         <div class="cf_doc_version_bt">
             <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
         </div>
-        
+
         <div class="require-transponder-unsupported note">
             <div class="note_spacer">
                 <p i18n="transponderNotSupported"></p>
             </div>
         </div>
 
         <div class="require-transponder-supported">
-
-            <div class="note" style="margin-bottom: 20px;">
-                <div class="note_spacer">
-                    <p i18n="transponderHelp"></p>
-                </div>
-            </div>
-
             <div class="gui_box grey">
                 <div class="gui_box_titlebar">
-                    <div class="spacer_box_title" i18n="transponderConfiguration"></div>
+                    <div class="spacer_box_title" i18n="transponderConfigurationType"></div>
                 </div>
+
                 <div class="spacer_box">
-                    <div class="text transponderData">
-                        <div class="textspacer" >
-                            <input type="text" name="data" spellcheck="false"/>
+                    <div class="radio transponderType">
+                        <div class="textspacer-small">
+                            <select id="transponder_type_select">
+
+                            </select>
                         </div>
-                        <label for="failsafe_feature_new"><span i18n="transponderData"></span>
-                        </label>
-                        <div class="helpicon cf_tip" i18n_title="transponderDataHelp"></div>
                     </div>
+
+                    <div id="transponderHelpBox">
+                        <div class="clear-both"></div>
+                        <div class="note">
+                            <div class="note_spacer">
+                                <p id="transponderHelp"></p>
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
             </div>
-            <div class="clear-both"></div>
+
+            <div id="transponder-configuration" class="gui_box grey">
+
+            </div>
+
         </div>
-
+        <div class="clear-both"></div>
         <div class="note">
             <div class="note_spacer">
                 <p i18n="transponderInformation"></p>
             </div>
         </div>
-        
+
     </div>
+
     <div class="content_toolbar require-transponder-supported">
-        <div class="btn save_btn">
+        <div class="btn save_btn save_no_reboot">
             <a class="save" href="#" i18n="transponderButtonSave"></a>
         </div>
+        <div class="btn save_btn save_reboot" style="display: none">
+            <a class="save reboot" href="#" i18n="transponderButtonSaveReboot"></a>
+        </div>
+    </div>
+</div>
+
+<div id="tab-transponder-templates">
+    <div id="transponder-configuration-template">
+        <div class="gui_box_titlebar">
+            <div class="spacer_box_title"></div>
+        </div>
+        <div class="spacer_box">
+            <div class="text"><span class="dataHelp"></span>
+                <div class="input_block textspacer">
+
+                </div>
+            </div>
+        </div>
     </div>
 </div>