From 376ff12d08caea524445e010eeecbbb5e93f907b Mon Sep 17 00:00:00 2001 From: Manuel Pitz Date: Thu, 31 Mar 2022 17:18:34 +0000 Subject: [PATCH] fix auto merge error --- lib/hooks/pmu_dft.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/hooks/pmu_dft.cpp b/lib/hooks/pmu_dft.cpp index 16f07e096..44eb72b07 100644 --- a/lib/hooks/pmu_dft.cpp +++ b/lib/hooks/pmu_dft.cpp @@ -479,7 +479,6 @@ public: smp->length = windowSize < smpMemPos ? signalIndices.size() * 4 : 0; - unsigned tsPos = 0; if(smpMemPos >= windowSize) { unsigned tsPos = 0; if (timeAlignType == TimeAlign::RIGHT) @@ -493,8 +492,6 @@ public: smp->ts.origin = smpMemoryTs[tsPos % windowSize]; } - smp->ts.origin = smpMemoryTs[tsPos % windowSize]; - calcCount++; }