X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fedid%2Fedid.py;h=a56bb572d5b30b6748adf417824c02cab4085fb1;hb=1b75abfdd3e00ef590c9d1905863f6f2cb5a8632;hp=6d53bf1a609baac4d2d4b894d1e0ce99019bc37b;hpb=2a706c20b73ea466a16c7f5ae6a8b0d44e470053;p=libsigrokdecode.git diff --git a/decoders/edid/edid.py b/decoders/edid/edid.py index 6d53bf1..a56bb57 100644 --- a/decoders/edid/edid.py +++ b/decoders/edid/edid.py @@ -17,6 +17,8 @@ ## along with this program; if not, see . ## +# EDID protocol decoder + # TODO: # - EDID < 1.3 # - add short annotations @@ -28,7 +30,6 @@ import sigrokdecode as srd import os - EDID_HEADER = [0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00] OFF_VENDOR = 8 OFF_VERSION = 18 @@ -58,7 +59,7 @@ est_modes = [ "1024x768@70Hz", "1024x768@75Hz", "1280x1024@75Hz", - "1152x870@75Hz" + "1152x870@75Hz", ] # X:Y display aspect ratios, as used in standard timing modes @@ -66,14 +67,13 @@ xy_ratio = [ (16, 10), (4, 3), (5, 4), - (16, 9) + (16, 9), ] # Annotation types ANN_FIELDS = 0 ANN_SECTIONS = 1 - class Decoder(srd.Decoder): api_version = 1 id = 'edid' @@ -105,7 +105,7 @@ class Decoder(srd.Decoder): if type(data) != int: raise Exception('malformed ddc2 input: expected 1 byte') self.cnt += 1 - self.sn.append( [ss, es] ) + self.sn.append([ss, es]) self.cache.append(data) # debug # self.put(ss, es, self.out_ann, [0, ["%d: [%.2x]" % (self.cnt, data)]]) @@ -256,7 +256,7 @@ class Decoder(srd.Decoder): elif dt == 1: dtstr = 'RGB color' elif dt == 2: - dtstr = 'non-RGB multicolor' + dtstr = 'non-RGB multicolor' if dtstr: self.ann_field(offset+4, offset+4, "Display type: %s" % dtstr) if fs & 0x04: @@ -428,15 +428,15 @@ class Decoder(srd.Decoder): # Monitor range limits self.put(self.sn[offset][0], self.sn[offset+17][1], self.out_ann, [ANN_SECTIONS, ["Monitor range limits"]]) - self.ann_field(offset+5, offset+5, "Minimum vertical rate: %dHz" % + self.ann_field(offset+5, offset+5, "Minimum vertical rate: %dHz" % self.cache[offset+5]) - self.ann_field(offset+6, offset+6, "Maximum vertical rate: %dHz" % + self.ann_field(offset+6, offset+6, "Maximum vertical rate: %dHz" % self.cache[offset+6]) - self.ann_field(offset+7, offset+7, "Minimum horizontal rate: %dkHz" % + self.ann_field(offset+7, offset+7, "Minimum horizontal rate: %dkHz" % self.cache[offset+7]) - self.ann_field(offset+8, offset+8, "Maximum horizontal rate: %dkHz" % + self.ann_field(offset+8, offset+8, "Maximum horizontal rate: %dkHz" % self.cache[offset+8]) - self.ann_field(offset+9, offset+9, "Maximum pixel clock: %dMHz" % + self.ann_field(offset+9, offset+9, "Maximum pixel clock: %dMHz" % (self.cache[offset+9] * 10)) if self.cache[offset+10] == 0x02: # Secondary GTF curve supported @@ -462,6 +462,3 @@ class Decoder(srd.Decoder): if self.cache[i+2] == 0 or self.cache[i+4] == 0: self.decode_descriptor(i) - - -