Skip to content

Commit 6f0bdba

Browse files
committed
Move telemetry to receiver tab
1 parent d92a49a commit 6f0bdba

File tree

5 files changed

+31
-26
lines changed

5 files changed

+31
-26
lines changed

locales/en/messages.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,12 @@
12121212
"configurationReceiverMode": {
12131213
"message": "Receiver Mode"
12141214
},
1215+
"configurationTelemetry": {
1216+
"message": "Telemetry"
1217+
},
1218+
"configurationTelemetryHelp": {
1219+
"message": "Telemetry output from receiver"
1220+
},
12151221
"configurationRSSI": {
12161222
"message": "RSSI (Signal Strength)"
12171223
},

src/css/tabs/receiver.css

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -667,27 +667,23 @@
667667
margin-bottom: 0;
668668
}
669669

670-
.tab-receiver .rssi thead {
671-
display: none;
672-
}
673-
674670
.tab-receiver .gui_box {
675671
margin-bottom: 10px;
676672
float: left;
677673
font-weight: bold;
678674
}
679675

680-
.tab-receiver .rssi td {
676+
.tab-receiver .feature td {
681677
border-bottom: none;
682678
padding-bottom: 0;
683679
margin-bottom: 0;
684680
}
685681

686-
.tab-receiver .rssi .gui_box {
682+
.tab-receiver .feature .gui_box {
687683
float: left;
688684
}
689685

690-
.tab-receiver .rssi td:nth-child(2) {
686+
.tab-receiver .feature td:nth-child(2) {
691687
width: 20px;
692688
}
693689

@@ -707,16 +703,13 @@
707703
.tab-receiver .gui_box span {
708704
line-height: 17px;
709705
}
710-
.tab-receiver .rssi .gui_box {
711-
float: left;
712-
}
713706
}
714707

715708
@media all and (max-width: 575px) {
716-
.tab-receiver .rssi .gui_box {
709+
.tab-receiver .feature .gui_box {
717710
min-height: auto;
718711
}
719-
.tab-receiver .rssi td:nth-child(2) {
712+
.tab-receiver .feature td:nth-child(2) {
720713
width: auto;
721714
}
722715
.tab-receiver .features.rxMode, .tab-receiver .serialRX {

src/js/Features.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Features = function (config) {
1212
{bit: 6, group: 'other', name: 'SOFTSERIAL', haveTip: true},
1313
{bit: 7, group: 'gps', name: 'GPS', haveTip: true},
1414
{bit: 9, group: 'other', name: 'SONAR'},
15-
{bit: 10, group: 'other', name: 'TELEMETRY'},
15+
{bit: 10, group: 'telemetry', name: 'TELEMETRY'},
1616
{bit: 12, group: '3D', name: '3D'},
1717
{bit: 13, group: 'rxMode', mode: 'select', name: 'RX_PARALLEL_PWM'},
1818
{bit: 14, group: 'rxMode', mode: 'select', name: 'RX_MSP'},

src/js/tabs/receiver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ TABS.receiver.initialize = function (callback) {
360360
FC.FEATURE_CONFIG.features.updateData(element);
361361
updateTabList(FC.FEATURE_CONFIG.features);
362362

363-
if (element.attr('name') === "RSSI_ADC") {
363+
if (element.attr('name') === "RSSI_ADC" || element.attr('name') === "TELEMETRY") {
364364
updateSaveButton(true);
365365
}
366366
});

src/tabs/receiver.html

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,32 +62,38 @@
6262
</div>
6363
</div>
6464

65-
<!-- RSSI -->
66-
<div class="rssi">
65+
<div class="feature">
66+
<div class="gui_box grey">
67+
<div class="gui_box_titlebar">
68+
<div class="spacer_box_title" i18n="configurationTelemetry"></div>
69+
<div class="helpicon cf_tip" i18n_title="configurationTelemetryHelp"></div>
70+
</div>
71+
<div class="spacer_box">
72+
<table>
73+
<tbody class="features telemetry">
74+
<!-- table generated here -->
75+
</tbody>
76+
</table>
77+
</div>
78+
</div>
79+
</div>
80+
81+
<div class="feature">
6782
<div class="gui_box grey">
6883
<div class="gui_box_titlebar">
6984
<div class="spacer_box_title" i18n="configurationRSSI"></div>
7085
<div class="helpicon cf_tip" i18n_title="configurationRSSIHelp"></div>
7186
</div>
7287
<div class="spacer_box">
7388
<table>
74-
<thead>
75-
<tr>
76-
<th scope="rssi" i18n="configurationFeatureEnabled"></th>
77-
<th scope="rssi" i18n="configurationFeatureDescription"></th>
78-
<th scope="rssi" i18n="configurationFeatureName"></th>
79-
</tr>
80-
</thead>
8189
<tbody class="features rssi">
82-
<!-- table generated here -->
90+
<!-- table generated here -->
8391
</tbody>
8492
</table>
8593
</div>
8694
</div>
8795
</div>
8896

89-
<!-- RSSI CHANNEL-->
90-
9197
<div class="rssi_channel_wrapper grey">
9298
<div class="head" i18n="receiverRssiChannel"></div>
9399
<select name="rssi_channel">

0 commit comments

Comments
 (0)