From 368ea7a4111cb433e78081b3cee7cef589064a8c Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Fri, 12 Sep 2014 18:19:31 +0200
Subject: [PATCH] Change indexes on cable delays
---
Source/Processors/DataThreads/RHD2000Thread.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/Processors/DataThreads/RHD2000Thread.cpp b/Source/Processors/DataThreads/RHD2000Thread.cpp
index 21ad8d47d..c5805e0a1 100644
--- a/Source/Processors/DataThreads/RHD2000Thread.cpp
+++ b/Source/Processors/DataThreads/RHD2000Thread.cpp
@@ -471,22 +471,22 @@ void RHD2000Thread::scanPorts()
}
evalBoard->setCableDelay(Rhd2000EvalBoard::PortA,
- optimumDelay[0]);
+ max(optimumDelay[0],optimumDelay[1]));
evalBoard->setCableDelay(Rhd2000EvalBoard::PortB,
- optimumDelay[1]);
+ max(optimumDelay[2],optimumDelay[3]));
evalBoard->setCableDelay(Rhd2000EvalBoard::PortC,
- optimumDelay[2]);
+ max(optimumDelay[4],optimumDelay[5]));
evalBoard->setCableDelay(Rhd2000EvalBoard::PortD,
- optimumDelay[3]);
+ max(optimumDelay[6],optimumDelay[7]));
cableLengthPortA =
- evalBoard->estimateCableLengthMeters(optimumDelay[0]);
+ evalBoard->estimateCableLengthMeters(max(optimumDelay[0],optimumDelay[1]));
cableLengthPortB =
- evalBoard->estimateCableLengthMeters(optimumDelay[1]);
+ evalBoard->estimateCableLengthMeters(max(optimumDelay[2],optimumDelay[3]));
cableLengthPortC =
- evalBoard->estimateCableLengthMeters(optimumDelay[2]);
+ evalBoard->estimateCableLengthMeters(max(optimumDelay[4],optimumDelay[5]));
cableLengthPortD =
- evalBoard->estimateCableLengthMeters(optimumDelay[3]);
+ evalBoard->estimateCableLengthMeters(max(optimumDelay[6],optimumDelay[7]));
setSampleRate(savedSampleRateIndex); // restore saved sample rate
--
GitLab