Update json files

Author: Ilia Platone

CMakeLists.txt

@@ -30,7 +30,7 @@ set(AHP_XC_GUI_VERSION "${AHP_XC_GUI_VERSION_MAJOR}.${AHP_XC_GUI_VERSION_MINOR}.
 #endif()
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 
-find_package(Qt5 COMPONENTS Widgets Network SerialPort Charts Network REQUIRED)
+find_package(Qt5 COMPONENTS Widgets Network SerialPort Charts REQUIRED)
 find_package(Threads REQUIRED)
 find_package(AHPXC REQUIRED)
 find_package(AHPGT REQUIRED)

Erase.json

@@ -1,4 +1,5 @@
 IDI_ICON1               ICON        DISCARDABLE            "icon.ico"
+IDI_DATA1               TEXT        DISCARDABLE            "Erase.json"
 IDI_DATA1               TEXT        DISCARDABLE            "xc1.json"
 IDI_DATA1               TEXT        DISCARDABLE            "xc2.json"
 IDI_DATA1               TEXT        DISCARDABLE            "xc4.json"

app.rc

@@ -32,6 +32,8 @@
 
 const double graph_ratio = 0.75;
 
+
+QMutex(MainWindow::vlbi_mutex);
 vlbi_context context[vlbi_total_contexts];
 double coverage_delegate(double x, double y)
 {
@@ -40,6 +42,16 @@ double coverage_delegate(double x, double y)
     return 1.0;
 }
 
+static char *strrand(int len)
+{
+    int i;
+    char* ret = (char*)malloc(len+1);
+    for(i = 0; i < len; i++)
+        ret[i] = 'a' + (rand() % 21);
+    ret[i] = 0;
+    return ret;
+}
+
 static int32_t reset_by_vid_pid(int vid, int pid)
 {
     int rc = 0;
@@ -66,26 +78,61 @@ static int32_t reset_by_vid_pid(int vid, int pid)
     return rc;
 }
 
-static void flash_svf(QString svf, QString bsdl)
+bool MainWindow::svf_from_resources(QString json, QString svf, QString bsdl)
 {
-    QString cmd = "echo 'cable FT2232\nbsdl path "+bsdl+"\ndetect\nfrequency "+QString::number(12000000)+"\nsvf "+svf+"'|jtag";
-    system(cmd.toStdString().c_str());
-    sleep(1);
-    reset_by_vid_pid(0x0403, 0x6014);
+    QByteArray bin;
+    if(QFile::exists(":/data/"+json+".json")) {
+        QFile s(":/data/"+json+".json");
+        s.open(QIODevice::ReadOnly);
+        if(s.isOpen()) {
+            if(QFile::exists(svf)) unlink(svf.toStdString().c_str());
+            if(QFile::exists(bsdl)) unlink(bsdl.toStdString().c_str());
+            QJsonDocument doc = QJsonDocument::fromJson(s.readAll());
+            QJsonObject obj = doc.object();
+            QString base64;
+            base64 = obj["data"].toString();
+            bin = QByteArray::fromBase64(base64.toStdString().c_str());
+            if(bin.length() == 0) {
+                goto res_end;
+            }
+            QFile svf_file(svf);
+            svf_file.open(QIODevice::WriteOnly);
+            if(svf_file.isOpen()) {
+                svf_file.write(bin, bin.length());
+                svf_file.close();
+            }
+            base64 = obj["image"].toString();
+            bin = QByteArray::fromBase64(base64.toStdString().c_str());
+            if(bin.length() == 0) {
+                goto res_end;
+            }
+            QFile bsdl_file(bsdl);
+            bsdl_file.open(QIODevice::WriteOnly);
+            if(bsdl_file.isOpen()) {
+                bsdl_file.write(bin, bin.length());
+                bsdl_file.close();
+            }
+        }
+    res_end:
+        s.close();
+        if(!QFile::exists(svf)) return false;
+        if(!QFile::exists(bsdl)) return false;
+        return false;
+    }
+    return false;
 }
 
-static char *strrand(int len)
+static void flash_svf(QStringList svf_list)
 {
-    int i;
-    char* ret = (char*)malloc(len+1);
-    for(i = 0; i < len; i++)
-        ret[i] = 'a' + (rand() % 21);
-    ret[i] = 0;
-    return ret;
+    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);
+    reset_by_vid_pid(0x0403, 0x6014);
 }
 
-QMutex(MainWindow::vlbi_mutex);
-
 QStringList MainWindow::CheckFirmware(QString url, int timeout_ms)
 {
     QByteArray list;
@@ -119,7 +166,7 @@ QStringList MainWindow::CheckFirmware(QString url, int timeout_ms)
     return QStringList();
 }
 
