trx_toolkit/data_msg.py: use uppercase for KNOWN_VERSIONS

Change-Id: Ie4dcc8e91115c514ace243a95a9b44a17cd976b4
Related: OS#4006, SYS#4895
This commit is contained in:
Vadim Yanitskiy 2021-02-26 16:56:10 +01:00 committed by fixeria
parent ba3e1f7c2a
commit c8754d47db
4 changed files with 8 additions and 8 deletions

View File

@ -176,7 +176,7 @@ class Application(ApplicationBase):
help = "How many bursts to send (default %(default)s)")
bg_group.add_argument("-v", "--hdr-version", metavar = "VER",
dest = "hdr_ver", type = int,
default = 0, choices = DATAMSG.known_versions,
default = 0, choices = DATAMSG.KNOWN_VERSIONS,
help = "TRXD header version (default %(default)s)")
bg_group.add_argument("-f", "--frame-number", metavar = "FN",
dest = "tdma_fn", type = int,

View File

@ -35,7 +35,7 @@ class DATAInterface(UDPLink):
log.debug("Init TRXD interface (%s)" % self.desc_link())
def set_hdr_ver(self, ver):
if not ver in DATAMSG.known_versions:
if not ver in DATAMSG.KNOWN_VERSIONS:
return False
self._hdr_ver = ver
@ -43,7 +43,7 @@ class DATAInterface(UDPLink):
def pick_hdr_ver(self, ver_req):
# Pick a version that is lower or equal to ver_req
for ver in DATAMSG.known_versions[::-1]:
for ver in DATAMSG.KNOWN_VERSIONS[::-1]:
if ver <= ver_req:
return ver

View File

@ -121,7 +121,7 @@ class DATAMSG(abc.ABC):
# NOTE: up to 16 versions can be encoded
CHDR_VERSION_MAX = 0b1111
known_versions = (0, 1)
KNOWN_VERSIONS = (0, 1)
def __init__(self, fn = None, tn = None, burst = None, ver = 0):
self.burst = burst
@ -209,7 +209,7 @@ class DATAMSG(abc.ABC):
def validate(self):
''' Validate the message fields (throws ValueError). '''
if not self.ver in self.known_versions:
if not self.ver in self.KNOWN_VERSIONS:
raise ValueError("Unknown TRXD header version %d" % self.ver)
if self.fn is None:
@ -263,7 +263,7 @@ class DATAMSG(abc.ABC):
# Parse the header version first
self.ver = (msg[0] >> 4)
if not self.ver in self.known_versions:
if not self.ver in self.KNOWN_VERSIONS:
raise ValueError("Unknown TRXD header version %d" % self.ver)
# Parse TDMA TN and FN

View File

@ -120,7 +120,7 @@ class DATAMSG_Test(unittest.TestCase):
# Validate encoding and decoding
def test_enc_dec(self):
for ver in DATAMSG.known_versions:
for ver in DATAMSG.KNOWN_VERSIONS:
with self.subTest("L1 -> TRX message", ver = ver):
msg = DATAMSG_L12TRX(ver = ver)
self._test_enc_dec(msg)
@ -180,7 +180,7 @@ class DATAMSG_Test(unittest.TestCase):
# Validate message transformation
def test_transform(self):
for ver in DATAMSG.known_versions:
for ver in DATAMSG.KNOWN_VERSIONS:
with self.subTest("L1 -> TRX message", ver = ver):
msg = DATAMSG_L12TRX(ver = ver)
self._test_transform(msg)