Skip to content

P
PPSi
Commit 20c0c0c4 authored by Sven Meier's avatar Sven Meier
Browse files
Options

variance and source and timescale: adapted according to servo states 

the variance is now set according to the servo state, the source and timescale
are set according to the clock classes set
parent 6a83d7f8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 141 deletions
arch-sim/sim-startup.c
View file @ 20c0c0c4
......@@ -14,7 +14,7 @@ static struct pp_runtime_opts sim_master_rt_opts = {
.clock_quality = {
.clockClass = PP_PTP_CLASS_GM_LOCKED,
.clockAccuracy = PP_ACCURACY_DEFAULT,
.offsetScaledLogVariance = PP_DEFAULT_CLOCK_VARIANCE,
.offsetScaledLogVariance = PP_VARIANCE_DEFAULT,
},
.flags = PP_DEFAULT_FLAGS,
.ap = PP_DEFAULT_AP,
......
include/ppsi/constants.h
View file @ 20c0c0c4
......@@ -29,6 +29,8 @@
#define PP_DEFAULT_SYNC_RECEIPT_TIMEOUT 3
#define PP_DEFAULT_ANNOUNCE_RECEIPT_TIMEOUT 3 /* 3 by default */
#define PP_DEFAULT_UTC_OFFSET 37
#define PP_DEFAULT_PRIORITY1 128
#define PP_DEFAULT_PRIORITY2 128
/* Clock classes (pag 55, PTP-2008). See ppsi-manual for an explanation */
#define PP_CLASS_SLAVE_ONLY 255
......@@ -41,19 +43,21 @@
#define PP_ARB_CLASS_GM_UNLOCKED 58
#define PP_ACCURACY_DEFAULT 0xFE
#define PP_PTP_ACCURACY_GM_LOCKED 0x20 /* FIXME real values */
#define PP_PTP_ACCURACY_GM_HOLDOVER 0x2F /* FIXME real values */
#define PP_PTP_ACCURACY_GM_UNLOCKED 0xFE /* FIXME real values */
#define PP_ARB_ACCURACY_GM_LOCKED 0x20 /* FIXME real values */
#define PP_ARB_ACCURACY_GM_HOLDOVER 0x2F /* FIXME real values */
#define PP_ARB_ACCURACY_GM_UNLOCKED 0xFE /* FIXME real values */
#define PP_PTP_ACCURACY_GM_LOCKED 0x21
#define PP_PTP_ACCURACY_GM_HOLDOVER 0x21
#define PP_PTP_ACCURACY_GM_UNLOCKED 0xFE
#define PP_ARB_ACCURACY_GM_LOCKED 0x21
#define PP_ARB_ACCURACY_GM_HOLDOVER 0x21
#define PP_ARB_ACCURACY_GM_UNLOCKED 0xFE
#define PP_VARIANCE_DEFAULT 0xC71D
#define PP_PTP_VARIANCE_GM_LOCKED 0xB900
#define PP_PTP_VARIANCE_GM_HOLDOVER 0xC71D
#define PP_PTP_VARIANCE_GM_UNLOCKED 0xC71D
#define PP_ARB_VARIANCE_GM_LOCKED 0xB900
#define PP_ARB_VARIANCE_GM_HOLDOVER 0xC71D
#define PP_ARB_VARIANCE_GM_UNLOCKED 0xC71D
#define PP_DEFAULT_PRIORITY1 128
#define PP_DEFAULT_PRIORITY2 128
#define PP_DEFAULT_CLOCK_VARIANCE 0x8000 /* FIXME shall be set to
* 0xFFFF once getting calculated,
* defining it is not yet calculated
*/
#define PP_SERVO_UNKNOWN 0
#define PP_SERVO_LOCKED 1
#define PP_SERVO_HOLDOVER 2
......
proto-standard/bmc.c
View file @ 20c0c0c4
This diff is collapsed.
proto-standard/open-close.c
View file @ 20c0c0c4
......@@ -15,7 +15,7 @@ struct pp_runtime_opts __pp_default_rt_opts = {
.clock_quality = {
.clockClass = PP_CLASS_DEFAULT,
.clockAccuracy = PP_ACCURACY_DEFAULT,
.offsetScaledLogVariance = PP_DEFAULT_CLOCK_VARIANCE,
.offsetScaledLogVariance = PP_VARIANCE_DEFAULT,
},
.flags = PP_DEFAULT_FLAGS,
.ap = PP_DEFAULT_AP,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment