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

fix save point

Browse source
This commit is contained in:
Sergej Pozdnyakov 2018-01-07 18:14:05 +03:00
parent 0b7598dabd
commit 8dee7a6340
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
js/msp/MSPHelper.js
View file

@ -1112,6 +1112,9 @@ var mspHelper = (function (gui) {
MISSION_PLANER.isValidMission = data.getUint8(2); MISSION_PLANER.isValidMission = data.getUint8(2);
MISSION_PLANER.countBusyPoints = data.getUint8(3); MISSION_PLANER.countBusyPoints = data.getUint8(3);
break; break;
case MSPCodes.MSP_SET_WP:
console.log('Point saved');
break;
default: default:
console.log('Unknown code detected: ' + dataHandler.code); console.log('Unknown code detected: ' + dataHandler.code);
} else { } else {
@ -1593,15 +1596,6 @@ var mspHelper = (function (gui) {
break; break;
case MSPCodes.MSP_SET_WP: case MSPCodes.MSP_SET_WP:
console.log(MISSION_PLANER.bufferPoint.number);
console.log(MISSION_PLANER.bufferPoint.action);
console.log(MISSION_PLANER.bufferPoint.lat);
console.log(MISSION_PLANER.bufferPoint.lon);
console.log(MISSION_PLANER.bufferPoint.alt);
console.log(MISSION_PLANER.bufferPoint.endMission);
console.log('---');
buffer.push(MISSION_PLANER.bufferPoint.number); // sbufReadU8(src); // number buffer.push(MISSION_PLANER.bufferPoint.number); // sbufReadU8(src); // number
buffer.push(MISSION_PLANER.bufferPoint.action); // sbufReadU8(src); // action buffer.push(MISSION_PLANER.bufferPoint.action); // sbufReadU8(src); // action
buffer.push(specificByte(MISSION_PLANER.bufferPoint.lat, 0)); // sbufReadU32(src); // lat buffer.push(specificByte(MISSION_PLANER.bufferPoint.lat, 0)); // sbufReadU32(src); // lat
@ -1616,17 +1610,21 @@ var mspHelper = (function (gui) {
buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 1)); // sbufReadU32(src); // to set altitude (cm) buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 1)); // sbufReadU32(src); // to set altitude (cm)
buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 2)); // sbufReadU32(src); // to set altitude (cm) buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 2)); // sbufReadU32(src); // to set altitude (cm)
buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 3)); // sbufReadU32(src); // to set altitude (cm) buffer.push(specificByte(MISSION_PLANER.bufferPoint.alt, 3)); // sbufReadU32(src); // to set altitude (cm)
buffer.push(0); //sbufReadU16(src); // P1 buffer.push(lowByte(0)); //sbufReadU16(src); // P1
buffer.push(0); //sbufReadU16(src); // P2 buffer.push(highByte(0));
buffer.push(0); //sbufReadU16(src); // P3 buffer.push(lowByte(0)); //sbufReadU16(src); // P2
buffer.push(highByte(0));
buffer.push(lowByte(0)); //sbufReadU16(src); // P3
buffer.push(highByte(0));
buffer.push(MISSION_PLANER.bufferPoint.endMission); //sbufReadU8(src); // future: to set nav flag buffer.push(MISSION_PLANER.bufferPoint.endMission); //sbufReadU8(src); // future: to set nav flag
break; break;
case MSPCodes.MSP_WP: case MSPCodes.MSP_WP:
console.log(MISSION_PLANER.bufferPoint.number);
buffer.push(MISSION_PLANER.bufferPoint.number); buffer.push(MISSION_PLANER.bufferPoint.number);
break; break;
case MSPCodes.MSP_WP_MISSION_SAVE: case MSPCodes.MSP_WP_MISSION_SAVE:
buffer.push(0); // buffer.push(0);
break; break;
default: default:

10
tabs/mission_control.js
View file

@ -411,6 +411,8 @@ TABS.mission_control.initialize = function (callback) {
GUI.log(chrome.i18n.getMessage('eeprom_saved_ok')); GUI.log(chrome.i18n.getMessage('eeprom_saved_ok'));
MSP.send_message(MSPCodes.MSP_WP_MISSION_SAVE, false, false); MSP.send_message(MSPCodes.MSP_WP_MISSION_SAVE, false, false);
MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, updateTotalInfo);
$('#saveMissionButton').removeClass('disabled'); $('#saveMissionButton').removeClass('disabled');
return; return;
} }
@ -419,16 +421,18 @@ TABS.mission_control.initialize = function (callback) {
MISSION_PLANER.bufferPoint.number = pointForSend; MISSION_PLANER.bufferPoint.number = pointForSend;
MISSION_PLANER.bufferPoint.action = 1; MISSION_PLANER.bufferPoint.action = 1;
MISSION_PLANER.bufferPoint.lat = geometry.getCoordinates()[0] * 10000000; MISSION_PLANER.bufferPoint.lat = parseInt(geometry.getCoordinates()[0] * 10000000);
MISSION_PLANER.bufferPoint.lon = geometry.getCoordinates()[1] * 10000000; MISSION_PLANER.bufferPoint.lon = parseInt(geometry.getCoordinates()[1] * 10000000);
MISSION_PLANER.bufferPoint.alt = markers[pointForSend].alt; MISSION_PLANER.bufferPoint.alt = markers[pointForSend].alt;
pointForSend++; pointForSend++;
if (pointForSend >= markers.length) { if (pointForSend >= markers.length) {
MISSION_PLANER.bufferPoint.endMission = 0xA5; MISSION_PLANER.bufferPoint.endMission = 0xA5;
} else {
MISSION_PLANER.bufferPoint.endMission = 0;
} }
MSP.send_message(MSPCodes.MSP_SET_WP, false, false, sendNextPoint); MSP.send_message(MSPCodes.MSP_SET_WP, mspHelper.crunch(MSPCodes.MSP_SET_WP), false, sendNextPoint);
} }
}; };