-bool MainWindow::DownloadFirmware(QString url, QString svf, QString bsdl, QSettings *settings, int timeout_ms)
+bool MainWindow::DownloadFirmware(QString url, QString svf, QString bsdl, int timeout_ms)
 {
     QByteArray bin;
     url+="&download=on";
@@ -128,34 +175,38 @@ bool MainWindow::DownloadFirmware(QString url, QString svf, QString bsdl, QSetti
     QTimer timer;
     timer.setSingleShot(true);
     QEventLoop loop;
-    connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-    connect(response, SIGNAL(finished()), &loop, SLOT(quit()));
+    QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+    QObject::connect(response, SIGNAL(finished()), &loop, SLOT(quit()));
     timer.start(timeout_ms);
     loop.exec();
-    QString base64 = settings->value("firmware-"+svf, "").toString();
     if(response->error() == QNetworkReply::NetworkError::NoError) {
-        if(QFile::exists(svf)) unlink(svf.toUtf8());
-        if(QFile::exists(bsdl)) unlink(bsdl.toUtf8());
+        if(QFile::exists(svf)) unlink(svf.toStdString().c_str());
+        if(QFile::exists(bsdl)) unlink(bsdl.toStdString().c_str());
         QJsonDocument doc = QJsonDocument::fromJson(response->readAll());
         QJsonObject obj = doc.object();
+        QString base64;
         base64 = obj["data"].toString();
-        if(base64.isNull() || base64.isEmpty()) {
+        bin = QByteArray::fromBase64(base64.toStdString().c_str());
+        if(bin.length() == 0) {
             goto dl_end;
         }
-        bin = QByteArray::fromBase64(base64.toUtf8());
         QFile svf_file(svf);
         svf_file.open(QIODevice::WriteOnly);
-        svf_file.write(bin, bin.length());
-        svf_file.close();
+        if(svf_file.isOpen()) {
+            svf_file.write(bin, bin.length());
+            svf_file.close();
+        }
         base64 = obj["image"].toString();
-        if(base64.isNull() || base64.isEmpty()) {
+        bin = QByteArray::fromBase64(base64.toStdString().c_str());
+        if(bin.length() == 0) {
             goto dl_end;
         }
-        bin = QByteArray::fromBase64(base64.toUtf8());
         QFile bsdl_file(bsdl);
         bsdl_file.open(QIODevice::WriteOnly);
-        bsdl_file.write(bin, bin.length());
-        bsdl_file.close();
+        if(bsdl_file.isOpen()) {
+            bsdl_file.write(bin, bin.length());
+            bsdl_file.close();
+        }
     }
 dl_end:
     response->deleteLater();
@@ -191,7 +242,9 @@ MainWindow::MainWindow(QWidget *parent)
     settings = new QSettings(ini, QSettings::Format::IniFormat);
     QString url = "https://www.iliaplatone.com/firmware.php?product=";
     bsdl_filename = homedir + dir_separator + strrand(32) + ".bsm";
-    svf_filename = homedir + dir_separator + strrand(32);
+    svf_filename = homedir + dir_separator + strrand(32) + ".svf";;
+    erase_bsdl_filename = homedir + dir_separator + strrand(32) + ".bsm";
+    erase_svf_filename = homedir + dir_separator + strrand(32) + ".svf";;
     stdout_filename = homedir + dir_separator + QDateTime::currentDateTimeUtc().toString(Qt::DateFormat::ISODate).replace(":", "") + ".log";
 
     connected = false;
@@ -243,6 +296,8 @@ MainWindow::MainWindow(QWidget *parent)
     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", ""));
     }
@@ -372,46 +427,21 @@ MainWindow::MainWindow(QWidget *parent)
         ui->firmware->setEnabled(false);
         ui->Connect->setEnabled(false);
         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, settings))
+        if (DownloadFirmware(url+ui->firmware->currentText(), svf_filename, bsdl_filename, 3000)){
+            has_svf_firmware = true;
+        } else if(svf_from_resources(ui->firmware->currentText(), svf_filename, bsdl_filename)){
             has_svf_firmware = true;
-        else {
-            QFile svf_file(svf_filename);
-            svf_file.open(QIODevice::ReadWrite);
-            QFile bsdl_file(bsdl_filename);
-            bsdl_file.open(QIODevice::ReadWrite);
-            if(svf_file.isOpen() && bsdl_file.isOpen()) {
-                QFile s(":/data/"+ui->firmware->currentText()+".json");
-                s.open(QIODevice::ReadOnly);
-                if(s.isOpen()) {
-                    QJsonDocument doc = QJsonDocument::fromJson(s.readAll());
-                    QJsonObject obj = doc.object();
-                    QString base64 = obj["data"].toString();
-                    if(base64.isNull() || base64.isEmpty()) {
-                        has_svf_firmware = false;
-                    } else {
-                        has_svf_firmware = true;
-                        svf_file.write(QByteArray::fromBase64(base64.toUtf8()));
-                    }
-                    base64 = obj["image"].toString();
-                    if(base64.isNull() || base64.isEmpty()) {
-                        has_bsdl = false;
-                    } else {
-                        has_bsdl = true;
-                        bsdl_file.write(QByteArray::fromBase64(base64.toUtf8()));
-                    }
-                    s.close();
-                }
-                svf_file.close();
-                bsdl_file.close();
-            }
         }
         if(has_svf_firmware) {
-            flash_svf(svf_filename, bsdl_filename);
+            //svf_from_resources("Erase", erase_svf_filename, erase_svf_filename);
+            flash_svf(QStringList({svf_filename}));
             ui->firmware->setEnabled(true);
             ui->Connect->setEnabled(true);
             ui->XCPort->setEnabled(true);
         }
+        skip_download:
         xcFD = -1;
         xc_local_port = false;
         if(xcport == "no connection")
@@ -732,7 +762,7 @@ MainWindow::MainWindow(QWidget *parent)
                     }
                 }
                 ahp_xc_set_correlation_order(1);
