From: Uwe Hermann Date: Wed, 1 Jan 2020 19:22:03 +0000 (+0100) Subject: mcs48: Use SrdIntEnum for annotation classes. X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=6d6b23f908cb908fa6495bcd4a7bcc787177fd2f;p=libsigrokdecode.git mcs48: Use SrdIntEnum for annotation classes. --- diff --git a/decoders/mcs48/pd.py b/decoders/mcs48/pd.py index 99b2efc..8c52de9 100644 --- a/decoders/mcs48/pd.py +++ b/decoders/mcs48/pd.py @@ -18,6 +18,10 @@ ## import sigrokdecode as srd +from common.srdhelper import SrdIntEnum + +Ann = SrdIntEnum.from_str('Ann', 'ROMDATA') +Bin = SrdIntEnum.from_str('Bin', 'ROMDATA') class ChannelError(Exception): pass @@ -95,10 +99,10 @@ class Decoder(srd.Decoder): self.data_s = self.samplenum if self.started: anntext = '{:04X}:{:02X}'.format(self.addr, self.data) - self.put(self.addr_s, self.data_s, self.out_ann, [0, [anntext]]) + self.put(self.addr_s, self.data_s, self.out_ann, [Ann.ROMDATA, [anntext]]) bindata = self.addr.to_bytes(2, byteorder='big') bindata += self.data.to_bytes(1, byteorder='big') - self.put(self.addr_s, self.data_s, self.out_bin, [0, bindata]) + self.put(self.addr_s, self.data_s, self.out_bin, [Bin.ROMDATA, bindata]) def decode(self): # Address bits above A11 are optional, and are considered to be A12+.