Changeset 81 in flair-src for branches/mavlink/tools/Controller/Mavlink/src

Timestamp:

Sep 21, 2016, 3:07:48 PM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Add lat, lon and alt fields + adapt processing of MissionSend

Location:

branches/mavlink/tools/Controller/Mavlink/src

Files:

• GuiGcs.cpp (modified) (1 diff)
• GuiInterface.cpp (modified) (2 diffs)
• GuiInterface.h (modified) (1 diff)

branches/mavlink/tools/Controller/Mavlink/src/GuiGcs.cpp

@@ -106 +106 @@
     // Parse param3
     float param3 = std::stof(missionCommand.substr(0, missionCommand.find(delimiter)));
+    missionCommand.erase(0, missionCommand.find(delimiter) + delimiter.length());
+    // Parse latitude
+    float latitude = std::stof(missionCommand.substr(0, missionCommand.find(delimiter)));
+    missionCommand.erase(0, missionCommand.find(delimiter) + delimiter.length());
+    // Parse longitude
+    float longitude = std::stof(missionCommand.substr(0, missionCommand.find(delimiter)));
+    missionCommand.erase(0, missionCommand.find(delimiter) + delimiter.length());
+    // Parse altitude
+    float altitude = std::stof(missionCommand.substr(0, missionCommand.find(delimiter)));
+    missionCommand.erase(0, missionCommand.find(delimiter) + delimiter.length());
     // cout << "[INFO] Mission item commands : " << command << ", " << param1 << ", " << param2 << ", " << param3 << std::endl;
-    mavCom->sendMissionItem(mavCom->target.getSysID(), mavCom->target.getCompID(), 0, MAV_FRAME_GLOBAL_RELATIVE_ALT, MavCommandGet(command), 0, 1, 0, 0, 0, 0, param1, param2, param3);
+    mavCom->sendMissionItem(mavCom->target.getSysID(), mavCom->target.getCompID(), 0, MAV_FRAME_GLOBAL_RELATIVE_ALT, MavCommandGet(command), 0, 1, param1, param2, param3, 0, latitude, longitude, altitude);
     mavCom->waitMissionAck(ACK_TIMEOUT);
   }

branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.cpp

@@ -74 +74 @@
   // comboCmd->AddItem("RETURN");
   // comboCmd->AddItem("JUMP");
-  param1Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param1",
-                                -90, 90, 0.5, 1, 3);
-  param2Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param2",
-                                -90, 90, 0.5, 1, 3);
-  param3Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param3",
-                                -90, 90, 0.5, 1, 3);
+  param1Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param1", -90, 90, 0.5, 1, 0);
+  latitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Longitude", -90, 90, 0.5, 1, 1.5);
+  param2Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param2", -90, 90, 0.5, 1, 0);
+  longitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Latitude", -90, 90, 0.5, 1, -1.5);
+  param3Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param3", -90, 90, 0.5, 1, 0);
+  altitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Altitude", -90, 90, 0.5, 1, 2);
   btnAddMissionCmd = new PushButton(addCmdGroupBox->NewRow(), "Add mission cmd");
   btnDelMissionCmd = new PushButton(addCmdGroupBox->LastRowLastCol(), "Del mission cmd");
@@ -145 +145 @@
   stringStream.precision(1);
   stringStream << fixed;
-  stringStream << commandsAvailable[comboCmd->CurrentIndex()] << "|" << param1Field->Value() << "|" << param2Field->Value() << "|" << param3Field->Value();
+  stringStream << commandsAvailable[comboCmd->CurrentIndex()] << "|" << param1Field->Value() << "|" << param2Field->Value() \
+               << "|" << param3Field->Value() << "|" << latitudeField->Value() << "|" << longitudeField->Value() << "|" << altitudeField->Value();
   return stringStream.str();
 }

branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.h

@@ -77 +77 @@
   flair::gui::DoubleSpinBox* param1Field;
   flair::gui::DoubleSpinBox* param2Field;
-  flair::gui::DoubleSpinBox* param3Field;  
+  flair::gui::DoubleSpinBox* param3Field;
+  flair::gui::DoubleSpinBox* latitudeField;
+  flair::gui::DoubleSpinBox* longitudeField;
+  flair::gui::DoubleSpinBox* altitudeField;
   flair::gui::PushButton* btnAddMissionCmd;
   flair::gui::PushButton* btnDelMissionCmd;