bradybod-usu/tello_drone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing a stash issue

Browse Source
This commit is contained in:
bbod
2019-09-11 12:33:34 -06:00
parent 10ccd0258b
commit 58a197afbd
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Tello Drone/DroneComands.cs
View File

@@ -35,23 +35,13 @@ namespace Tello_Drone
private void SendCommand(string message) private void SendCommand(string message)
{ {
<<<<<<< Updated upstream
_udpClient.TrySend(message, 5_000, 3); _udpClient.TrySend(message, 5_000, 3);
=======
var returnValue = _udpClient.TrySend(message, 5_000, 3);
if (returnValue == false)
SendCommand("land");
>>>>>>> Stashed changes
} }
private bool TrySendCommand(string message) private bool TrySendCommand(string message)
{ {
<<<<<<< Updated upstream
return _udpClient.TrySend(message, 20_000, 3); return _udpClient.TrySend(message, 20_000, 3);
=======
return _udpClient.TrySend(message, 5_000, 3);
>>>>>>> Stashed changes
} }
} }
} }

5
Tello Drone/Missions.cs
View File

@@ -33,15 +33,10 @@ namespace Tello_Drone
MissionSetup(); MissionSetup();
_drone.BackFlip(); _drone.BackFlip();
_drone.FrontFlip(); _drone.FrontFlip();
<<<<<<< Updated upstream
_drone.Reverse(300); _drone.Reverse(300);
_drone.Forward(66); _drone.Forward(66);
_drone.Up(20); _drone.Up(20);
MissionTeardown(); MissionTeardown();
=======
_drone.Forward(30);
_drone.Land();
>>>>>>> Stashed changes
} }
private void MissionSetup() private void MissionSetup()