Remove local firmware

Author: Ilia Platone

CMakeLists.txt

@@ -102,6 +102,7 @@ else(ANDROID)
     endif(WIN32)
 endif(ANDROID)
 
+execute_process (COMMAND ./update_firmware.sh https://www.iliaplatone.com/firmware.php WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/99-libahp-xc.rules.cmake ${CMAKE_CURRENT_BINARY_DIR}/99-libahp-xc.rules )
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/brew.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/brew.sh )
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.ico ${CMAKE_CURRENT_BINARY_DIR}/icon.ico COPYONLY )

Erase.json

@@ -1,15 +1,18 @@
 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"
-IDI_DATA1               TEXT        DISCARDABLE            "xc8.json"
-IDI_DATA1               TEXT        DISCARDABLE            "xc10.json"
-IDI_DATA1               TEXT        DISCARDABLE            "xc12.json"
-IDI_DATA2               TEXT        DISCARDABLE            "xc14.json"
-IDI_DATA3               TEXT        DISCARDABLE            "xc16.json"
-IDI_DATA4               TEXT        DISCARDABLE            "xc18.json"
-IDI_DATA5               TEXT        DISCARDABLE            "xc20.json"
-IDI_DATA6               TEXT        DISCARDABLE            "xc22.json"
-IDI_DATA7               TEXT        DISCARDABLE            "xc24.json"
-IDI_DATA8               TEXT        DISCARDABLE            "xc32.json"
+IDI_DATA2               TEXT        DISCARDABLE            "xc1.json"
+IDI_DATA3               TEXT        DISCARDABLE            "xc2.json"
+IDI_DATA4               TEXT        DISCARDABLE            "xc4.json"
+IDI_DATA5               TEXT        DISCARDABLE            "xc8.json"
+IDI_DATA6               TEXT        DISCARDABLE            "xc10.json"
+IDI_DATA7               TEXT        DISCARDABLE            "xc12.json"
+IDI_DATA8               TEXT        DISCARDABLE            "xc14.json"
+IDI_DATA9               TEXT        DISCARDABLE            "xc16.json"
+IDI_DATA10              TEXT        DISCARDABLE            "xc18.json"
+IDI_DATA11              TEXT        DISCARDABLE            "xc20.json"
+IDI_DATA12              TEXT        DISCARDABLE            "xc22.json"
+IDI_DATA13              TEXT        DISCARDABLE            "xc24.json"
+IDI_DATA14              TEXT        DISCARDABLE            "xc26.json"
+IDI_DATA15              TEXT        DISCARDABLE            "xc28.json"
+IDI_DATA16              TEXT        DISCARDABLE            "xc30.json"
+IDI_DATA17              TEXT        DISCARDABLE            "xc32.json"

app.rc

@@ -458,10 +458,19 @@ MainWindow::MainWindow(QWidget *parent)
                 ahp_xc_connect_fd(xcFD);
             }
             else
-            {
-                xc_local_port = true;
+            {/*
+                QSerialPort p;
+                p.setPortName(xcport);
+                p.setBaudRate(QSerialPort::Baud57600);
+                p.setDataBits(QSerialPort::Data8);
+                p.setParity(QSerialPort::NoParity);
+                p.setStopBits(QSerialPort::OneStop);
+                p.open(QIODevice::ReadWrite);
+                xcFD = (int)p.handle();
+                ahp_xc_connect_fd(xcFD);*/
                 ahp_xc_connect(xcport.toUtf8());
                 xcFD = ahp_xc_get_fd();
+
             }
             if(ahp_xc_is_detected())
             {
@@ -759,7 +768,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

@@ -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);