Skip to content

Commit 78b6775

Browse files
ctzsnoozechmelevskij
authored andcommitted
Show magADC values without re-scaling in Sensors Tab (betaflight#3593)
show true magADC values
1 parent c6ace64 commit 78b6775

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

locales/en/messages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3117,7 +3117,7 @@
31173117
"message": "Accelerometer - g (deg)"
31183118
},
31193119
"sensorsMagTitle": {
3120-
"message": "Magnetometer - Ga"
3120+
"message": "Magnetometer"
31213121
},
31223122
"sensorsAltitudeTitle": {
31233123
"message": "Altitude - meters"

src/js/msp/MSPHelper.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ MspHelper.prototype.process_data = function(dataHandler) {
239239
FC.SENSOR_DATA.gyroscope[2] = data.read16() * (4 / 16.4);
240240

241241
// no clue about scaling factor
242-
FC.SENSOR_DATA.magnetometer[0] = data.read16() / 1090;
243-
FC.SENSOR_DATA.magnetometer[1] = data.read16() / 1090;
244-
FC.SENSOR_DATA.magnetometer[2] = data.read16() / 1090;
242+
FC.SENSOR_DATA.magnetometer[0] = data.read16();
243+
FC.SENSOR_DATA.magnetometer[1] = data.read16();
244+
FC.SENSOR_DATA.magnetometer[2] = data.read16();
245245
break;
246246
case MSPCodes.MSP_SERVO:
247247
const servoCount = data.byteLength / 2;

src/js/tabs/sensors.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,9 @@ sensors.initialize = function (callback) {
429429

430430
samples_mag_i = addSampleToData(mag_data, samples_mag_i, FC.SENSOR_DATA.magnetometer);
431431
drawGraph(magHelpers, mag_data, samples_mag_i);
432-
raw_data_text_ements.x[2].text(FC.SENSOR_DATA.magnetometer[0].toFixed(2));
433-
raw_data_text_ements.y[2].text(FC.SENSOR_DATA.magnetometer[1].toFixed(2));
434-
raw_data_text_ements.z[2].text(FC.SENSOR_DATA.magnetometer[2].toFixed(2));
432+
raw_data_text_ements.x[2].text(FC.SENSOR_DATA.magnetometer[0].toFixed(0));
433+
raw_data_text_ements.y[2].text(FC.SENSOR_DATA.magnetometer[1].toFixed(0));
434+
raw_data_text_ements.z[2].text(FC.SENSOR_DATA.magnetometer[2].toFixed(0));
435435
}
436436
}
437437

src/tabs/sensors.html

+7-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,13 @@
143143
<dt i18n="sensorsScale"></dt>
144144
<dd class="scale">
145145
<select name="mag_scale">
146-
<option value="0.5">0.5</option>
147-
<option value="1" selected="selected">1</option>
146+
<option value="100">100</option>
147+
<option value="200">200</option>
148+
<option value="500">500</option>
149+
<option value="1000">1000</option>
150+
<option value="2000" selected="selected">2000</option>
151+
<option value="5000">5000</option>
152+
<option value="10000">10000</option>
148153
</select>
149154
</dd>
150155
<dt>X:</dt>

0 commit comments

Comments
 (0)