sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #930 from McGiverGim/bf-fix_msp_control 

Fix MSP receiver control page
10.3.x-maintenance
Michael Keller 2018-02-18 03:16:08 +13:00 committed by GitHub
parent 0a69b2e168 f48c8283c4
commit 32ceac5497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
locales/en/messages.json
View File

@ -1439,6 +1439,13 @@
"message": "Preview" "message": "Preview"
}, },
"receiverMspWarningText": {
"message": "These sticks allow Betaflight to be armed and tested without a transmitter or receiver being present. However, <strong>this feature is not intended for flight and propellers must not be attached.</strong><br><br>This feature does not guarantee reliable control of your craft. <strong>Serious injury is likely to result if propellers are left on.</strong>"
},
"receiverMspEnableButton": {
"message": "Enable controls"
},
"auxiliaryHelp": { "auxiliaryHelp": {
"message": "Use ranges to define the switches on your transmitter and corresponding mode assignments. A receiver channel that gives a reading between a range min/max will activate the mode. Remember to save your settings using the Save button." "message": "Use ranges to define the switches on your transmitter and corresponding mode assignments. A receiver channel that gives a reading between a range min/max will activate the mode. Remember to save your settings using the Save button."
}, },

16
src/js/tabs/receiver_msp.js
View File

@ -31,8 +31,8 @@ var
// First the vertical axis, then the horizontal: // First the vertical axis, then the horizontal:
gimbals = [ gimbals = [
["throttle", "yaw"], ["Throttle", "Yaw"],
["pitch", "roll"], ["Pitch", "Roll"],
], ],
gimbalElems, gimbalElems,
@ -40,6 +40,18 @@ var
enableTX = false; enableTX = false;
// This is a hack to get the i18n var of the parent, but the localizePage not works
const i18n = opener.i18n;
$(document).ready(function () {
$('[i18n]:not(.i18n-replaced)').each(function() {
var element = $(this);
element.html(i18n.getMessage(element.attr('i18n')));
element.addClass('i18n-replaced');
});
})
function transmitChannels() { function transmitChannels() {
var var
channelValues = [0, 0, 0, 0, 0, 0, 0, 0]; channelValues = [0, 0, 0, 0, 0, 0, 0, 0];

17
src/tabs/receiver_msp.html
View File

@ -1,16 +1,16 @@
<html> <html>
<head> <head>
<link type="text/css" rel="stylesheet" href="../css/opensans_webfontkit/fonts.css" media="all" /> <link type="text/css" rel="stylesheet" href="/css/opensans_webfontkit/fonts.css" media="all" />
<script type="text/javascript" src="/js/libraries/jquery-2.1.4.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/js/libraries/jquery-ui-1.11.4.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery-ui-1.11.4.min.js"></script>
<script type="text/javascript" src="/js/libraries/jquery.nouislider.all.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery.nouislider.all.min.js"></script>
<script type="text/javascript" src="receiver_msp.js"></script> <script type="text/javascript" src="/js/tabs/receiver_msp.js"></script>
<link type="text/css" rel="stylesheet" href="/js/libraries/jquery.nouislider.min.css"> <link type="text/css" rel="stylesheet" href="/js/libraries/jquery.nouislider.min.css">
<link type="text/css" rel="stylesheet" href="/js/libraries/jquery.nouislider.pips.min.css"> <link type="text/css" rel="stylesheet" href="/js/libraries/jquery.nouislider.pips.min.css">
<link type="text/css" rel="stylesheet" href="receiver_msp.css" media="all" /> <link type="text/css" rel="stylesheet" href="/css/tabs/receiver_msp.css" media="all" />
</head> </head>
<body> <body>
<div class="control-gimbals"> <div class="control-gimbals">
@ -49,16 +49,9 @@
</div> </div>
</div> </div>
<div class="warning"> <div class="warning">
<p> <p i18n="receiverMspWarningText"></p>
These sticks allow BetaFlight to be armed and tested without a transmitter or receiver being present.
However, <strong>this feature is not intended for flight and propellers must not be attached.</strong>
</p>
<p>
This feature does not guarantee reliable control of your craft. <strong>Serious injury is likely to
result if propellers are left on.</strong>
</p>
<div class="button-enable btn"> <div class="button-enable btn">
<a class="button-enable" href="#">Enable controls</a> <a class="button-enable" href="#" i18n="receiverMspEnableButton"></a>
</div> </div>
</div> </div>
</body> </body>