Update from 3.3.1 to 3.3.2

Intan-Technologies · Jul 9, 2024 · 946dea6 · 946dea6
1 parent 63e1b29
commit 946dea6
Show file tree

Hide file tree

Showing 228 changed files with 814 additions and 481 deletions.
diff --git a/Engine/API/Abstract/abstractrhxcontroller.cpp b/Engine/API/Abstract/abstractrhxcontroller.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Abstract/abstractrhxcontroller.h b/Engine/API/Abstract/abstractrhxcontroller.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -214,7 +214,7 @@ class AbstractRHXController
 
     virtual int findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                                    vector<int> &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false,
-                                   bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) = 0;
+                                   bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) = 0;
 
     int pipeReadError() const { return pipeReadErrorCode; }
 

diff --git a/Engine/API/Hardware/rhxcontroller.cpp b/Engine/API/Hardware/rhxcontroller.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -1733,7 +1733,7 @@ void RHXController::uploadCommandList(const vector<unsigned int> &commandList, A
 // of USB bus bandwidth.
 int RHXController::findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                                       vector<int> &numChannelsOnPort, bool /* synthMaxChannels */, bool returnToFastSettle,
-                                      bool usePreviousDelay, int selectedPort, int lastDetectedChip)
+                                      bool usePreviousDelay, int selectedPort, int lastDetectedChip, int lastDetectedNumStreams)
 {
     int returnValue = 1;    // return 1 == everything okay
     int maxNumStreams = maxNumDataStreams();
@@ -1895,6 +1895,10 @@ int RHXController::findConnectedChips(vector<ChipType> &chipType, vector<int> &p
         int convertedPortIndex = (int) (2 * selectedPort);
         optimumDelay[convertedPortIndex] = previousDelay;
         chipTypeOld[convertedPortIndex] = (ChipType) lastDetectedChip;
+        if (lastDetectedChip == RHS2116Chip && lastDetectedNumStreams == 2) {
+            optimumDelay[convertedPortIndex + 1] = previousDelay;
+            chipTypeOld[convertedPortIndex + 1] = (ChipType) lastDetectedChip;
+        }
         if (lastDetectedChip == RHD2164Chip) {
             optimumDelay[convertedPortIndex + 1] = previousDelay;
             chipTypeOld[convertedPortIndex + 1] = RHD2164MISOBChip;

diff --git a/Engine/API/Hardware/rhxcontroller.h b/Engine/API/Hardware/rhxcontroller.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -122,7 +122,8 @@ class RHXController : public AbstractRHXController
 
     int findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                            vector<int> &numChannelsOnPort, bool = false, bool returnToFastSettle = false,
-                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override;
+                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1,
+                           int lastDetectedNumStreams = -1) override;
 
     // Physical board only
     static void resetBoard(okCFrontPanel* dev_);

diff --git a/Engine/API/Hardware/rhxdatablock.cpp b/Engine/API/Hardware/rhxdatablock.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Hardware/rhxdatablock.h b/Engine/API/Hardware/rhxdatablock.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Hardware/rhxglobals.h b/Engine/API/Hardware/rhxglobals.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -46,7 +46,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 3
-#define SOFTWARE_TERTIARY_VERSION_NUMBER 1
+#define SOFTWARE_TERTIARY_VERSION_NUMBER 2
 
 enum ControllerType {
     ControllerRecordUSB2 = 0,
@@ -227,7 +227,7 @@ const uint32_t TCPSpikeMagicNumber = 0x3ae2710f;
 const QString OrganizationName = "Intan Technologies";
 const QString OrganizationDomain = "intantech.com";
 const QString ApplicationName = "IntanRHX";
-const QString ApplicationCopyrightYear = "2020-2023";
+const QString ApplicationCopyrightYear = "2020-2024";
 
 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,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Hardware/rhxregisters.h b/Engine/API/Hardware/rhxregisters.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Synthetic/playbackrhxcontroller.cpp b/Engine/API/Synthetic/playbackrhxcontroller.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -201,7 +201,8 @@ int PlaybackRHXController::getNumSPIPorts(bool &expanderBoardDetected)
 int PlaybackRHXController::findConnectedChips(vector<ChipType>& /* chipType */, vector<int>& /* portIndex */,
                                               vector<int>& /* commandStream */, vector<int>& /* numChannelsOnPort */,
                                               bool /* synthMaxChannels */, bool /* returnToFastSettle */,
-                                              bool /* usePreviousDelay */, int /* selectedPort */, int /* lastDetectedChip */)
+                                              bool /* usePreviousDelay */, int /* selectedPort */, int /* lastDetectedChip */,
+                                              int /* lastDetectedNumStreams */)
 {
     return 1;
 }

diff --git a/Engine/API/Synthetic/playbackrhxcontroller.h b/Engine/API/Synthetic/playbackrhxcontroller.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -108,7 +108,7 @@ class PlaybackRHXController : public AbstractRHXController
 
     int findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                            vector<int> &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false,
-                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override;
+                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) override;
 
 private:
     unsigned int numWordsInFifo() override;

diff --git a/Engine/API/Synthetic/randomnumber.cpp b/Engine/API/Synthetic/randomnumber.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Synthetic/randomnumber.h b/Engine/API/Synthetic/randomnumber.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Synthetic/synthdatablockgenerator.cpp b/Engine/API/Synthetic/synthdatablockgenerator.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Synthetic/synthdatablockgenerator.h b/Engine/API/Synthetic/synthdatablockgenerator.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.cpp b/Engine/API/Synthetic/syntheticrhxcontroller.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -216,7 +216,7 @@ int SyntheticRHXController::getNumSPIPorts(bool &expanderBoardDetected)
 // of USB bus bandwidth.
 int SyntheticRHXController::findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                                                vector<int> &numChannelsOnPort, bool synthMaxChannels, bool returnToFastSettle,
-                                               bool usePreviousDelay, int selectedPort, int lastDetectedChip)
+                                               bool usePreviousDelay, int selectedPort, int lastDetectedChip, int lastDetectedNumStreams)
 {
     int maxNumStreams = maxNumDataStreams();
     int maxSPIPorts = maxNumSPIPorts();

diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.h b/Engine/API/Synthetic/syntheticrhxcontroller.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //
@@ -108,7 +108,7 @@ class SyntheticRHXController : public AbstractRHXController
 
     int findConnectedChips(vector<ChipType> &chipType, vector<int> &portIndex, vector<int> &commandStream,
                            vector<int> &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false,
-                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override;
+                           bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) override;
 
 private:
     unsigned int numWordsInFifo() override;

diff --git a/Engine/Processing/DataFileReaders/datafile.cpp b/Engine/Processing/DataFileReaders/datafile.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/datafile.h b/Engine/Processing/DataFileReaders/datafile.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/datafilemanager.cpp b/Engine/Processing/DataFileReaders/datafilemanager.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/datafilemanager.h b/Engine/Processing/DataFileReaders/datafilemanager.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/datafilereader.cpp b/Engine/Processing/DataFileReaders/datafilereader.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/datafilereader.h b/Engine/Processing/DataFileReaders/datafilereader.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp b/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //

diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.h b/Engine/Processing/DataFileReaders/fileperchannelmanager.h
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 //
 //  Intan Technologies RHX Data Acquisition Software
-//  Version 3.3.1
+//  Version 3.3.2
 //
-//  Copyright (c) 2020-2023 Intan Technologies
+//  Copyright (c) 2020-2024 Intan Technologies
 //
 //  This file is part of the Intan Technologies RHX Data Acquisition Software.
 //