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

Add MSP2_INAV_LOGIC_CONDITIONS_SINGLE

Browse source
This commit is contained in:
Andi Kanzler 2022-04-01 13:37:54 +02:00
parent ab7162980b
commit 86337d5aa2
3 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/msp/MSPCodes.js
View file

@ -229,5 +229,7 @@ var MSPCodes = {
MSP2_INAV_FWUPDT_ROLLBACK_EXEC: 0x2037, MSP2_INAV_FWUPDT_ROLLBACK_EXEC: 0x2037,
MSP2_INAV_SAFEHOME: 0x2038, MSP2_INAV_SAFEHOME: 0x2038,
MSP2_INAV_SET_SAFEHOME: 0x2039 MSP2_INAV_SET_SAFEHOME: 0x2039,
MSP2_INAV_LOGIC_CONDITIONS_SINGLE: 0x203B
}; };

64
js/msp/MSPHelper.js
View file

@ -463,33 +463,34 @@ var mspHelper = (function (gui) {
console.log("Servo mix saved"); console.log("Servo mix saved");
break; break;
case MSPCodes.MSP2_INAV_LOGIC_CONDITIONS: case MSPCodes.MSP2_INAV_LOGIC_CONDITIONS:
if (semver.gte(CONFIG.flightControllerVersion, "5.0.0")) { LOGIC_CONDITIONS.flush();
LOGIC_CONDITIONS.put(new LogicCondition( if (data.byteLength % 14 === 0) {
data.getInt8(0), for (i = 0; i < data.byteLength; i += 14) {
data.getInt8(1), LOGIC_CONDITIONS.put(new LogicCondition(
data.getUint8(2), data.getInt8(i),
data.getUint8(3), data.getInt8(i + 1),
data.getInt32(4, true), data.getUint8(i + 2),
data.getUint8(8), data.getUint8(i + 3),
data.getInt32(9, true), data.getInt32(i + 4, true),
data.getInt8(13) data.getUint8(i + 8),
)); data.getInt32(i + 9, true),
} else { data.getInt8(i + 13)
if (data.byteLength % 14 === 0) { ));
for (i = 0; i < data.byteLength; i += 14) {
LOGIC_CONDITIONS.put(new LogicCondition(
data.getInt8(i),
data.getInt8(i + 1),
data.getUint8(i + 2),
data.getUint8(i + 3),
data.getInt32(i + 4, true),
data.getUint8(i + 8),
data.getInt32(i + 9, true),
data.getInt8(i + 13)
));
}
} }
} }
break;
case MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_SINGLE:
LOGIC_CONDITIONS.put(new LogicCondition(
data.getInt8(0),
data.getInt8(1),
data.getUint8(2),
data.getUint8(3),
data.getInt32(4, true),
data.getUint8(8),
data.getInt32(9, true),
data.getInt8(13)
));
break; break;
case MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_STATUS: case MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_STATUS:
@ -2269,19 +2270,18 @@ var mspHelper = (function (gui) {
} }
}; };
self.loadLogicConditions = function (callback) { self.loadLogicConditions = function (callback) {
LOGIC_CONDITIONS.flush();
if (semver.gte(CONFIG.flightControllerVersion, "5.0.0")) { if (semver.gte(CONFIG.flightControllerVersion, "5.0.0")) {
LOGIC_CONDITIONS.flush();
let idx = 0; let idx = 0;
MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS, [idx], false, nextLogicCondition); MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_SINGLE, [idx], false, nextLogicCondition);
function nextLogicCondition() { function nextLogicCondition() {
idx++; idx++;
if (idx < LOGIC_CONDITIONS.getMaxLogicConditionCount() - 1) { if (idx < LOGIC_CONDITIONS.getMaxLogicConditionCount() - 1) {
MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS, [idx], false, nextLogicCondition); MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_SINGLE, [idx], false, nextLogicCondition);
} else { } else {
MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS, [idx], false, callback); MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_SINGLE, [idx], false, callback);
} }
} }
} else { } else {

2
package.json
View file

@ -35,7 +35,7 @@
"jquery-ui-npm": "1.12.0", "jquery-ui-npm": "1.12.0",
"marked": "^0.3.17", "marked": "^0.3.17",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"nw": "^0.61.0-sdk", "nw": "^0.61.0",
"nw-dialog": "^1.0.7", "nw-dialog": "^1.0.7",
"openlayers": "^4.6.5", "openlayers": "^4.6.5",
"plotly": "^1.0.6", "plotly": "^1.0.6",