Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

fix vbatmincellvoltage and vbatmaxcellvoltage scale factors inside output cruncher

Browse source
This commit is contained in:
cTn 2014-11-03 18:36:29 +01:00
parent 3a4b41b259
commit a31282c6a3
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/msp.js
View file

@ -301,7 +301,7 @@ var MSP = {
MISC.multiwiicurrentoutput = data.getUint8(13); MISC.multiwiicurrentoutput = data.getUint8(13);
MISC.rssi_aux_channel = data.getUint8(14); MISC.rssi_aux_channel = data.getUint8(14);
MISC.placeholder2 = data.getUint8(15); 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.vbatscale = data.getUint8(18, 1); // 10-200
MISC.vbatmincellvoltage = data.getUint8(19, 1) / 10; // 10-50 MISC.vbatmincellvoltage = data.getUint8(19, 1) / 10; // 10-50
MISC.vbatmaxcellvoltage = data.getUint8(20, 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.multiwiicurrentoutput);
buffer.push(MISC.rssi_aux_channel); buffer.push(MISC.rssi_aux_channel);
buffer.push(MISC.placeholder2); buffer.push(MISC.placeholder2);
buffer.push(lowByte(MISC.mag_declination)); buffer.push(lowByte(MISC.mag_declination * 10));
buffer.push(highByte(MISC.mag_declination)); buffer.push(highByte(MISC.mag_declination * 10));
buffer.push(MISC.vbatscale); buffer.push(MISC.vbatscale);
buffer.push(MISC.vbatmincellvoltage); buffer.push(MISC.vbatmincellvoltage * 10);
buffer.push(MISC.vbatmaxcellvoltage); buffer.push(MISC.vbatmaxcellvoltage * 10);
buffer.push(MISC.placeholder3); buffer.push(MISC.placeholder3);
break; break;
case MSP_codes.MSP_SET_SERVO_CONF: case MSP_codes.MSP_SET_SERVO_CONF:

8
tabs/configuration.js
View file

@ -197,7 +197,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
$('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]); $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
// fill magnetometer // fill magnetometer
$('input[name="mag_declination"]').val(MISC.mag_declination / 10); $('input[name="mag_declination"]').val(MISC.mag_declination);
// fill throttle // fill throttle
$('input[name="minthrottle"]').val(MISC.minthrottle); $('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[1] = parseInt($('input[name="roll"]').val());
CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').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.minthrottle = parseInt($('input[name="minthrottle"]').val());
MISC.midrc = parseInt($('input[name="midthrottle"]').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.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
MISC.mincommand = parseInt($('input[name="mincommand"]').val()); MISC.mincommand = parseInt($('input[name="mincommand"]').val());
MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val()) * 10; MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val());
MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val()) * 10; MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val());
MISC.vbatscale = parseInt($('input[name="voltagescale"]').val()); MISC.vbatscale = parseInt($('input[name="voltagescale"]').val());
BF_CONFIG.currentscale = parseInt($('input[name="currentscale"]').val()); BF_CONFIG.currentscale = parseInt($('input[name="currentscale"]').val());