X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcommon%2Fsrdhelper%2Fmod.py;h=b56cce6df3dbb2385136f462ac7af45fc11e706c;hb=3f77dc2aae971c4ba97ad81c851c63b681074410;hp=e1fac3df97c7b03e7866181bb48a1baf0ba0c18f;hpb=fe89c3b4d410c8f4203470cb412bf8f03279c391;p=libsigrokdecode.git

diff --git a/decoders/common/srdhelper/mod.py b/decoders/common/srdhelper/mod.py
index e1fac3d..b56cce6 100644
--- a/decoders/common/srdhelper/mod.py
+++ b/decoders/common/srdhelper/mod.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2012-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012-2020 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,8 +17,9 @@
 ## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-from enum import IntEnum, unique
+from enum import Enum, IntEnum, unique
 from itertools import chain
+import re
 
 # Return the specified BCD number (max. 8 bits) as integer.
 def bcd2int(b):
@@ -30,6 +31,20 @@ def bin2int(s: str):
 def bitpack(bits):
     return sum([b << i for i, b in enumerate(bits)])
 
+def bitpack_lsb(bits, idx=None):
+    '''Conversion from LSB first bit sequence to integer.'''
+    if idx is not None:
+        bits = [b[idx] for b in bits]
+    return bitpack(bits)
+
+def bitpack_msb(bits, idx=None):
+    '''Conversion from MSB first bit sequence to integer.'''
+    bits = bits[:]
+    if idx is not None:
+        bits = [b[idx] for b in bits]
+    bits.reverse()
+    return bitpack(bits)
+
 def bitunpack(num, minbits=0):
     res = []
     while num or minbits > 0:
@@ -38,6 +53,18 @@ def bitunpack(num, minbits=0):
         minbits -= 1
     return tuple(res)
 
+@unique
+class SrdStrEnum(Enum):
+    @classmethod
+    def from_list(cls, name, l):
+        # Keys are limited/converted to [A-Z0-9_], values can be any string.
+        items = [(re.sub('[^A-Z0-9_]', '_', l[i]), l[i]) for i in range(len(l))]
+        return cls(name, items)
+
+    @classmethod
+    def from_str(cls, name, s):
+        return cls.from_list(name, s.split())
+
 @unique
 class SrdIntEnum(IntEnum):
     @classmethod