Skip to content

Commit 7108ed7

Browse files
authored
Fix alignment backwards compatibility (#4481)
Fix backwards compatibility
1 parent e26ba79 commit 7108ed7

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

src/js/VirtualFC.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ const VirtualFC = {
4949

5050
virtualFC.BEEPER_CONFIG.beepers = new Beepers(FC.CONFIG);
5151
virtualFC.BEEPER_CONFIG.dshotBeaconConditions = new Beepers(FC.CONFIG, ["RX_LOST", "RX_SET"]);
52+
virtualFC.BEEPER_CONFIG.dshotBeaconTone = 1;
5253

5354
virtualFC.MIXER_CONFIG.mixer = 3;
5455

@@ -176,6 +177,10 @@ const VirtualFC = {
176177
totalSizeKB: 2048,
177178
};
178179

180+
virtualFC.SENSOR_ALIGNMENT = { ...FC.SENSOR_ALIGNMENT };
181+
virtualFC.SENSOR_ALIGNMENT.gyro_to_use = 0;
182+
virtualFC.SENSOR_ALIGNMENT.gyro_detection_flags = 1;
183+
179184
virtualFC.SENSOR_DATA = { ...FC.SENSOR_DATA };
180185

181186
virtualFC.RC = {
@@ -254,14 +259,15 @@ const VirtualFC = {
254259
}
255260

256261
// 11 1111 (pass bitchecks)
257-
virtualFC.CONFIG.activeSensors = 63;
262+
virtualFC.CONFIG.activeSensors = semver.gte(virtualFC.CONFIG.apiVersion, API_VERSION_1_47) ? 127 : 63;
258263

259264
virtualFC.SENSOR_CONFIG_ACTIVE = {
260265
gyro_hardware: 2, // MPU6050
261266
acc_hardware: 3, // MPU6050
262267
baro_hardware: 4, // BMP280
263268
mag_hardware: 5, // QMC5883
264269
sonar_hardware: 1, // HCSR04
270+
opticalflow_hardware: 1, // MT01
265271
};
266272

267273
virtualFC.SENSOR_DATA.sonars = 231;

src/js/tabs/configuration.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ configuration.initialize = function (callback) {
123123
"Custom",
124124
];
125125

126-
const orientation_mag_e = $("select.magalign");
126+
const orientation_mag_e = $("select.mag_align");
127127

128128
const orientation_gyro_to_use_e = $("select.gyro_to_use");
129129
const orientation_gyro_1_align_e = $("select.gyro_1_align");
@@ -248,21 +248,19 @@ configuration.initialize = function (callback) {
248248
}
249249

250250
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
251-
$(".tab-configuration .gyro_align_custom").show();
252251
$('input[name="gyro_align_roll"]').val(FC.SENSOR_ALIGNMENT.gyro_align_roll);
253252
$('input[name="gyro_align_pitch"]').val(FC.SENSOR_ALIGNMENT.gyro_align_pitch);
254253
$('input[name="gyro_align_yaw"]').val(FC.SENSOR_ALIGNMENT.gyro_align_yaw);
255254

256-
$(".tab-configuration .mag_align_custom").show();
257255
$('input[name="mag_align_roll"]').val(FC.SENSOR_ALIGNMENT.mag_align_roll);
258256
$('input[name="mag_align_pitch"]').val(FC.SENSOR_ALIGNMENT.mag_align_pitch);
259257
$('input[name="mag_align_yaw"]').val(FC.SENSOR_ALIGNMENT.mag_align_yaw);
260258

261259
toggleGyroCustomAlignmentInputs();
262260
toggleMagCustomAlignmentInputs();
263261
} else {
264-
$(".tab-configuration .gyro_align_custom").hide();
265-
$(".tab-configuration .mag_align_custom").hide();
262+
$(".tab-configuration .gyro_align_box").hide();
263+
$(".tab-configuration .mag_align_box").hide();
266264
}
267265

268266
$(".gyro_alignment_inputs_first").toggle(detected_gyro_1);

src/tabs/configuration.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<div class="gyro_alignment_inputs gyro_alignment_inputs_notfound">
225225
<span class="message-negative" i18n="configurationSensorGyroToUseNotFound"></span>
226226
</div>
227-
<div class="spacer_box">
227+
<div class="spacer_box gyro_align_box">
228228
<div class="sensor_align_content">
229229
<div class="gyro_align_inputs sensor_align_inputs">
230230
<div class="alignicon roll"></div>
@@ -255,15 +255,15 @@
255255
</div>
256256
<!-- END GYRO ALIGNMENT -->
257257
<!-- MAGNETOMETER ALIGNMENT -->
258-
<div class="gui_box grey">
258+
<div class="gui_box grey mag_align_box">
259259
<div class="gui_box_titlebar">
260260
<div class="spacer_box_title" i18n="configurationMagAlignment"></div>
261261
<div class="helpicon cf_tip" i18n_title="configurationBoardAlignmentHelp"></div>
262262
</div>
263263
<div class="spacer_box">
264264
<div class="select">
265265
<label>
266-
<select class="magalign">
266+
<select class="mag_align">
267267
<option value="0" i18n="configurationSensorAlignmentDefaultOption"></option>
268268
<!-- list generated here -->
269269
</select>

0 commit comments

Comments
 (0)