Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-17 21:35:33 +03:00
Code Issues Wiki Activity

Move telemetry to receiver tab

Browse source
This commit is contained in:
Mark Haslinghuis 2022-05-22 04:56:43 +02:00
parent d92a49aac8
commit 6f0bdba5f4
5 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
locales/en/messages.json
View file

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

17
src/css/tabs/receiver.css
View file

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

2
src/js/Features.js
View file

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

2
src/js/tabs/receiver.js
View file

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

30
src/tabs/receiver.html
View file

@ -62,8 +62,23 @@
</div> </div>
</div> </div>
<!-- RSSI --> <div class="feature">
<div class="rssi"> <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 grey">
<div class="gui_box_titlebar"> <div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="configurationRSSI"></div> <div class="spacer_box_title" i18n="configurationRSSI"></div>
@ -71,23 +86,14 @@
</div> </div>
<div class="spacer_box"> <div class="spacer_box">
<table> <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"> <tbody class="features rssi">
<!-- table generated here --> <!-- table generated here -->
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<!-- RSSI CHANNEL-->
<div class="rssi_channel_wrapper grey"> <div class="rssi_channel_wrapper grey">
<div class="head" i18n="receiverRssiChannel"></div> <div class="head" i18n="receiverRssiChannel"></div>
<select name="rssi_channel"> <select name="rssi_channel">