Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix auto merge error

Browse source
This commit is contained in:
Manuel Pitz 2022-03-31 17:18:34 +00:00 • committed by Steffen Vogel
parent f9c2c1e343
commit 376ff12d08
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/hooks/pmu_dft.cpp
View file

@ -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++;
}