Move telemetry to receiver tab

10.8-maintenance
Mark Haslinghuis 2022-05-22 04:56:43 +02:00
parent d92a49aac8
commit 6f0bdba5f4
5 changed files with 31 additions and 26 deletions

View File

@ -1212,6 +1212,12 @@
"configurationReceiverMode": {
"message": "Receiver Mode"
},
"configurationTelemetry": {
"message": "Telemetry"
},
"configurationTelemetryHelp": {
"message": "Telemetry output from receiver"
},
"configurationRSSI": {
"message": "RSSI (Signal Strength)"
},

View File

@ -667,27 +667,23 @@
margin-bottom: 0;
}
.tab-receiver .rssi thead {
display: none;
}
.tab-receiver .gui_box {
margin-bottom: 10px;
float: left;
font-weight: bold;
}
.tab-receiver .rssi td {
.tab-receiver .feature td {
border-bottom: none;
padding-bottom: 0;
margin-bottom: 0;
}
.tab-receiver .rssi .gui_box {
.tab-receiver .feature .gui_box {
float: left;
}
.tab-receiver .rssi td:nth-child(2) {
.tab-receiver .feature td:nth-child(2) {
width: 20px;
}
@ -707,16 +703,13 @@
.tab-receiver .gui_box span {
line-height: 17px;
}
.tab-receiver .rssi .gui_box {
float: left;
}
}
@media all and (max-width: 575px) {
.tab-receiver .rssi .gui_box {
.tab-receiver .feature .gui_box {
min-height: auto;
}
.tab-receiver .rssi td:nth-child(2) {
.tab-receiver .feature td:nth-child(2) {
width: auto;
}
.tab-receiver .features.rxMode, .tab-receiver .serialRX {

View File

@ -12,7 +12,7 @@ const Features = function (config) {
{bit: 6, group: 'other', name: 'SOFTSERIAL', haveTip: true},
{bit: 7, group: 'gps', name: 'GPS', haveTip: true},
{bit: 9, group: 'other', name: 'SONAR'},
{bit: 10, group: 'other', name: 'TELEMETRY'},
{bit: 10, group: 'telemetry', name: 'TELEMETRY'},
{bit: 12, group: '3D', name: '3D'},
{bit: 13, group: 'rxMode', mode: 'select', name: 'RX_PARALLEL_PWM'},
{bit: 14, group: 'rxMode', mode: 'select', name: 'RX_MSP'},

View File

@ -360,7 +360,7 @@ TABS.receiver.initialize = function (callback) {
FC.FEATURE_CONFIG.features.updateData(element);
updateTabList(FC.FEATURE_CONFIG.features);
if (element.attr('name') === "RSSI_ADC") {
if (element.attr('name') === "RSSI_ADC" || element.attr('name') === "TELEMETRY") {
updateSaveButton(true);
}
});

View File

@ -62,8 +62,23 @@
</div>
</div>
<!-- RSSI -->
<div class="rssi">
<div class="feature">
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="configurationTelemetry"></div>
<div class="helpicon cf_tip" i18n_title="configurationTelemetryHelp"></div>
</div>
<div class="spacer_box">
<table>
<tbody class="features telemetry">
<!-- table generated here -->
</tbody>
</table>
</div>
</div>
</div>
<div class="feature">
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="configurationRSSI"></div>
@ -71,23 +86,14 @@
</div>
<div class="spacer_box">
<table>
<thead>
<tr>
<th scope="rssi" i18n="configurationFeatureEnabled"></th>
<th scope="rssi" i18n="configurationFeatureDescription"></th>
<th scope="rssi" i18n="configurationFeatureName"></th>
</tr>
</thead>
<tbody class="features rssi">
<!-- table generated here -->
<!-- table generated here -->
</tbody>
</table>
</div>
</div>
</div>
<!-- RSSI CHANNEL-->
<div class="rssi_channel_wrapper grey">
<div class="head" i18n="receiverRssiChannel"></div>
<select name="rssi_channel">