Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LARN
PRRT
Commits
72358d9f
Commit
72358d9f
authored
Apr 11, 2016
by
Andreas Schmidt
Browse files
Improve clock sync.
parent
a0de0122
Changes
1
Show whitespace changes
Inline
Side-by-side
src/prrt/clock.c
View file @
72358d9f
...
@@ -36,7 +36,7 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
...
@@ -36,7 +36,7 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
prrtTimeDifference_t
clockSkew
=
clock
->
skew
;
prrtTimeDifference_t
clockSkew
=
clock
->
skew
;
prrtTimedelta_t
delay
=
rtt
/
2
;
// half the rtt
prrtTimedelta_t
delay
=
rtt
/
2
;
// half the rtt
prrtTimeDifference_t
phaseError
=
referenceTime
-
virtualTime
+
delay
;
prrtTimeDifference_t
phaseError
=
referenceTime
-
virtualTime
+
delay
;
debug
(
"V: %13u, C: %13u, S: %13d, R: %13u, E: %13d, D: %3u"
,
virtualTime
,
currentTime
,
clockSkew
,
referenceTime
,
phaseError
,
delay
);
//printf
("V: %13u, C: %13u, S: %13d, R: %13u, E: %13d, D: %3u
L: %u\n
", virtualTime, currentTime, clockSkew, referenceTime, phaseError, delay
, clock->lastMeasurement
);
if
(
abs
(
phaseError
)
>
10000
)
{
if
(
abs
(
phaseError
)
>
10000
)
{
clock
->
meanDeviation
=
0
;
clock
->
meanDeviation
=
0
;
...
@@ -45,7 +45,7 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
...
@@ -45,7 +45,7 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
clock
->
virtualTime
=
currentTime
;
clock
->
virtualTime
=
currentTime
;
}
}
prrtTimeDifference_t
deviationSum
=
(
prrtTimeDifference_t
)
phaseError
+
3
*
clock
->
meanDeviation
;
// TODO: why 3?
prrtTimeDifference_t
deviationSum
=
(
prrtTimeDifference_t
)
(
phaseError
+
3
*
clock
->
meanDeviation
)
;
// TODO: why 3?
prrtTimeDifference_t
meanDeviation
=
(
prrtTimeDifference_t
)
(
deviationSum
/
4
);
// TODO: find out why???
prrtTimeDifference_t
meanDeviation
=
(
prrtTimeDifference_t
)
(
deviationSum
/
4
);
// TODO: find out why???
prrtTimeDifference_t
period
=
diff_abs_ts
(
currentTime
,
clock
->
lastMeasurement
);
prrtTimeDifference_t
period
=
diff_abs_ts
(
currentTime
,
clock
->
lastMeasurement
);
...
@@ -61,7 +61,11 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
...
@@ -61,7 +61,11 @@ bool PrrtClock_update(PrrtClock *clock, uint32_t referenceTime, uint32_t rtt)
clock
->
lastMeasurement
=
currentTime
;
clock
->
lastMeasurement
=
currentTime
;
clock
->
virtualTime
=
virtualTime
;
clock
->
virtualTime
=
virtualTime
;
//debug("V: %13u, C: %13u; S: %13d; M: %13u", virtualTime, currentTime, clockSkew, meanDeviation);
if
(
abs
(
phaseError
)
>
10000
)
{
clock
->
virtualTime
=
currentTime
;
}
//printf("V: %13u, C: %13u; S: %13d; M: %13d, P:%13u\n", virtualTime, currentTime, clockSkew, meanDeviation, period);
return
true
;
return
true
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment