Update from 3.0.3 to 3.0.4

Intan-Technologies · Aug 5, 2021 · eaf1516 · eaf1516
1 parent 60d528f
commit eaf1516
Show file tree

Hide file tree

Showing 231 changed files with 5,162 additions and 279 deletions.
diff --git a/Engine/API/Abstract/abstractrhxcontroller.cpp b/Engine/API/Abstract/abstractrhxcontroller.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Abstract/abstractrhxcontroller.h b/Engine/API/Abstract/abstractrhxcontroller.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Hardware/okFrontPanelDLL_old.cpp b/Engine/API/Hardware/okFrontPanelDLL_old.cpp
diff --git a/Engine/API/Hardware/okFrontPanelDLL_old.h b/Engine/API/Hardware/okFrontPanelDLL_old.h
diff --git a/Engine/API/Hardware/rhxcontroller.cpp b/Engine/API/Hardware/rhxcontroller.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //
@@ -585,7 +585,7 @@ void RHXController::setExternalFastSettleChannel(int channel)
     dev->UpdateWireIns();
     if (type == ControllerRecordUSB3) {
         dev->ActivateTriggerIn(TrigInConfig_USB3, 7);
-    } else if (type == ControllerRecordUSB3) {
+    } else if (type == ControllerRecordUSB2) {
         dev->ActivateTriggerIn(TrigInExtFastSettle_R_USB2, 1);
     }
 }
@@ -1109,7 +1109,7 @@ void RHXController::enableExternalFastSettle(bool enable)
     dev->UpdateWireIns();
     if (type == ControllerRecordUSB3) {
         dev->ActivateTriggerIn(TrigInConfig_USB3, 6);
-    } else if (type == ControllerRecordUSB3) {
+    } else if (type == ControllerRecordUSB2) {
         dev->ActivateTriggerIn(TrigInExtFastSettle_R_USB2, 0);
     }
 }
@@ -1696,14 +1696,22 @@ int RHXController::findConnectedChips(vector<ChipType> &chipType, vector<int> &p
         }
     }
 
-    // Run the SPI interface for one command sequence (i.e., one data block).
+    // Run the SPI interface for multiple command sequences (i.e., NRepeats data blocks).
+    const int NRepeats = 12;
     RHXDataBlock dataBlock(type, getNumEnabledDataStreams());
-    setMaxTimeStep(dataBlock.samplesPerDataBlock());
+    setMaxTimeStep(NRepeats * dataBlock.samplesPerDataBlock());
     setContinuousRunMode(false);
 
-    vector<int> sumGoodDelays(maxMISOLines, 0);
-    vector<int> indexFirstGoodDelay(maxMISOLines, -1);
-    vector<int> indexSecondGoodDelay(maxMISOLines, -1);
+    int auxCmdSlot = (type == ControllerStimRecordUSB2 ? AuxCmd1 : AuxCmd3);
+
+    vector<vector<int> > goodDelays;
+    goodDelays.resize(maxMISOLines);
+    for (int i = 0; i < maxMISOLines; ++i) {
+        goodDelays[i].resize(16);
+        for (int j = 0; j < 16; ++j) {
+            goodDelays[i][j] = 0;
+        }
+    }
 
     // Run SPI command sequence at all 16 possible FPGA MISO delay settings
     // to find optimum delay for each SPI interface cable.
@@ -1720,43 +1728,70 @@ int RHXController::findConnectedChips(vector<ChipType> &chipType, vector<int> &p
         }
         run();
 
-        // Wait for the 128-sample run to complete.
+        // Wait for the run to complete.
         while (isRunning()) {
-            std::this_thread::sleep_for(std::chrono::microseconds(100));\
+            std::this_thread::sleep_for(std::chrono::microseconds(100));
         }
 
-        // Read the resulting single data block from the USB interface.
-        readDataBlock(&dataBlock);
-
-        // Read the Intan chip ID number from each RHD or RHS chip found.
-        // Record delay settings that yield good communication with the chip.
-        int auxCmdSlot = (type == ControllerStimRecordUSB2 ? AuxCmd1 : AuxCmd3);
-        int register59Value;
-        for (int stream = 0; stream < maxMISOLines; stream++) {
-            int id = dataBlock.getChipID(stream, auxCmdSlot, register59Value);
-            if (id == (int)RHD2132Chip || id == (int)RHD2216Chip || id == (int)RHS2116Chip ||
-                (id == (int)RHD2164Chip && register59Value == Register59MISOA)) {
-                sumGoodDelays[stream] = sumGoodDelays[stream] + 1;
-                if (indexFirstGoodDelay[stream] == -1) {
-                    indexFirstGoodDelay[stream] = delay;
-                    chipTypeOld[stream] = (ChipType)id;
-                } else if (indexSecondGoodDelay[stream] == -1) {
-                    indexSecondGoodDelay[stream] = delay;
+        for (int i = 0; i < NRepeats; ++i) {
+            // Read one data block from the USB interface.
+            readDataBlock(&dataBlock);
+
+            // Read the Intan chip ID number from each RHD or RHS chip found.
+            // Record delay settings that yield good communication with the chip.
+            int register59Value;
+            for (int stream = 0; stream < maxMISOLines; stream++) {
+                int id = dataBlock.getChipID(stream, auxCmdSlot, register59Value);
+                if (id == (int)RHD2132Chip || id == (int)RHD2216Chip || id == (int)RHS2116Chip ||
+                    (id == (int)RHD2164Chip && register59Value == Register59MISOA)) {
+                    goodDelays[stream][delay] = goodDelays[stream][delay] + 1;
                     chipTypeOld[stream] = (ChipType)id;
                 }
             }
         }
-        // TODO: Maybe change above code to run for *multiple* dataBlocks to find RHD2164 DDR glitches?
     }
 
     // Set cable delay settings that yield good communication with each chip.
     vector<int> optimumDelay(maxMISOLines, 0);
     for (int stream = 0; stream < maxMISOLines; ++stream) {
-        if (sumGoodDelays[stream] == 1 || sumGoodDelays[stream] == 2) {
-            optimumDelay[stream] = indexFirstGoodDelay[stream];
-        } else if (sumGoodDelays[stream] > 2) {
-            optimumDelay[stream] = indexSecondGoodDelay[stream];
+        int bestCount = -1;
+        for (int delay = 0; delay < 16; ++delay) {
+            if (goodDelays[stream][delay] > bestCount) {
+                bestCount = goodDelays[stream][delay];
+            }
         }
+        int numBest = 0;
+        for (int delay = 0; delay < 16; ++ delay) {
+            if (goodDelays[stream][delay] == bestCount) {
+                ++numBest;
+            }
+        }
+        int bestDelay = -1;
+        if (numBest == 2 && (chipTypeOld[stream] == RHD2164Chip)) {
+            for (int delay = 15; delay >= 0; --delay) {  // DDR SPI from RHD2164 chip seems to work best with longer of two valid delays.
+                if (goodDelays[stream][delay] == bestCount) {
+                    bestDelay = delay;
+                    break;
+                }
+            }
+        } else {
+            for (int delay = 0; delay < 16; ++delay) {
+                if (goodDelays[stream][delay] == bestCount) {
+                    bestDelay = delay;
+                    break;
+                }
+            }
+            if (numBest > 2) {  // If 3 or more valid delays, don't use the longest or shortest.
+                for (int delay = bestDelay + 1; delay < 16; ++delay) {
+                    if (goodDelays[stream][delay] == bestCount) {
+                        bestDelay = delay;
+                        break;
+                    }
+                }
+            }
+        }
+
+        optimumDelay[stream] = bestDelay;
     }
 
     setCableDelay(PortA, max(optimumDelay[0], optimumDelay[1]));

diff --git a/Engine/API/Hardware/rhxcontroller.h b/Engine/API/Hardware/rhxcontroller.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Hardware/rhxdatablock.cpp b/Engine/API/Hardware/rhxdatablock.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Hardware/rhxdatablock.h b/Engine/API/Hardware/rhxdatablock.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Hardware/rhxglobals.h b/Engine/API/Hardware/rhxglobals.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //
@@ -49,7 +49,7 @@ const int HASHMARKLENGTH = 5;
 // Software version number (e.g., version 1.3.5)
 #define SOFTWARE_MAIN_VERSION_NUMBER 3
 #define SOFTWARE_SECONDARY_VERSION_NUMBER 0
-#define SOFTWARE_TERTIARY_VERSION_NUMBER 3
+#define SOFTWARE_TERTIARY_VERSION_NUMBER 4
 
 const QString SoftwareVersion = QString::number(SOFTWARE_MAIN_VERSION_NUMBER) + "." +
                                 QString::number(SOFTWARE_SECONDARY_VERSION_NUMBER) + "." +

diff --git a/Engine/API/Hardware/rhxregisters.cpp b/Engine/API/Hardware/rhxregisters.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Hardware/rhxregisters.h b/Engine/API/Hardware/rhxregisters.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/playbackrhxcontroller.cpp b/Engine/API/Synthetic/playbackrhxcontroller.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/playbackrhxcontroller.h b/Engine/API/Synthetic/playbackrhxcontroller.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/randomnumber.cpp b/Engine/API/Synthetic/randomnumber.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/randomnumber.h b/Engine/API/Synthetic/randomnumber.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/synthdatablockgenerator.cpp b/Engine/API/Synthetic/synthdatablockgenerator.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/synthdatablockgenerator.h b/Engine/API/Synthetic/synthdatablockgenerator.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.cpp b/Engine/API/Synthetic/syntheticrhxcontroller.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.h b/Engine/API/Synthetic/syntheticrhxcontroller.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafile.cpp b/Engine/Processing/DataFileReaders/datafile.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafile.h b/Engine/Processing/DataFileReaders/datafile.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafilemanager.cpp b/Engine/Processing/DataFileReaders/datafilemanager.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafilemanager.h b/Engine/Processing/DataFileReaders/datafilemanager.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafilereader.cpp b/Engine/Processing/DataFileReaders/datafilereader.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/datafilereader.h b/Engine/Processing/DataFileReaders/datafilereader.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp b/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.h b/Engine/Processing/DataFileReaders/fileperchannelmanager.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp b/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //

diff --git a/Engine/Processing/DataFileReaders/filepersignaltypemanager.h b/Engine/Processing/DataFileReaders/filepersignaltypemanager.h
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.0.3
+//  Version 3.0.4
 //
 //  Copyright (c) 2020-2021 Intan Technologies
 //