X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Famulet_ascii%2Fpd.py;h=719532344727f98e566aeba51347644395b60907;hb=ec5fc441e38e59a57cd508abf420e30fc3c28e0d;hp=54733ef35dcde7ec10498eca4f790dc1245c2c49;hpb=f57bde305943ee2787f509625ff64299640562b1;p=libsigrokdecode.git

diff --git a/decoders/amulet_ascii/pd.py b/decoders/amulet_ascii/pd.py
index 54733ef..7195323 100644
--- a/decoders/amulet_ascii/pd.py
+++ b/decoders/amulet_ascii/pd.py
@@ -19,18 +19,15 @@
 
 import sigrokdecode as srd
 from math import ceil
+from common.srdhelper import SrdIntEnum
 from .lists import *
 
 L = len(cmds)
 RX = 0
 TX = 1
 
-# Don't forget to keep this in sync with 'cmds' is lists.py.
-class Ann:
-    PAGE, GBV, GWV, GSV, GLV, GRPC, SBV, SWV, SSV, RPC, LINE, RECT, FRECT, \
-    PIXEL, GBVA, GWVA, SBVA, GBVR, GWVR, GSVR, GLVR, GRPCR, SBVR, SWVR, SSVR, \
-    RPCR, LINER, RECTR, FRECTR, PIXELR, GBVAR, GWVAR, SBVAR, ACK, NACK, SWVA, \
-    SWVAR, GCV, GCVR, SCV, SCVR, BIT, FIELD, WARN = range(L + 3)
+Ann = SrdIntEnum.from_list('Ann',
+    [c[0] for c in cmds.values()] + ['BIT', 'FIELD', 'WARN'])
 
 def cmd_annotation_classes():
     return tuple([tuple([cmd[0].lower(), cmd[1]]) for cmd in cmds.values()])
@@ -53,7 +50,7 @@ class Decoder(srd.Decoder):
     annotation_rows = (
         ('bits', 'Bits', (L + 0,)),
         ('fields', 'Fields', (L + 1,)),
-        ('commands', 'Commands', tuple(range(len(cmds)))),
+        ('commands', 'Commands', tuple(range(L))),
         ('warnings', 'Warnings', (L + 2,)),
     )
     options = (