Mission Control tab -> "Load Mission from FC" blue widget can now get mission from drone , save it to ./gotmission1.js AND draw normal WP's on-screen.

button next to it writes from .js to drone, not from GuI.

Author: davidbuzz

js/mavsp/MAVSPHelper.js

@@ -103,16 +103,21 @@ async function send_canned_mission_to_drone() {
     MissionObj.MissionToDrone(miss).then(results => { console.log('END SEND MISSION to drone');  });
 }
 
-function get_mission_from_drone() {
+async function get_mission_from_drone(cb) {
     // obj for missions
     if (MissionObj ==undefined )  MissionObj = new MavMission(SYSID,COMPID,mavlink20, mavParserObj , null, logger);
 
     var writefilename = "./gotmission1.js"; // default if not specificed
 
     console.log('START READ MISSION from drone',writefilename)
     // awaiting in a non-async is like this...
-    MissionObj.DroneToMission(writefilename).then(results => { console.log('END READ MISSION from drone');  });
+    await MissionObj.DroneToMission(writefilename).then(results => { 
+        console.log('END READ MISSION from drone');  
+        console.log(MISSION_PLANER); 
+        if ( cb ) cb();
+    });
 
+    
 }
 
 function mavFlightModes_rehook() { 
@@ -4146,7 +4151,7 @@ var mspHelper = (function (gui) {
         MISSION_PLANER.reinit();
         let waypointId = 1;
 
-        get_mission_from_drone();
+        get_mission_from_drone(callback);
         // //MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, null);
         // getFirstWP();
 
@@ -4166,6 +4171,7 @@ var mspHelper = (function (gui) {
         //         callback(); // without a response, we'll call the callback anyway
         //     }
         // };
+        //callback();
     };
 
     self.saveWaypoints = function (callback) {  //sendWaypointsToFC

js/mavsp/mavMission.js

@@ -360,6 +360,26 @@ MavMission.prototype.DroneToMission = async function(filename) {
                 data2 += "[";
                 data2 += l.toString();
                 data2 += "],\n";
+
+                var wp_type = MWNP.WPTYPE.WAYPOINT;
+                //if ( e.command == 16 ) wp_type = MWNP.WPTYPE.WAYPOINT; // The scheduled action for the waypoint.
+
+                // skip 'home' = 'zero' wp from drone
+                if ( e.seq != 0 ) {
+                    //number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endMission=0, isUsed=true, isAttached=false, attachedId=""
+                    MISSION_PLANER.put(new Waypoint(
+                        e.seq,//data.getUint8(0),//number
+                        wp_type,//data.getUint8(1),       //action like MWNP.WPTYPE.JUMP  or MWNP.WPTYPE.WAYPOINT
+                        e.x*10000000,//data.getInt32(2, true), //lat
+                        e.y*10000000,//data.getInt32(6, true), //lon
+                        e.z,//data.getInt32(10, true), //alt
+                        e.param1,//data.getInt16(14, true), //p1 
+                        e.param2,//data.getInt16(16, true), //p2 
+                        e.param3,//data.getInt16(18, true)  //p3
+                        // eep buzz todo, fit e.param4 
+                    ));
+                }
+                //
         });
         data2 += '];\n//module.exports = missionItems;\n';
         await fs.writeFile(filename, data2);

tabs/mission_control.js

@@ -392,7 +392,10 @@ TABS.mission_control.initialize = function (callback) {
 
     //////////////////////////////////////////////////////////////////////////////////////////////
     //      define & init Waypoints parameters
-    //////////////////////////////////////////////////////////////////////////////////////////////    
+    //////////////////////////////////////////////////////////////////////////////////////////////   
+    // buzz todo need ot understand diff between global MISSION_PLANER and this var..
+    // this 'var mission =' is updated/modifled/adjusted by the user in the GUI , NOT the drone.
+    //    and i think MISSION_PLANER is used for the drone to read/write from/to.
     var mission = new WaypointCollection();
 
     //////////////////////////////////////////////////////////////////////////////////////////////
@@ -1843,14 +1846,14 @@ TABS.mission_control.initialize = function (callback) {
     //
     /////////////////////////////////////////////
     function getWaypointsFromFC() {
-        mspHelper.loadWaypoints();
+        mspHelper.loadWaypoints(); // getWaypointsFromFC
         setTimeout(function(){
             mission.reinit();
             mission.copy(MISSION_PLANER);
             mission.update(true);
             redrawLayers();
             updateTotalInfo();
-        }, 2000);
+        }, 5000);
     }
 
     function sendWaypointsToFC() {