Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

- Assembly_ppi_conf.sh script is able to generate JSON ppsi.conf format
- New parameters in ppsi.conf. Some parameters moved at ppsi instance
level
- port timing configuration in Kconfig moved in KConfig_port_timing.in
file. A file generator 'gen_kconfig_port_timing.sh'is used to generate
it.
- HAL upgraded to use the new dot-config file format. Mode ( auto,
master,...) removed from HAL.
- ppsi-pre.conf: Set empty because the new generated ppsi.conf always
define clock-class and clock accuracy.

Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

Conflicts:
	userspace/ppsi
	userspace/tools/wrs_dump_shmem.c

Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

- Upgrade HAL to transmit the bit-slide to HA
- Upgrade wr_mon tool to displat HA servo data
- Upgrade wrs_dump_shmem to display the right data
Conflicts:
	userspace/tools/wr_mon.c
	userspace/tools/wrs_dump_shmem.c

Sven Meier authored 6 years ago and Adam Wujek committed 5 years ago

extensions

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Take the HA first

This reverts commit 74e16153.

Benoit Rat authored 6 years ago and Adam Wujek committed 5 years ago

since v5.0.x the WRS needs more time. We prefer to increase the reboot
time in order to properly refresh the web page after a reboot.

Benoit Rat authored 6 years ago and Adam Wujek committed 5 years ago

Remove the stderr in the shell_execution to improve parsing without the
state of the ports properly.

According to php manual (http://php.net/manual/en/function.strpos.php)
strpos must be used the indentical comperator because strpos can return
0 if string found at position 0.

Benoit Rat authored 6 years ago and Adam Wujek committed 5 years ago

Now we use ajax+js to constantly refresh value of WR into the web
interface without needing to manually refresh the webpage by the user.
However this refresh flood the accesslog and this is a problem with the
small RAM available

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Dump temperature, voltage, bias, TX and RX power from the SFP's DOM area

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

when query OID wrsBootConfigStatus
from:
SNMP: Error wrsBootSuccessful: Unable to read status file for wrsBootConfigStatus
to:
SNMP: Config file is not valid or too short (less than 200 characters)

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

This fixes builds e.g. on ubuntu 18.04

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

DONE: Kconfig, assembly_ppsi_conf.sh
TODO: SNMP, DOCs, HAL?

Redefine options CONFIG_PORTXX_PARAMS in dot-config
--role={master,slave,auto,none}, keep non-wr for compatibility
--ext={WR}:{HR}, HR for future, if no ext defined use WR as default
--add extra option to disable/enable triggering errors in SNMP
--add option for delay mechanism (dm)
  p2p or e2e
  e2e default

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

For rnabling 50ohm termination for 1-PPS input
It is set from HAL.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Grzegorz Daniluk authored 6 years ago and Adam Wujek committed 6 years ago

Requires gateware synthesized with wr-switch-hdl commit:
b1b621b add bit to control WRS 1-PPS in termination

Also increase all *_SHMEM_VERSION

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

uplift contains fixes for veryx tests

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

li hongming authored 6 years ago and Adam Wujek committed 6 years ago

    The bitslide module won't be reset when replugging the SFP and fiber, which may lead to
the wrong bitslide.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

As now the compilation is done only in wr-switch-sw repo.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Add MIB to /wr/lib/

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

+fix typo

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

There is no support of STP yet.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

If CPU is included or not in the mask with all ports the rtu_stat shall display
"ALL CPU"

rtu_stat add mask 01:80:c2:00:00:53 0x3ffff 0
rtu_stat add mask 01:80:c2:00:00:57 0x7ffff 0

rtu_stat displayed:
[...]
01:80:c2:00:00:53         ALL           0          STATIC  (hash 014:0)   -
01:80:c2:00:00:57         ALL           0          STATIC  (hash 090:0)   -
[...]

now:
[...]
01:80:c2:00:00:53         ALL           0          STATIC  (hash 014:0)   -
01:80:c2:00:00:57         ALL CPU       0          STATIC  (hash 090:0)   -
[...]

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Comments are simply ignored. There are not written back to the dot-config.
This solution does not support "#" signs in the parameters' values.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

--Remove leading spaces (but not following)
--Ignore value if not starting with ",[digit],y,n,m
--ignore comments after value

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>