diff --git a/src/Djitellowhite/Hardwarelistener.h b/src/Djitellowhite/Hardwarelistener.h index 176cde8..599fa82 100644 --- a/src/Djitellowhite/Hardwarelistener.h +++ b/src/Djitellowhite/Hardwarelistener.h @@ -1,6 +1,6 @@ #ifndef _HARDWARELISTENER_H #define _HARDWARELISTENER_H - -int listenkeyboard(); +#include "Djitellowhite.h" +int listenkeyboard(Tello T,sockaddr_in serveraddr); int scanKeyboard(); #endif diff --git a/src/Djitellowhite/Triplet.cpp b/src/Djitellowhite/Triplet.cpp index 1456006..9c0ef65 100644 --- a/src/Djitellowhite/Triplet.cpp +++ b/src/Djitellowhite/Triplet.cpp @@ -40,6 +40,6 @@ int main(void){ //T.land(serveraddr); pthread_join(thread_receive,NULL); - listenkeyboard(); + listenkeyboard(T,serveraddr); return 0; } diff --git a/src/Djitellowhite/keyboard.cpp b/src/Djitellowhite/keyboard.cpp index 3006537..dcf3ade 100644 --- a/src/Djitellowhite/keyboard.cpp +++ b/src/Djitellowhite/keyboard.cpp @@ -2,6 +2,7 @@ #include #include "Hardwarelistener.h" #include + using namespace std; int scanKeyboard() { @@ -26,21 +27,25 @@ int scanKeyboard() } //测试函数 -int listenkeyboard(){ +int listenkeyboard(Tello T, sockaddr_in serveraddr){ while(1){ switch(scanKeyboard()) { case (int)'w': cout << "forward"<< endl; + T.forward(serveraddr); break; case (int)'s': cout << "back" << endl; + T.back(serveraddr); break; case (int)'a': cout << "left" <