diff --git a/pypcc/config/APSCTTR.yaml b/pypcc/config/APSCTTR.yaml index a9b246da1335888fbcb04ba3098cc45b1ccc6395..64ad74a35520ebe84a3b0ab1ec05bcbd8df71c50 100644 --- a/pypcc/config/APSCTTR.yaml +++ b/pypcc/config/APSCTTR.yaml @@ -157,7 +157,7 @@ variables: description: Version number driver: I2C_CLK devreg: ROM.Version - width: 0x80 #16 characters + width: 0x100 #32 characters rw: ro dtype: string @@ -165,7 +165,7 @@ variables: description: PCB number (astron.nl/webforms/IenS-Boarden/view.php?id=xxx) driver: I2C_CLK devreg: ROM.Serial - width: 0x80 #16 characters + width: 0x100 #32 characters rw: ro dtype: string diff --git a/pypcc/config/APSPUTR.yaml b/pypcc/config/APSPUTR.yaml index fda5a14f66f1716bcb2f08703918c9cc06dc3d7c..4c3ebfa5e7f8bdb41b8bb5567f135f4484f28c4e 100644 --- a/pypcc/config/APSPUTR.yaml +++ b/pypcc/config/APSPUTR.yaml @@ -98,7 +98,7 @@ variables: description: Version number driver: I2C_PU devreg: ROM.Version - width: 0x80 #10 characters + width: 0x100 #32 characters rw: ro dtype: string @@ -106,7 +106,7 @@ variables: description: PCB number (astron.nl/webforms/IenS-Boarden/view.php?id=xxx) driver: I2C_PU devreg: ROM.Serial - width: 0x80 #16 characters + width: 0x100 #32 characters rw: ro dtype: string diff --git a/pypcc/config/UNB2TR.yaml b/pypcc/config/UNB2TR.yaml index 08d98afe0d0e0d29713a9e99c9ea999aca0f98cd..7b45251317e7e17a8c9a4f66b9e8ab199715da9b 100644 --- a/pypcc/config/UNB2TR.yaml +++ b/pypcc/config/UNB2TR.yaml @@ -220,7 +220,7 @@ variables: dim: 48 dim2: [24,2] - name: UNB2TR_I2C_bus_DDR4_error - driver: switch_QSFP + driver: switch_DDR4 rw: ro dtype: uint8 dim: 8 @@ -293,7 +293,7 @@ variables: - name: UNB2_PCB_version driver: switch_UNB2 devreg: 0x50.0 - width: 0x80 #16 char + width: 0x100 #32 char rw: ro dtype: string dim: 2 @@ -302,7 +302,7 @@ variables: description: PCB number (astron.nl/webforms/IenS-Boarden/view.php?id=xxx) driver: switch_UNB2 devreg: 0x50.0x20 - width: 0x80 #16 characters + width: 0x100 #32 characters rw: ro dtype: string dim: 2 @@ -397,7 +397,7 @@ variables: - name: UNB2_FPGA_DDR4_SLOT_PART_NUMBER driver: switch_DDR4 - devreg: [0x18.0x149,0x19.0x149] + devreg: [0x50.0x149,0x51.0x149] width: 160 rw: hidden #ro dtype: string diff --git a/python_scripts/setVersion2.py b/python_scripts/setVersion2.py index 64a654e392b4e77c1a47c87f93b68fc54e36227f..2ad323c42d7818ea109d9a64ee16b6665cb27d72 100644 --- a/python_scripts/setVersion2.py +++ b/python_scripts/setVersion2.py @@ -10,17 +10,17 @@ logFile='SetVersion' import logging import argparse -from opcuaserv import opcuaserv -from opcuaserv import i2client -from opcuaserv import yamlreader +from pypcc.opcuaserv import opcuaserv +from pypcc.opcuaserv import i2client +from pypcc.opcuaserv import yamlreader #from opcuaserv import pypcc2 -from i2cserv import i2cthread +from pypcc.i2cserv import i2cthread import threading import time import sys import signal -from yamlconfig import Find; -import yamlconfig as yc +from pypcc.yamlconfig import Find; +import pypcc.yamlconfig as yc from datetime import datetime testtime=datetime.now().strftime("%y-%m-%d %H:%M")