Correct axes and device detection method

Author: Ilia Platone

line.cpp

@@ -296,14 +296,26 @@ Line::Line(QString ln, int n, QSettings *s, QWidget *pw, QList<Line*> *p) :
         MountMotorIndex = value;
         if(ahp_gt_is_connected()) {
             ahp_gt_select_device(MountMotorIndex);
-            if(ahp_gt_is_detected(Ra)) {
+            if(ahp_gt_is_detected()) {
+                altaz = false;
                 fork = false;
+                if(ahp_gt_axis_is_detected(Ra)) {
+                    if((ahp_gt_get_features(Ra) & isAZEQ) != 0) {
+                        altaz |= true;
+                    }
+                }
+                if(ahp_gt_axis_is_detected(Dec)) {
+                    if((ahp_gt_get_features(Dec) & isAZEQ) != 0) {
+                        altaz |= true;
+                    }
+                }
                 if((ahp_gt_get_mount_flags() & isForkMount) != 0) {
                     fork = true;
                 }
                 switch (ahp_gt_get_mount_type()) {
-                case isMF:
                 case isDOB:
+                    altaz = true;
+                case isMF:
                     fork = true;
                     break;
                 default:
@@ -414,7 +426,7 @@ void Line::runClicked(bool checked)
 void Line::updateLocation()
 {
     if(ahp_gt_is_connected()) {
-        if(ahp_gt_is_detected(getRailIndex())) {
+        if(ahp_gt_axis_is_detected(getRailIndex())) {
             ahp_gt_select_device(getRailIndex());
             if(ahp_gt_is_axis_moving(RailX)) {
                 double x = ahp_gt_get_position(RailX, nullptr);
@@ -464,7 +476,7 @@ void Line::setLocation(int value)
             targetLocation()->xyz.z = xyz_locations[current_location].xyz.z;
             if(update_location) {
                 if(ahp_gt_is_connected()) {
-                    if(ahp_gt_is_detected(getRailIndex())) {
+                    if(ahp_gt_axis_is_detected(getRailIndex())) {
                         ahp_gt_select_device(getRailIndex());
                         ahp_gt_goto_absolute(RailX, xyz_locations[current_location].xyz.x*2.0*M_PI/ahp_gt_get_totalsteps(RailX)/1000, M_PI * 2 * 800.0 / SIDEREAL_DAY);
                         ahp_gt_goto_absolute(RailY, xyz_locations[current_location].xyz.y*2.0*M_PI/ahp_gt_get_totalsteps(RailY)/1000, M_PI * 2 * 800.0 / SIDEREAL_DAY);
@@ -483,7 +495,7 @@ void Line::updateRa()
     if(stream != nullptr)
     {
         if(ahp_gt_is_connected()) {
-            if(ahp_gt_is_detected(getMountIndex())) {
+            if(ahp_gt_axis_is_detected(getMountIndex())) {
                 double v = ahp_gt_get_position(0, nullptr);
                 v *= 12.0;
                 v /= M_PI;
@@ -498,7 +510,7 @@ void Line::updateDec()
     if(stream != nullptr)
     {
         if(ahp_gt_is_connected()) {
-            if(ahp_gt_is_detected(getMountIndex())) {
+            if(ahp_gt_axis_is_detected(getMountIndex())) {
                 double v = ahp_gt_get_position(1, nullptr);
                 v *= 180.0;
                 v /= M_PI;
@@ -562,7 +574,7 @@ bool Line::isRailBusy()
     if(stream != nullptr)
     {
         if(ahp_gt_is_connected()) {
-            if(ahp_gt_is_detected(getRailIndex())) {
+            if(ahp_gt_axis_is_detected(getRailIndex())) {
                 bool busy = ahp_gt_is_axis_moving(RailX);
                 busy |= ahp_gt_is_axis_moving(RailY);
                 busy |= ahp_gt_is_axis_moving(RailZ);
@@ -578,7 +590,7 @@ bool Line::isMountBusy()
     if(stream != nullptr)
     {
         if(ahp_gt_is_connected()) {
-            if(ahp_gt_is_detected(getMountIndex())) {
+            if(ahp_gt_axis_is_detected(getMountIndex())) {
                 bool busy = ahp_gt_is_axis_moving(Ra);
                 busy |= ahp_gt_is_axis_moving(Dec);
                 return busy;
@@ -590,7 +602,7 @@ bool Line::isMountBusy()
 
 void Line::gotoRaDec(double ra, double dec) {
     if(ahp_gt_is_connected()) {
-        if(ahp_gt_is_detected(getMountIndex())) {
+        if(ahp_gt_axis_is_detected(getMountIndex())) {
             ahp_gt_select_device(getMountIndex());
             ahp_gt_set_location(Latitude, Longitude, Elevation);
             ahp_gt_goto_radec(ra, dec);
@@ -600,7 +612,7 @@ void Line::gotoRaDec(double ra, double dec) {
 
 void Line::startTracking() {
     if(ahp_gt_is_connected()) {
-        if(ahp_gt_is_detected(getMountIndex())) {
+        if(ahp_gt_axis_is_detected(getMountIndex())) {
             Line::motor_lock();
             ahp_gt_select_device(getMountIndex());
             ahp_gt_stop_motion(Ra, 1);
@@ -612,7 +624,7 @@ void Line::startTracking() {
 
 void Line::startSlewing(double ra_rate, double dec_rate) {
     if(ahp_gt_is_connected()) {
-        if(ahp_gt_is_detected(getMountIndex())) {
+        if(ahp_gt_axis_is_detected(getMountIndex())) {
             Line::motor_lock();
             ahp_gt_select_device(getMountIndex());
             if(ra_rate != 0.0) {
@@ -630,14 +642,14 @@ void Line::startSlewing(double ra_rate, double dec_rate) {
 
 void Line::haltMotors() {
     if(ahp_gt_is_connected()) {
-        if(ahp_gt_is_detected(getMountIndex())) {
+        if(ahp_gt_axis_is_detected(getMountIndex())) {
             Line::motor_lock();
             ahp_gt_select_device(getMountIndex());
             ahp_gt_stop_motion(Ra, 1);
             ahp_gt_stop_motion(Dec, 1);
             Line::motor_unlock();
         }
-        if(ahp_gt_is_detected(getRailIndex())) {
+        if(ahp_gt_axis_is_detected(getRailIndex())) {
             Line::motor_lock();
             ahp_gt_select_device(getRailIndex());
             ahp_gt_stop_motion(RailX, 1);

line.h

@@ -452,6 +452,7 @@ class Line : public QWidget
         bool scanning { false };
         bool flipped { false };
         bool scalingDone { false };
+        bool altaz { false };
         bool fork { false };
         void getMinMax();
         void plot(bool success, double o, double s);

mainwindow.cpp

@@ -117,19 +117,15 @@ bool MainWindow::svf_from_resources(QString json, QString svf, QString bsdl)
         s.close();
         if(!QFile::exists(svf)) return false;
         if(!QFile::exists(bsdl)) return false;
-        return false;
+        return true;
     }
     return false;
 }
 
 static void flash_svf(QStringList svf_list)
 {
-    QString cmd = "echo 'cable FT2232\ndetect\nfrequency "+QString::number(12000000)+"\n";
     for(QString svf : svf_list)
-        cmd+="svf "+svf+ "\n";
-    cmd+="'|jtag";
-    system(cmd.toStdString().c_str());
-    sleep(1);
+        program_jtag(svf.toUtf8(), "FT2232", NULL, 12000000);
     reset_by_vid_pid(0x0403, 0x6014);
 }
 
@@ -280,8 +276,12 @@ MainWindow::MainWindow(QWidget *parent)
     settings->beginGroup("Connection");
     ui->XCPort->clear();
     ui->XCPort->addItem(settings->value("xc_connection", "no connection").toString());
+    ui->XCPort->addItem("localhost:5760");
+    ui->XCPort->setCurrentIndex(0);
     ui->MotorPort->clear();
     ui->MotorPort->addItem(settings->value("motor_connection", "no connection").toString());
+    ui->MotorPort->addItem("localhost:9600");
+    ui->MotorPort->setCurrentIndex(0);
     settings->endGroup();
     QList<QSerialPortInfo> ports = QSerialPortInfo::availablePorts();
     for (int i = 0; i < ports.length(); i++)
@@ -290,24 +290,21 @@ MainWindow::MainWindow(QWidget *parent)
             ports[i].portName();
         if(portname != ui->XCPort->itemText(0) && ports[i].vendorIdentifier() == 0x403 && ports[i].productIdentifier() == 0x6014)
             ui->XCPort->addItem(portname);
-        if(portname != ui->MotorPort->itemText(0))
+        if(portname != ui->MotorPort->itemText(0) && ports[i].vendorIdentifier() == 0x1a86 && ports[i].productIdentifier() == 0x7523)
             ui->MotorPort->addItem(portname);
     }
+    settings->beginGroup("Firmware");
+    ui->firmware->addItem(settings->value("firmware", "Current").toString());
+    ui->firmware->addItem("Current");
     QStringList firmwares = CheckFirmware(url+"xc*");
     if(firmwares.count() > 0) {
         ui->firmware->clear();
         ui->firmware->addItem("Current");
-        ui->firmware->addItem("Erase");
         for (QString fw : firmwares)
             ui->firmware->addItem(fw.replace("firmware/", "").replace("-firmware.bin", ""));
     }
-    ui->firmware->setCurrentText(settings->value("firmware", "xc2").toString());
-    if(ui->XCPort->itemText(0) != "no connection")
-        ui->XCPort->addItem("no connection");
-    if(ui->MotorPort->itemText(0) != "no connection")
-        ui->MotorPort->addItem("no connection");
-    ui->XCPort->setCurrentIndex(0);
-    ui->MotorPort->setCurrentIndex(0);
+    ui->firmware->setCurrentIndex(0);
+    settings->endGroup();
     connect(ui->Run, static_cast<void (QPushButton::*)(bool)>(&QPushButton::clicked), this, &MainWindow::runClicked);
     connect(ui->Mode, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
             [ = ](int index)
@@ -419,7 +416,7 @@ MainWindow::MainWindow(QWidget *parent)
         (void)checked;
         int port = 5760;
         QString address = "localhost";
-        QString xcport, motorport, controlport;
+        QString xcport, motorport;
         xcport = ui->XCPort->currentText();
         motorport = ui->MotorPort->currentText();
         settings->beginGroup("Connection");
@@ -429,18 +426,18 @@ MainWindow::MainWindow(QWidget *parent)
         ui->XCPort->setEnabled(false);
         if(ui->firmware->currentText() == "Current") goto skip_download;
         has_svf_firmware = false;
-        if (DownloadFirmware(url+ui->firmware->currentText(), svf_filename, bsdl_filename, 3000)){
+        if (DownloadFirmware(url+ui->firmware->currentText(), svf_filename, bsdl_filename, 10000)){
             has_svf_firmware = true;
         } else if(svf_from_resources(ui->firmware->currentText(), svf_filename, bsdl_filename)){
             has_svf_firmware = true;
         }
         if(has_svf_firmware) {
-            //svf_from_resources("Erase", erase_svf_filename, erase_svf_filename);
             flash_svf(QStringList({svf_filename}));
+            settings->setValue("firmware", ui->firmware->currentText());
             ui->firmware->setEnabled(true);
             ui->Connect->setEnabled(true);
             ui->XCPort->setEnabled(true);
-        }
+        } else goto err_exit;
         skip_download:
         xcFD = -1;
         xc_local_port = false;
@@ -762,7 +759,7 @@ MainWindow::MainWindow(QWidget *parent)
                     }
                 }
                 ahp_xc_set_correlation_order(1);
-                npackets = ahp_xc_scan_autocorrelations(requests.toVector().data(), requests.count(), &spectrum, &threadsStopped, &percent);
+                npackets = ahp_xc_scan_correlations(requests.toVector().data(), requests.count(), &spectrum, &threadsStopped, &percent);
                 if(npackets == 0)
                     break;
                 for(int x = 0; x < Lines.count(); x++)

polytope.cpp

@@ -441,7 +441,7 @@ void Polytope::stackCorrelations()
         line->resetStopPtr();
         line->setLocation();
     }
-    npackets = ahp_xc_scan_crosscorrelations(requests.toVector().data(), requests.length(), &spectrum, stop, percent);
+    npackets = ahp_xc_scan_correlations(requests.toVector().data(), requests.length(), &spectrum, stop, percent);
     if(spectrum != nullptr && npackets > 0)
     {
         setSpectrumSize(npackets);