Changeset 695 for BAORadio/libindi/libindi/BAOcontrol/baocontrol.cpp

Timestamp:

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

Author:

frichard

Message:

 

File:

• BAORadio/libindi/libindi/BAOcontrol/baocontrol.cpp (modified) (12 diffs)

BAORadio/libindi/libindi/BAOcontrol/baocontrol.cpp

@@ -20 +20 @@
 {
     float a1, a2, a3;
-    
+
     char *Version;
 
@@ -29 +29 @@
 
     // Affichage de la version du programme
-    
+
     Version = new char[1000];
 
@@ -40 +40 @@
  *        franckrichard033@gmail.com      *\n \
  ******************************************\n\n\n", VERSION, VERSION_DATE);
-    
+
     AfficherLog(Version, true);
-    
+
     delete [] Version;
 
@@ -145 +145 @@
 
 
-
     // Transfert de la latitude, longitude, pression, température à la classe Astro
 
@@ -154 +153 @@
 
 
-
-      //DefinirDateHeure(2012.0, 6.0, 29.0, 21.0, 56.0, 48.0);
-
+    //DefinirDateHeure(2012.0, 6.0, 29.0, 22.0, 39.0, 40.0);
+    //DefinirDateHeure(2012.0, 6.0, 29.0, 22.0, 49.0, 18.0);
+    //DefinirDateHeure(2012.0, 6.0, 29.0, 22.0, 57.0, 52.0);
+    //DefinirDateHeure(2012.0, 6.0, 29.0, 20.0, 59.0, 8.0);
+    //DefinirDateHeure(2012.0, 6.0, 29.0, 21.0, 55.0, 57.0);
 
 
@@ -164 +165 @@
     CalculTSL();
 
-
-      /*double c,d;
-      double e,f;
-      stringstream os;
-
-      os << "tsl=" << DHMS(GetTSL()*N180divPi, true)<< "  " << GetTSL() << "\n";
-
-      AfficherLog(os.str(), true);
-      os.str("");
-
-      // double a=15.0*(5.0+55.0/60.0+10.3/3600.0)*Pidiv180;
-      // double b=(7.0+24.0/60.0+25.0/3600.0)*Pidiv180;
-
-      //  double a=15.0*(6.0+45.0/60.0+8.7/3600.0)*Pidiv180;
-      //double b=-(16.0+43.0/60.0+0.3/3600.0)*Pidiv180;
-
-      //double a=15.0*(5.0+55.0/60.0+50.0/3600.0)*Pidiv180;
-      //double b=(7.0+24.0/60.0+30.0/3600.0)*Pidiv180;
-
-      //  double a=15.0*(23.0+7.0/60.0+8.0/3600.0)*Pidiv180;
-      // double b=(59.0+29.0/60.0+12.0/3600.0)*Pidiv180;
-
-      double a=15.0*(14.0+15.0/60.0+39.5/3600.0)*Pidiv180;
-      double b=(19.0+10.0/60.0+46.7/3600.0)*Pidiv180;
-
-      //CoordonneesHorairesDouble Soleil;
-
-      //CalculARDecSoleil(&Soleil);
-
-      //a=Soleil.ar;
-      //b=Soleil.dec;
-      // Precession(&a, &b);
-      // NutationEtoile(&a, &b);
-
-      //  AberrationAnnuelle(&a, &b);
-      
-      os << "ad=" << a << "   de=" << b  << "\n";
-
-      Azimut(a,b,&c,&d);
-      
-      c += 2.91488 * Pidiv180;
-      d -= 8.08241 * Pidiv180;
-      
-      AzHa2ADDe(c, d, &a, &b);
-      
-      os << "ad=" << DHMS(a*N180divPi, true) << "   de=" << DHMS(b*N180divPi, false) << "\n";
-      os << "ad=" << a << "   de=" << b  << "\n";
-
-      AfficherLog(os.str(), true);
-
-      Azimut(a,b,&c,&d);
-      
-      os.str("");
-
-      os << "az=" << DHMS(c*N180divPi, false)<< "   ha=" << DHMS(d*N180divPi, false) << "\n";
-
-      AfficherLog(os.str(), true);*/
-
-   
+    /*
+    double a, b, c,d, a22, b22, c22, d22;
+    double e,f;
+    stringstream os;
+
+    os << "tsl=" << DHMS(GetTSL()*N180divPi, true)<< "  " << GetTSL() << "\n";
+
+    AfficherLog(os.str(), true);
+    os.str("");
+
+    a=15.0*(18.0+36.0/60.0+56.3/3600.0)*Pidiv180;
+    b=(38.0+47.0/60.0+3.1/3600.0)*Pidiv180;
+    
+    a= 3.61082;
+    b=0.860677;
+    a22=3.39278;
+    b22=0.844504;
+
+    a= 4.87356;
+    b=0.676912;
+    a22=4.94645;
+    b22=0.577727;
+
+    a= 5.41677;
+    b=0.790291;
+    a22=5.55106;
+    b22=0.699053;
+    
+    a=4.87356;
+    b=0.676912;
+    a22=4.97375;
+    b22=0.579795;
+
+    
+    a=3.73351;
+    b=0.334748;
+    a22=3.61661;
+    b22=0.241758;
+    
+
+    //a=15.0*(18.0+37.0/60.0+22.0/3600.0)*Pidiv180;
+    //b=(38.0+47.0/60.0+43.0/3600.0)*Pidiv180;
+
+    //CoordonneesHorairesDouble Soleil;
+
+    //CalculARDecSoleil(&Soleil);
+
+    //a=Soleil.ar;
+    //b=Soleil.dec;
+    //Precession(&a, &b);
+    //NutationEtoile(&a, &b);
+
+    //AberrationAnnuelle(&a, &b);
+
+    os << "ad=" << DHMS(a*N180divPi, true) << "   de=" << DHMS(b*N180divPi, false) << "\n";
+    os << "ad=" << a << "   de=" << b  << "\n";
+
+    Alignement *al;
+
+    al=new Alignement();
+
+    Azimut(a, b, &c, &d);
+    Azimut(a22, b22, &c22, &d22);
+
+    double ec1 = (c-c22)/PasDeltaAz;
+    double ec2=  (d-d22)/PasDeltaHa;
+
+    os << "nb de pas   az=" << ec1 << "  ha=" << ec2 << "\n";
+
+    double c3= VerifAngle((c * N180divPi * 4000.0/360.0 + ec1) * (360.0 / 4000.0) * Pidiv180 );
+
+    double   d3 = al->Motor2Alt(al->Alt2Motor(d * N180divPi) + ec2) * Pidiv180;
+
+    double sp=DistanceAngulaireEntre2Points(c, d, c3, d3) *N180divPi;
+
+    os << "sep=" << sp << "°    dist haut=" << (d-d3)*N180divPi <<"\n";
+
+    AzHa2ADDe(c3, d3, &a, &b);
+
+    os << "ad=" << DHMS(a*N180divPi, true) << "   de=" << DHMS(b*N180divPi, false) << "\n";
+    os << "ad=" << a << "   de=" << b  << "\n";
+
+    AfficherLog(os.str(), true);
+
+    Azimut(a,b,&c,&d);
+
+    os.str("");
+
+    os << "az=" << DHMS(c*N180divPi, false)<< "   ha=" << DHMS(d*N180divPi, false) << "\n";
+
+    delete al;
+
+    AfficherLog(os.str(), true);
+    */
+    
 
 
@@ -244 +281 @@
 
     Connect(true);
-   
+
 }
 
