Changeset 695 for BAORadio/libindi/libindi/BAOTest/BAOtest_main.cpp

Timestamp:

Sep 28, 2012, 2:14:03 PM (12 years ago)

Author:

frichard

Message:

 

File:

• BAORadio/libindi/libindi/BAOTest/BAOtest_main.cpp (modified) (6 diffs)

BAORadio/libindi/libindi/BAOTest/BAOtest_main.cpp

@@ -18 +18 @@
 #include <netinet/in.h>
 
+//#define POSITIONS_DIRECT  
+
 using namespace std;
+
 
 
@@ -74 +77 @@
         result.y=atoi(str.substr(7, 4).c_str());
 
-        if (str[1]=='f') result.x=-result.x;
+        if (str[1]=='f') result.x=-result.x;
 
         if (str[6]=='f') result.y=-result.y;
@@ -129 +132 @@
 int main ( int argc, char *argv[] )
 {
-    Position Pos, NouvPos;
+    Position Pos, Pos2, NouvPos;
     char cIP;
     char IP[20];
@@ -188 +191 @@
                 strcpy(chaine, "");
 
-
+#ifndef POSITIONS_DIRECT
                 if (abs(Pos.x - NouvPos.x) < 5 )
                 {
@@ -208 +211 @@
                     Pos.y -= (NouvPos.y - Pos.y) / 6.0;
                 }
+#endif
+                
 
                 if (ErreursAleatoires) Aleat=rand()%ERREURS != 1;
@@ -235 +240 @@
                 if (asks.find("G")!=string::npos)
                 {
-
-                    NouvPos = ExtractPosition2(asks);
+#ifndef POSITIONS_DIRECT
+                 NouvPos = ExtractPosition2(asks);
 
                         NouvPos.x += Pos.x;
                         NouvPos.y += Pos.y;
-                   
-
+#else 
+               
+               Pos2 = ExtractPosition2(asks);
+               Pos.x-=Pos2.x;
+               Pos.y-=Pos2.y;
+#endif
                     strcpy(chaine,"ACK/GOTO/\n");
                     client_socket << chaine;