From e857e59ddfa9c63771e7566713fadc22c81a764d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Bron=C3=A8s?= <romain.broucquart@synchrotron-soleil.fr> Date: Fri, 1 Dec 2023 16:37:39 +0100 Subject: [PATCH] Update configuration * also switch configuration file to an .example to avoid overwrite --- recipes-app/fofb-init/files/config/C01_config_register | 7 ++++++- recipes-app/fofb-init/files/config/C06_config_register | 7 ++++++- recipes-app/fofb-init/files/config/C09_config_register | 7 ++++++- recipes-app/fofb-init/files/config/C14_config_register | 7 ++++++- recipes-app/fofb-init/fofb-init_1.2.bb | 8 +++----- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/recipes-app/fofb-init/files/config/C01_config_register b/recipes-app/fofb-init/files/config/C01_config_register index 3f3ef9f..6560afa 100644 --- a/recipes-app/fofb-init/files/config/C01_config_register +++ b/recipes-app/fofb-init/files/config/C01_config_register @@ -26,8 +26,13 @@ APP.ccn_ethernet_0.ETH.MODE_REG 3 # IPG to 12 APP.ccn_ethernet_0.ETH.CONFIGURATION_TX_REG1 0x3003 # RX enable, delete fcs, check preamble and sfd -APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1".format(N), np.uintc(0x33)) +APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1 0x33 # CCN configuration APP.ccn_packeter_0.TIMEOUT 4000 +# COMCORR configuration +APP.comcorr_0.RATEDIV 80 +APP.comcorr_0.PERIOD 0 +APP.comcorr_0.CONFIG 1 +APP.OUTPUT 1 diff --git a/recipes-app/fofb-init/files/config/C06_config_register b/recipes-app/fofb-init/files/config/C06_config_register index 3c06c86..c6025fc 100644 --- a/recipes-app/fofb-init/files/config/C06_config_register +++ b/recipes-app/fofb-init/files/config/C06_config_register @@ -26,8 +26,13 @@ APP.ccn_ethernet_0.ETH.MODE_REG 3 # IPG to 12 APP.ccn_ethernet_0.ETH.CONFIGURATION_TX_REG1 0x3003 # RX enable, delete fcs, check preamble and sfd -APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1".format(N), np.uintc(0x33)) +APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1 0x33 # CCN configuration APP.ccn_packeter_0.TIMEOUT 4000 +# COMCORR configuration +APP.comcorr_0.RATEDIV 80 +APP.comcorr_0.PERIOD 0 +APP.comcorr_0.CONFIG 1 +APP.OUTPUT 1 diff --git a/recipes-app/fofb-init/files/config/C09_config_register b/recipes-app/fofb-init/files/config/C09_config_register index 2d6e940..c648e14 100644 --- a/recipes-app/fofb-init/files/config/C09_config_register +++ b/recipes-app/fofb-init/files/config/C09_config_register @@ -26,8 +26,13 @@ APP.ccn_ethernet_0.ETH.MODE_REG 3 # IPG to 12 APP.ccn_ethernet_0.ETH.CONFIGURATION_TX_REG1 0x3003 # RX enable, delete fcs, check preamble and sfd -APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1".format(N), np.uintc(0x33)) +APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1 0x33 # CCN configuration APP.ccn_packeter_0.TIMEOUT 4000 +# COMCORR configuration +APP.comcorr_0.RATEDIV 80 +APP.comcorr_0.PERIOD 0 +APP.comcorr_0.CONFIG 1 +APP.OUTPUT 1 diff --git a/recipes-app/fofb-init/files/config/C14_config_register b/recipes-app/fofb-init/files/config/C14_config_register index 51bcc5e..79f78e6 100644 --- a/recipes-app/fofb-init/files/config/C14_config_register +++ b/recipes-app/fofb-init/files/config/C14_config_register @@ -26,8 +26,13 @@ APP.ccn_ethernet_0.ETH.MODE_REG 3 # IPG to 12 APP.ccn_ethernet_0.ETH.CONFIGURATION_TX_REG1 0x3003 # RX enable, delete fcs, check preamble and sfd -APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1".format(N), np.uintc(0x33)) +APP.ccn_ethernet_0.ETH.CONFIGURATION_RX_REG1 0x33 # CCN configuration APP.ccn_packeter_0.TIMEOUT 4000 +# COMCORR configuration +APP.comcorr_0.RATEDIV 80 +APP.comcorr_0.PERIOD 0 +APP.comcorr_0.CONFIG 1 +APP.OUTPUT 1 diff --git a/recipes-app/fofb-init/fofb-init_1.2.bb b/recipes-app/fofb-init/fofb-init_1.2.bb index 37dae27..4ecd0c8 100644 --- a/recipes-app/fofb-init/fofb-init_1.2.bb +++ b/recipes-app/fofb-init/fofb-init_1.2.bb @@ -11,7 +11,7 @@ inherit update-rc.d SRC_URI = " file://fofb-init.sh" SRC_URI += " file://fpgaversion.sh" SRC_URI += " file://fofb-configurator.py" -SRC_URI += " file://configuration" +SRC_URI += " file://configuration.example" SRC_URI += " file://config" RDEPENDS_${PN}=" fpga-manager-script bash variant-mapt" @@ -19,7 +19,7 @@ RDEPENDS_${PN}=" fpga-manager-script bash variant-mapt" FILES_${PN}+="/etc/init.d/fofb-init.sh" FILES_${PN}+="/usr/bin/fpgaversion" FILES_${PN}+="/usr/bin/fofb-configurator" -FILES_${PN}+="/opt/fofb/cfg/configuration" +FILES_${PN}+="/opt/fofb/cfg/configuration.example" FILES_${PN}+="/opt/fofb/cfg/C01_config_register /opt/fofb/cfg/C06_config_register /opt/fofb/cfg/C09_config_register /opt/fofb/cfg/C14_config_register /opt/fofb/cfg/Central_config_register" @@ -35,7 +35,5 @@ do_install() { install -d ${D}/opt/fofb/cfg install ${WORKDIR}/config/*_config_register -t ${D}/opt/fofb/cfg - if [ ! -f ${D}/opt/fofb/cfg/configuration ]; then - install ${WORKDIR}/configuration ${D}/opt/fofb/cfg/configuration - fi + install ${WORKDIR}/configuration.example ${D}/opt/fofb/cfg/configuration.example } -- GitLab