mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-23 00:05:19 +03:00
Merge pull request #428 from iNavFlight/de_opflow_sensor_select
Add selector for optical flow sensor
This commit is contained in:
commit
cf176f2201
5 changed files with 34 additions and 3 deletions
|
@ -1937,6 +1937,9 @@
|
||||||
"sensorRangefinder": {
|
"sensorRangefinder": {
|
||||||
"message": "Rangefinder"
|
"message": "Rangefinder"
|
||||||
},
|
},
|
||||||
|
"sensorOpflow": {
|
||||||
|
"message": "Optical flow"
|
||||||
|
},
|
||||||
"manualEnablingTemplate": {
|
"manualEnablingTemplate": {
|
||||||
"message": "To enable via CLI use <strong>feature {name}</strong> command"
|
"message": "To enable via CLI use <strong>feature {name}</strong> command"
|
||||||
},
|
},
|
||||||
|
|
8
js/fc.js
8
js/fc.js
|
@ -437,7 +437,8 @@ var FC = {
|
||||||
SENSOR_ALIGNMENT = {
|
SENSOR_ALIGNMENT = {
|
||||||
align_gyro: 0,
|
align_gyro: 0,
|
||||||
align_acc: 0,
|
align_acc: 0,
|
||||||
align_mag: 0
|
align_mag: 0,
|
||||||
|
align_opflow: 0
|
||||||
};
|
};
|
||||||
|
|
||||||
RX_CONFIG = {
|
RX_CONFIG = {
|
||||||
|
@ -937,7 +938,10 @@ var FC = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getRangefinderNames: function () {
|
getRangefinderNames: function () {
|
||||||
return [ "NONE", "HCSR04", "SRF10", "HCSR04I2C", "VL53L0X", "UIB"];
|
return [ "NONE", "HCSR04", "SRF10", "HCSR04I2C", "VL53L0X", "MSP", "UIB"];
|
||||||
|
},
|
||||||
|
getOpticalFlowNames: function () {
|
||||||
|
return [ "NONE", "PMW3901", "CXOF", "MSP", "FAKE" ];
|
||||||
},
|
},
|
||||||
getArmingFlags: function () {
|
getArmingFlags: function () {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -551,6 +551,9 @@ var mspHelper = (function (gui) {
|
||||||
SENSOR_ALIGNMENT.align_gyro = data.getUint8(offset++);
|
SENSOR_ALIGNMENT.align_gyro = data.getUint8(offset++);
|
||||||
SENSOR_ALIGNMENT.align_acc = data.getUint8(offset++);
|
SENSOR_ALIGNMENT.align_acc = data.getUint8(offset++);
|
||||||
SENSOR_ALIGNMENT.align_mag = data.getUint8(offset++);
|
SENSOR_ALIGNMENT.align_mag = data.getUint8(offset++);
|
||||||
|
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
|
||||||
|
SENSOR_ALIGNMENT.align_opflow = data.getUint8(offset++);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case MSPCodes.MSP_SET_RAW_RC:
|
case MSPCodes.MSP_SET_RAW_RC:
|
||||||
break;
|
break;
|
||||||
|
@ -1668,6 +1671,9 @@ var mspHelper = (function (gui) {
|
||||||
buffer.push(SENSOR_ALIGNMENT.align_gyro);
|
buffer.push(SENSOR_ALIGNMENT.align_gyro);
|
||||||
buffer.push(SENSOR_ALIGNMENT.align_acc);
|
buffer.push(SENSOR_ALIGNMENT.align_acc);
|
||||||
buffer.push(SENSOR_ALIGNMENT.align_mag);
|
buffer.push(SENSOR_ALIGNMENT.align_mag);
|
||||||
|
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
|
||||||
|
buffer.push(SENSOR_ALIGNMENT.align_opflow);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_SET_ADVANCED_CONFIG:
|
case MSPCodes.MSP_SET_ADVANCED_CONFIG:
|
||||||
|
|
|
@ -55,6 +55,11 @@
|
||||||
<select id="sensor-rangefinder"></select>
|
<select id="sensor-rangefinder"></select>
|
||||||
<label for="sensor-rangefinder"> <span data-i18n="sensorRangefinder"></span></label>
|
<label for="sensor-rangefinder"> <span data-i18n="sensorRangefinder"></span></label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="select requires-v2_0">
|
||||||
|
<select id="sensor-opflow"></select>
|
||||||
|
<label for="sensor-opflow"> <span data-i18n="sensorOpflow"></span></label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="board gui_box grey">
|
<div class="board gui_box grey">
|
||||||
|
|
|
@ -549,7 +549,8 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
$sensorMag = $('#sensor-mag'),
|
$sensorMag = $('#sensor-mag'),
|
||||||
$sensorBaro = $('#sensor-baro'),
|
$sensorBaro = $('#sensor-baro'),
|
||||||
$sensorPitot = $('#sensor-pitot'),
|
$sensorPitot = $('#sensor-pitot'),
|
||||||
$sensorRangefinder = $('#sensor-rangefinder');
|
$sensorRangefinder = $('#sensor-rangefinder'),
|
||||||
|
$sensorOpflow = $('#sensor-opflow');
|
||||||
|
|
||||||
GUI.fillSelect($sensorAcc, FC.getAccelerometerNames());
|
GUI.fillSelect($sensorAcc, FC.getAccelerometerNames());
|
||||||
$sensorAcc.val(SENSOR_CONFIG.accelerometer);
|
$sensorAcc.val(SENSOR_CONFIG.accelerometer);
|
||||||
|
@ -582,6 +583,12 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
SENSOR_CONFIG.rangefinder = $sensorRangefinder.val();
|
SENSOR_CONFIG.rangefinder = $sensorRangefinder.val();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
GUI.fillSelect($sensorOpflow, FC.getOpticalFlowNames());
|
||||||
|
$sensorOpflow.val(SENSOR_CONFIG.opflow);
|
||||||
|
$sensorOpflow.change(function () {
|
||||||
|
SENSOR_CONFIG.opflow = $sensorOpflow.val();
|
||||||
|
});
|
||||||
|
|
||||||
$(".requires-v1_5").show();
|
$(".requires-v1_5").show();
|
||||||
} else {
|
} else {
|
||||||
$(".requires-v1_5").hide();
|
$(".requires-v1_5").hide();
|
||||||
|
@ -599,6 +606,12 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
$(".requires-v1_8_1").hide();
|
$(".requires-v1_8_1").hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
|
||||||
|
$(".requires-v2_0").show();
|
||||||
|
} else {
|
||||||
|
$(".requires-v2_0").hide();
|
||||||
|
}
|
||||||
|
|
||||||
$('#3ddeadbandlow').val(_3D.deadband3d_low);
|
$('#3ddeadbandlow').val(_3D.deadband3d_low);
|
||||||
$('#3ddeadbandhigh').val(_3D.deadband3d_high);
|
$('#3ddeadbandhigh').val(_3D.deadband3d_high);
|
||||||
$('#3dneutral').val(_3D.neutral3d);
|
$('#3dneutral').val(_3D.neutral3d);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue