Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
86
Issues
86
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
9def24ca
Commit
9def24ca
authored
Jul 14, 2017
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FEATURE: 1620] add new parameters to dot-config of PPSI
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
cfb8b7df
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
169 additions
and
2 deletions
+169
-2
Kconfig
Kconfig
+78
-0
wrs-user-manual.in
doc/wrs-user-manual.in
+57
-0
assembly_ppsi_conf.sh
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
+34
-2
No files found.
Kconfig
View file @
9def24ca
...
@@ -694,6 +694,84 @@ config PTP_CONF_URL
...
@@ -694,6 +694,84 @@ config PTP_CONF_URL
you can use host names.
you can use host names.
For example: tftp://morgana/wrs-IPADDR-ppsi.conf
For example: tftp://morgana/wrs-IPADDR-ppsi.conf
menu "PTP options"
depends on PTP_PORT_PARAMS
config PTP_OPT_CLOCK_CLASS
string "clock-class"
help
An attribute defining the TAI traceability, synchronization state and
expected performance of the time or frequency distributed by a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_CLOCK_ACCURACY
string "clock-accuracy"
help
An attribute defining the accuracy of the Local Clock (e.g. local
oscillator) of a Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_CLOCK_ALLAN_VARIANCE
string "clock-allan-variance/offsetScaledLogVariance"
help
An attribute defining the stability of the Local Clock of a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_DOMAIN_NUMBER
string "domain-number"
help
A domain consists of one or more PTP devices communicating with each
other as defined by the PTP protocol. A domain defines the scope of
PTP message communication, state, operations, data sets, and
timescale. PTP devices may participate in multiple domains.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_ANNOUNCE_INTERVAL
string "announce-interval"
help
The mean time interval between transmissions of successive
Announce messages.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_SYNC_INTERVAL
string "sync-interval"
help
The mean time interval between transmission of successive
Sync messages, i.e., the sync-interval, when transmitted
as multicast messages. The value is the logarithm to the base 2.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_PRIORITY1
string "priority1"
help
A user configurable designation that a clock belongs to an ordered
set of PTP devices from which a PTP Master is selected.
For more details please refer to the IEEE 1588-2008 standard
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
config PTP_OPT_PRIORITY2
string "priority2"
help
A user configurable designation that provides finer grained ordering
among otherwise equivalent PTP devices.
For more details please refer to the IEEE 1588-2008 standard
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
endmenu #"PPSI options"
menu "Management configuration"
menu "Management configuration"
config SNMP_TRAPSINK_ADDRESS
config SNMP_TRAPSINK_ADDRESS
...
...
doc/wrs-user-manual.in
View file @
9def24ca
...
@@ -846,6 +846,63 @@ appropriate way, before the respective service is started.
...
@@ -846,6 +846,63 @@ appropriate way, before the respective service is started.
up a batch of switches with different configurations (similar to the
up a batch of switches with different configurations (similar to the
@t
{
CONFIG
_
DOTCONF
_
URL
}
, please refer to @ref
{
The Configuration File
}
).
@t
{
CONFIG
_
DOTCONF
_
URL
}
, please refer to @ref
{
The Configuration File
}
).
@item CONFIG
_
PTP
_
OPT
_
CLOCK
_
CLASS
An attribute defining the TAI traceability, synchronization state and
expected performance of the time or frequency distributed by a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
CLOCK
_
ACCURACY
An attribute defining the accuracy of the Local Clock (e.g. local
oscillator) of a Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
CLOCK
_
ALLAN
_
VARIANCE
An attribute defining the stability of the Local Clock of a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
DOMAIN
_
NUMBER
A domain consists of one or more PTP devices communicating with each
other as defined by the PTP protocol. A domain defines the scope of
PTP message communication, state, operations, data sets, and
timescale. PTP devices may participate in multiple domains.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
ANNOUNCE
_
INTERVAL
The mean time interval between transmissions of successive
Announce messages.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
SYNC
_
INTERVAL
The mean time interval between transmission of successive
Sync messages, i.e., the sync-interval, when transmitted
as multicast messages. The value is the logarithm to the base 2.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
PRIORITY1
A user configurable designation that a clock belongs to an ordered
set of PTP devices from which a PTP Master is selected.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
PTP
_
OPT
_
PRIORITY2
A user configurable designation that provides finer grained ordering
among otherwise equivalent PTP devices.
For more details please refer to the IEEE 1588-2008 standard.
If set, this configuration item overwrites the default value from
ppsi-pre.conf during generation of ppsi.conf.
@item CONFIG
_
SNMP
_
TRAPSINK
_
ADDRESS
@item CONFIG
_
SNMP
_
TRAPSINK
_
ADDRESS
@itemx CONFIG
_
SNMP
_
TRAP2SINK
_
ADDRESS
@itemx CONFIG
_
SNMP
_
TRAP2SINK
_
ADDRESS
...
...
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
View file @
9def24ca
...
@@ -5,9 +5,10 @@
...
@@ -5,9 +5,10 @@
PRE_FILE
=
"/wr/etc/ppsi-pre.conf"
PRE_FILE
=
"/wr/etc/ppsi-pre.conf"
OUTPUT_FILE
=
"/etc/ppsi.conf"
OUTPUT_FILE
=
"/etc/ppsi.conf"
DOTCONFIG_FILE
=
"/wr/etc/dot-config"
if
[
-f
/wr/etc/dot-config
]
;
then
if
[
-f
"
$DOTCONFIG_FILE
"
]
;
then
.
/wr/etc/dot-config
.
"
$DOTCONFIG_FILE
"
else
else
# if dot-config not available remove ppsi's config
# if dot-config not available remove ppsi's config
rm
$OUTPUT_FILE
rm
$OUTPUT_FILE
...
@@ -20,6 +21,37 @@ echo "# This file will be overwritten at next boot." >> $OUTPUT_FILE
...
@@ -20,6 +21,37 @@ echo "# This file will be overwritten at next boot." >> $OUTPUT_FILE
#copy top of ppsi.conf
#copy top of ppsi.conf
cat
$PRE_FILE
>>
$OUTPUT_FILE
cat
$PRE_FILE
>>
$OUTPUT_FILE
if
[
-n
"
$CONFIG_PTP_OPT_CLOCK_CLASS
"
]
;
then
echo
clock-class
"
$CONFIG_PTP_OPT_CLOCK_CLASS
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_CLOCK_ACCURACY
"
]
;
then
echo
clock-accuracy
"
$CONFIG_PTP_OPT_CLOCK_ACCURACY
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE
"
]
;
then
echo
clock-allan-variance
"
$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_DOMAIN_NUMBER
"
]
;
then
echo
domain-number
"
$CONFIG_PTP_OPT_DOMAIN_NUMBER
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_ANNOUNCE_INTERVAL
"
]
;
then
echo
announce-interval
"
$CONFIG_PTP_OPT_ANNOUNCE_INTERVAL
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_SYNC_INTERVAL
"
]
;
then
echo
sync-interval
"
$CONFIG_PTP_OPT_SYNC_INTERVAL
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_PRIORITY1
"
]
;
then
echo
priority1
"
$CONFIG_PTP_OPT_PRIORITY1
"
>>
$OUTPUT_FILE
fi
if
[
-n
"
$CONFIG_PTP_OPT_PRIORITY2
"
]
;
then
echo
priority2
"
$CONFIG_PTP_OPT_PRIORITY2
"
>>
$OUTPUT_FILE
fi
for
i_zero
in
{
01..18
}
;
do
for
i_zero
in
{
01..18
}
;
do
# unset parametes
# unset parametes
unset
p_name
unset
p_name
...
...
Write
Preview
Markdown
is supported
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