Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 00:35:20 +03:00
Code Wiki Activity

resolving conflicts

Browse source
This commit is contained in:
skaman82 2015-11-02 22:49:26 +01:00
parent 8f4cf34a70
commit dda700cca9
2 changed files with 1 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tabs/ports.html
View file

@ -1,5 +1,4 @@
<div class="tab-ports"> <div class="tab-ports">
<<<<<<< HEAD
<div class="tab_title" i18n="tabPorts">Ports</div> <div class="tab_title" i18n="tabPorts">Ports</div>
<div class="cf_doc_version_bt"> <div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a> <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
@ -10,37 +9,6 @@
<p i18n="portsHelp"></p> <p i18n="portsHelp"></p>
<p i18n="portsMSPHelp"></p> <p i18n="portsMSPHelp"></p>
</div> </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> </div>
<table class="ports" style="margin-bottom:20px;"> <table class="ports" style="margin-bottom:20px;">
<thead> <thead>

26
tabs/setup.html
View file

@ -36,8 +36,7 @@
<div class="spacer_right"> <div class="spacer_right">
<div class="model-and-info"> <div class="model-and-info">
<div id="interactive_block"> <div id="interactive_block">
<<<<<<< HEAD <div id="canvas_wrapper">
<div id="canvas_wrapper" style="">
<canvas id="canvas"></canvas> <canvas id="canvas"></canvas>
<div class="attitude_info"> <div class="attitude_info">
<dl> <dl>
@ -48,29 +47,6 @@
<dt>Roll:</dt> <dt>Roll:</dt>
<dd class="roll">&nbsp;</dd> <dd class="roll">&nbsp;</dd>
</dl> </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>
</div> </div>
<a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a> <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>