speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Changing from meters to centimeters

Browse Source 
* Other minor tweaks to help text
* Finalizing API checks
pull/272/head
Stewart Loving-Gibbard 7 years ago
parent 4feee8f48d
commit cf1c676eaa
4 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File

6
_locales/en/messages.json
Unescape Escape View File

@ -1728,16 +1728,16 @@
"message": "Set this option if you need an alternate failsafe behavior when the craft is close to Home. For example the author of the feature has a plane that failsafes when the wings detach on landing, when the RTH failsafe behavior normally desired in flight is no longer wanted or needed."
},
"failsafeMinDistanceItem": {
"message": "Failsafe Minimum Distance"
"message": "Failsafe Minimum Distance in centimeters"
},
"failsafeMinDistanceHelp": {
"message": "The craft will use the alternate failsafe behavior when it is between 0 and this minimum distance in meters away from Home. For example if set to 20 meters, if the craft is at 13 meters the Failsafe Minimum Distance Procedure will be followed. At 25 meters, the normal failsafe procedure will be followed. If set to 0, the normal failsafe procedure will be used at all times. "
"message": "The craft will use the alternate failsafe behavior when it is between 0 and this minimum distance in centimeters away from Home. For example if set to 2000 centimeters (20 meters), and the craft is at 13 meters, the Failsafe Minimum Distance Procedure will be followed. When the craft is at 25 meters, the normal failsafe procedure will be followed. If set to 0, the normal failsafe procedure will be used at all times. "
},
"failsafeMinDistanceProcedureItem": {
"message": "Failsafe Minimum Distance Procedure"
},
"failsafeMinDistanceProcedureHelp": {
"message": "This is the failsafe procedure that will be followed when the craft is closer than the Minimum Distance from Home."
"message": "This is the failsafe procedure that will be followed when the craft is closer than the Failsafe Minimum Distance from Home."
},
"mainHelpArmed": {
"message": "Motor Arming"

8
js/fc.js
Unescape Escape View File

@ -471,14 +471,6 @@ var FC = {
);
}
// Unsure which version these will actually deploy in, guidance welcome. Using 1.7.3
// so it works for the moment. And I'm really not sure how it works anyhow
if (semver.gte(CONFIG.flightControllerVersion, '1.7.3')) {
features.push(
{bit: 30, group: 'rxFailsafeExtended', name: 'FAILSAFE_EXTENDED', haveTip: false, showNameInTip: false}
);
}
return features.reverse();
},
isFeatureEnabled: function (featureName, features) {

32
js/msp/MSPHelper.js
Unescape Escape View File

@ -1210,30 +1210,24 @@ var mspHelper = (function (gui) {
buffer.push(FAILSAFE_CONFIG.failsafe_procedure);
buffer.push(FAILSAFE_CONFIG.failsafe_recovery_delay);
// API version check needed here?
//if (semver.gte(CONFIG.apiVersion, "1.21.0")) {
// Or
// if (semver.gte(CONFIG.flightControllerVersion, "1.7.3")) {
//
// Guidance wanted...
if (semver.gte(CONFIG.flightControllerVersion, "1.7.3")) {
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_min_distance));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_min_distance));
buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_min_distance));
buffer.push(highByte(FAILSAFE_CONFIG.failsafe_min_distance));
buffer.push(FAILSAFE_CONFIG.failsafe_min_distance_procedure);
//}
buffer.push(FAILSAFE_CONFIG.failsafe_min_distance_procedure);
}
break;

2
tabs/failsafe.js
Unescape Escape View File

@ -287,7 +287,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
$failsafeUseMinimumDistanceCheckbox.change(function() {
if ($(this).is(':checked')) {
// 20 meters seems like a reasonable default for a minimum distance
$failsafeMinDistance.val(20);
$failsafeMinDistance.val(2000);
$failsafeMinDistanceElements.show();
$failsafeMinDistanceProcedureElements.show();
} else {

Write Preview
Loading…
Cancel
Save