@@ -535 +572 @@
     struct tm date;
     struct timeval tv;
- 
+
     // On récupÚre la date et l'heure depuis l'horloge du systÚme
 
@@ -556 +593 @@
     // On lance les calculs (Temps sidéral local etc...)
 
-    CalculTSL();  
+    CalculTSL();
 }
 
@@ -1012 +1049 @@
             return true;
         }
+        
+        if (commande == "R")
+        {
+            if (!VerifReponse("Reinitialisation de la matrice de correction", Message))
+            {
+                ErreurLog("Pas de réponse de l'antenne à la requête R.\n\n");
+
+                return false;
+            }
+
+            return true;
+        }
 
         if (!VerifReponse("name=\"COMMAND_SET\" state=\"Ok\"", NULL))
@@ -1655 +1704 @@
             // et donc la magnitude < MAGNITUDEMAXETOILESCALIBRATION
 
-            if ( Etoiles[i].selectionnee = ((Etoiles[i].ha > (HAUTMIN + 5.0) * Pidiv180) && (Etoiles[i].mag < MAGNITUDEMAXETOILESCALIBRATION)) )
+            if ( Etoiles[i].selectionnee = ((Etoiles[i].ha > (HAUTMIN + 5.0 ) * Pidiv180) && (Etoiles[i].mag < MAGNITUDEMAXETOILESCALIBRATION)) )
             {
                 os.width(20);
@@ -2114 +2163 @@
             case 'o' :
                 commande[0]='O';
+                break;
+            case 'r' :
+                commande[0]='R';
                 break;
             }