Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-25 09:15:42 +03:00
Code Wiki Activity

Add MSP support for the new vbat_cell_detect_voltage setting

Browse source
This commit is contained in:
Michel Pastor 2018-05-06 02:04:46 +02:00
parent 05355f749c
commit 343e4d244d
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/fc.js
View file

@ -274,6 +274,7 @@ var FC = {
placeholder2: 0, placeholder2: 0,
mag_declination: 0, // not checked mag_declination: 0, // not checked
vbatscale: 0, vbatscale: 0,
vbatdetectcellvoltage: 0,
vbatmincellvoltage: 0, vbatmincellvoltage: 0,
vbatmaxcellvoltage: 0, vbatmaxcellvoltage: 0,
vbatwarningcellvoltage: 0, vbatwarningcellvoltage: 0,
@ -285,6 +286,7 @@ var FC = {
BATTERY_CONFIG = { BATTERY_CONFIG = {
vbatscale: 0, vbatscale: 0,
vbatdetectcellvoltage: 0,
vbatmincellvoltage: 0, vbatmincellvoltage: 0,
vbatmaxcellvoltage: 0, vbatmaxcellvoltage: 0,
vbatwarningcellvoltage: 0, vbatwarningcellvoltage: 0,

16
js/msp/MSPHelper.js
View file

@ -369,6 +369,10 @@ var mspHelper = (function (gui) {
offset += 2; offset += 2;
MISC.vbatscale = data.getUint16(offset, true); MISC.vbatscale = data.getUint16(offset, true);
offset += 2; offset += 2;
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
MISC.vbatdetectcellvoltage = data.getUint16(offset, true) / 100;
offset += 2;
}
MISC.vbatmincellvoltage = data.getUint16(offset, true) / 100; MISC.vbatmincellvoltage = data.getUint16(offset, true) / 100;
offset += 2; offset += 2;
MISC.vbatmaxcellvoltage = data.getUint16(offset, true) / 100; MISC.vbatmaxcellvoltage = data.getUint16(offset, true) / 100;
@ -386,6 +390,10 @@ var mspHelper = (function (gui) {
case MSPCodes.MSPV2_INAV_BATTERY_CONFIG: case MSPCodes.MSPV2_INAV_BATTERY_CONFIG:
BATTERY_CONFIG.vbatscale = data.getUint16(offset, true); BATTERY_CONFIG.vbatscale = data.getUint16(offset, true);
offset += 2; offset += 2;
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
BATTERY_CONFIG.vbatdetectcellvoltage = data.getUint16(offset, true) / 100;
offset += 2;
}
BATTERY_CONFIG.vbatmincellvoltage = data.getUint16(offset, true) / 100; BATTERY_CONFIG.vbatmincellvoltage = data.getUint16(offset, true) / 100;
offset += 2; offset += 2;
BATTERY_CONFIG.vbatmaxcellvoltage = data.getUint16(offset, true) / 100; BATTERY_CONFIG.vbatmaxcellvoltage = data.getUint16(offset, true) / 100;
@ -1498,6 +1506,10 @@ var mspHelper = (function (gui) {
buffer.push(highByte(Math.round(MISC.mag_declination * 10))); buffer.push(highByte(Math.round(MISC.mag_declination * 10)));
buffer.push(lowByte(MISC.vbatscale)); buffer.push(lowByte(MISC.vbatscale));
buffer.push(highByte(MISC.vbatscale)); buffer.push(highByte(MISC.vbatscale));
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
buffer.push(lowByte(Math.round(MISC.vbatdetectcellvoltage * 100)));
buffer.push(highByte(Math.round(MISC.vbatdetectcellvoltage * 100)));
}
buffer.push(lowByte(Math.round(MISC.vbatmincellvoltage * 100))); buffer.push(lowByte(Math.round(MISC.vbatmincellvoltage * 100)));
buffer.push(highByte(Math.round(MISC.vbatmincellvoltage * 100))); buffer.push(highByte(Math.round(MISC.vbatmincellvoltage * 100)));
buffer.push(lowByte(Math.round(MISC.vbatmaxcellvoltage * 100))); buffer.push(lowByte(Math.round(MISC.vbatmaxcellvoltage * 100)));
@ -1515,6 +1527,10 @@ var mspHelper = (function (gui) {
case MSPCodes.MSPV2_INAV_SET_BATTERY_CONFIG: case MSPCodes.MSPV2_INAV_SET_BATTERY_CONFIG:
buffer.push(lowByte(BATTERY_CONFIG.vbatscale)); buffer.push(lowByte(BATTERY_CONFIG.vbatscale));
buffer.push(highByte(BATTERY_CONFIG.vbatscale)); buffer.push(highByte(BATTERY_CONFIG.vbatscale));
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
buffer.push(lowByte(Math.round(BATTERY_CONFIG.vbatdetectcellvoltage * 100)));
buffer.push(highByte(Math.round(BATTERY_CONFIG.vbatdetectcellvoltage * 100)));
}
buffer.push(lowByte(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 100))); buffer.push(lowByte(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 100)));
buffer.push(highByte(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 100))); buffer.push(highByte(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 100)));
buffer.push(lowByte(Math.round(BATTERY_CONFIG.vbatmaxcellvoltage * 100))); buffer.push(lowByte(Math.round(BATTERY_CONFIG.vbatmaxcellvoltage * 100)));