Skip to content

Commit

Permalink
added string which explicitly indicates what settings take effect
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanLut committed May 8, 2024
1 parent 0df2779 commit 5c43316
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
7 changes: 6 additions & 1 deletion locale/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2114,7 +2114,12 @@
"axisTableTitleValue": {
"message": "Value [degree]"
},

"configurationSensorMagPreset": {
"message": "Orientation is set by: PRESET (align_mag)"
},
"configurationSensorMagAngles": {
"message": "Orientation is set by: ANGLES (align_mag_roll, align_mag_pitch ,align_mag_yaw)"
},
"configurationMagnetometerHelp": {
"message": "<strong>Note:</strong> Remember to configure a Serial Port (via Ports tab) when using the Magnetometer feature."
},
Expand Down
2 changes: 1 addition & 1 deletion src/css/tabs/magnetometer.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
.tab-magnetometer #interactive_block {
position: absolute;
width: calc(100% - 655px);
height: 771px;
height: 836px;
min-height: calc(100% - 200px);
background-color: #f9f9f9;
border-radius: 5px;
Expand Down
4 changes: 4 additions & 0 deletions tabs/magnetometer.html
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@
<div class="cli-box">
<span class="cli-settings-title">CLI:&nbsp;</span><span id="cli_settings_mag"></span>
</div>
<div class="cli-box" style="font-style:normal;">
<span id="comment_sensor_mag_preset" data-i18n="configurationSensorMagPreset"></span>
<span id="comment_sensor_mag_angles" data-i18n="configurationSensorMagAngles"></span>
</div>
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions tabs/magnetometer.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ TABS.magnetometer.initialize = function (callback) {
" align_mag_pitch=" + (self.isSavePreset ? 0 : self.alignmentConfig.pitch * 10) +
" align_mag_yaw=" + (self.isSavePreset ? 0 : self.alignmentConfig.yaw * 10 + fix);
self.pageElements.cli_settings_mag.text(s);
self.pageElements.comment_sensor_mag_preset.css("display", !self.isSavePreset ? "none" : "");
self.pageElements.comment_sensor_mag_angles.css("display", self.isSavePreset ? "none" : "");
}

//Called when roll values change
Expand Down Expand Up @@ -361,6 +363,9 @@ TABS.magnetometer.initialize = function (callback) {
self.pageElements.cli_settings_fc = $('#cli_settings_fc');
self.pageElements.cli_settings_mag = $('#cli_settings_mag');

self.pageElements.comment_sensor_mag_preset = $('#comment_sensor_mag_preset');
self.pageElements.comment_sensor_mag_angles = $('#comment_sensor_mag_angles');

self.roll_e = $('dd.roll'),
self.pitch_e = $('dd.pitch'),
self.heading_e = $('dd.heading');
Expand Down

0 comments on commit 5c43316

Please sign in to comment.