diff --git a/js/msp.js b/js/msp.js index 797ae67454..46daa0395a 100644 --- a/js/msp.js +++ b/js/msp.js @@ -301,7 +301,7 @@ var MSP = { MISC.multiwiicurrentoutput = data.getUint8(13); MISC.rssi_aux_channel = data.getUint8(14); MISC.placeholder2 = data.getUint8(15); - MISC.mag_declination = data.getInt16(16, 1); // -18000-18000 + MISC.mag_declination = data.getInt16(16, 1) / 10; // -18000-18000 MISC.vbatscale = data.getUint8(18, 1); // 10-200 MISC.vbatmincellvoltage = data.getUint8(19, 1) / 10; // 10-50 MISC.vbatmaxcellvoltage = data.getUint8(20, 1) / 10; // 10-50 @@ -664,11 +664,11 @@ MSP.crunch = function (code) { buffer.push(MISC.multiwiicurrentoutput); buffer.push(MISC.rssi_aux_channel); buffer.push(MISC.placeholder2); - buffer.push(lowByte(MISC.mag_declination)); - buffer.push(highByte(MISC.mag_declination)); + buffer.push(lowByte(MISC.mag_declination * 10)); + buffer.push(highByte(MISC.mag_declination * 10)); buffer.push(MISC.vbatscale); - buffer.push(MISC.vbatmincellvoltage); - buffer.push(MISC.vbatmaxcellvoltage); + buffer.push(MISC.vbatmincellvoltage * 10); + buffer.push(MISC.vbatmaxcellvoltage * 10); buffer.push(MISC.placeholder3); break; case MSP_codes.MSP_SET_SERVO_CONF: diff --git a/tabs/configuration.js b/tabs/configuration.js index 6ef2b0a42f..7e96887dec 100644 --- a/tabs/configuration.js +++ b/tabs/configuration.js @@ -197,7 +197,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) { $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]); // fill magnetometer - $('input[name="mag_declination"]').val(MISC.mag_declination / 10); + $('input[name="mag_declination"]').val(MISC.mag_declination); // fill throttle $('input[name="minthrottle"]').val(MISC.minthrottle); @@ -238,7 +238,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) { CONFIG.accelerometerTrims[1] = parseInt($('input[name="roll"]').val()); CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val()); - MISC.mag_declination = parseFloat($('input[name="mag_declination"]').val()) * 10; + MISC.mag_declination = parseFloat($('input[name="mag_declination"]').val()); MISC.minthrottle = parseInt($('input[name="minthrottle"]').val()); MISC.midrc = parseInt($('input[name="midthrottle"]').val()); @@ -246,8 +246,8 @@ TABS.configuration.initialize = function (callback, scrollPosition) { MISC.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val()); MISC.mincommand = parseInt($('input[name="mincommand"]').val()); - MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val()) * 10; - MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val()) * 10; + MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val()); + MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val()); MISC.vbatscale = parseInt($('input[name="voltagescale"]').val()); BF_CONFIG.currentscale = parseInt($('input[name="currentscale"]').val());