-                npackets = ahp_xc_scan_correlations(requests.toVector().data(), requests.count(), &spectrum, &threadsStopped, &percent);
+                npackets = ahp_xc_scan_autocorrelations(requests.toVector().data(), requests.count(), &spectrum, &threadsStopped, &percent);
                 if(npackets == 0)
                     break;
                 for(int x = 0; x < Lines.count(); x++)

mainwindow.cpp

@@ -256,6 +256,8 @@ class MainWindow : public QMainWindow
         }
 
         QString homedir;
+        QString erase_bsdl_filename;
+        QString erase_svf_filename;
         QString bsdl_filename;
         QString svf_filename;
         QString dfu_filename;
@@ -273,8 +275,9 @@ class MainWindow : public QMainWindow
         bool enable_vlbi {false};
         bool has_svf_firmware {false};
         bool has_bsdl {false};
+        bool svf_from_resources(QString json_filename, QString svf_filename, QString bsdl_filename);
         QStringList CheckFirmware(QString url, int timeout_ms = 30000);
-        bool DownloadFirmware(QString url, QString svf, QString bsdl, QSettings *settings, int timeout_ms = 30000);
+        bool DownloadFirmware(QString url, QString svf, QString bsdl, int timeout_ms = 30000);
         QString base64;
         int currentVoltage {0};
         FILE *f_stdout;

mainwindow.h

@@ -256,6 +256,16 @@
       <height>25</height>
      </rect>
     </property>
+    <item>
+     <property name="text">
+      <string>Current</string>
+     </property>
+    </item>
+    <item>
+     <property name="text">
+      <string>Erase</string>
+     </property>
+    </item>
     <item>
      <property name="text">
       <string>xc1</string>

mainwindow.ui

@@ -441,7 +441,7 @@ void Polytope::stackCorrelations()
         line->resetStopPtr();
         line->setLocation();
     }
-    npackets = ahp_xc_scan_correlations(requests.toVector().data(), requests.length(), &spectrum, stop, percent);
+    npackets = ahp_xc_scan_crosscorrelations(requests.toVector().data(), requests.length(), &spectrum, stop, percent);
     if(spectrum != nullptr && npackets > 0)
     {
         setSpectrumSize(npackets);
@@ -451,7 +451,7 @@ void Polytope::stackCorrelations()
             ahp_xc_correlation correlation;
             memcpy(&correlation, &spectrum[z].correlations[0], sizeof(ahp_xc_correlation));
             for(int o = 0; o < getCorrelationOrder(); o++) {
-                int lag = correlation.lags[o] * ahp_xc_get_sampletime();
+                int lag = correlation.lag * ahp_xc_get_sampletime();
                 if(lag < npackets && lag >= 0)
                 {
                     if(getSpectrum()->getElemental()->getMagnitude()[lag] == 0) getSpectrum()->getElemental()->getMagnitude()[lag] = 1.0;

polytope.cpp

@@ -17,5 +17,6 @@
         <file>xc4.json</file>
         <file>xc2.json</file>
         <file>xc1.json</file>
+        <file>Erase.json</file>
     </qresource>
 </RCC>