From 8607f25b37f899c4e8c85a949bfc52cc3ae6c997 Mon Sep 17 00:00:00 2001 From: Sven Sager Date: Sun, 22 Aug 2021 17:10:31 +0200 Subject: [PATCH] Bugfix for offset check in piCtory file --- revpimodio2/device.py | 5 +++-- revpimodio2/netio.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/revpimodio2/device.py b/revpimodio2/device.py index 37dca3d..c3045c7 100644 --- a/revpimodio2/device.py +++ b/revpimodio2/device.py @@ -161,12 +161,13 @@ class Device(object): self._producttype = int(dict_device.get("productType")) # Offset-Check for broken piCtory configuration - if self._offset != parentmodio.length: + if self._offset < parentmodio.length: warnings.warn( "Device offset ERROR in piCtory configuration! Offset of '{0}' " "must be {1} but is {2} - Overlapping devices overwrite the " "same memory, which has unpredictable effects!!!" - "".format(self._name, parentmodio.length, self._offset) + "".format(self._name, parentmodio.length, self._offset), + Warning ) # IOM-Objekte erstellen und Adressen in SLCs speichern if simulator: diff --git a/revpimodio2/netio.py b/revpimodio2/netio.py index 60e9dfd..ed1467f 100644 --- a/revpimodio2/netio.py +++ b/revpimodio2/netio.py @@ -968,7 +968,7 @@ class RevPiNetIOSelected(RevPiNetIO): for vdev in self._lst_devselect: if type(vdev) != int and type(vdev) != str: - raise TypeError( + raise ValueError( "need device position as or device name as " "" )