diff options
| author | Gareth McMullin <gareth@blacksphere.co.nz> | 2011-12-01 23:09:40 +1300 |
|---|---|---|
| committer | Gareth McMullin <gareth@blacksphere.co.nz> | 2011-12-01 23:10:28 +1300 |
| commit | 67e847fd2185aa5677954dceacf3c279d7a68af1 (patch) | |
| tree | 81d6fc2e649e9414cc618ab615f88b8c6b4ef583 /decoders | |
| parent | 400f9ae7ff16bb611d758d75ff4931b667561b11 (diff) | |
| download | libsigrokdecode-67e847fd2185aa5677954dceacf3c279d7a68af1.tar.gz libsigrokdecode-67e847fd2185aa5677954dceacf3c279d7a68af1.zip | |
srd: PDs now explicitly register with sigrok module.
Diffstat (limited to 'decoders')
| -rw-r--r-- | decoders/i2c.py | 3 | ||||
| -rw-r--r-- | decoders/spi.py | 22 | ||||
| -rw-r--r-- | decoders/srd_usb.py | 3 |
3 files changed, 10 insertions, 18 deletions
diff --git a/decoders/i2c.py b/decoders/i2c.py index 93cf167..16e7491 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -143,6 +143,7 @@ def sampleiter(data, unitsize): yield(Sample(data[i:i+unitsize])) class Decoder(): + id = 'i2c' name = 'I2C' longname = 'Inter-Integrated Circuit (I2C) bus' desc = 'I2C is a two-wire, multi-master, serial bus.' @@ -351,3 +352,5 @@ class Decoder(): import sigrok +sigrok.register(Decoder) + diff --git a/decoders/spi.py b/decoders/spi.py index 383206b..d9891b3 100644 --- a/decoders/spi.py +++ b/decoders/spi.py @@ -18,6 +18,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +import sigrok + class Sample(): def __init__(self, data): self.data = data @@ -30,6 +32,7 @@ def sampleiter(data, unitsize): yield(Sample(data[i:i+unitsize])) class Decoder(): + id = 'spi' name = 'SPI Decoder' desc = '...desc...' longname = '...longname...' @@ -93,22 +96,5 @@ class Decoder(): # Keep stats for summary self.bytesreceived += 1 -if __name__ == '__main__': - data = open('spi_dump.bin').read() - - # dummy class to keep Decoder happy for test - class Sigrok(): - def put(self, data): - print "\t", data - sigrok = Sigrok() - - dec = Decoder(driver='ols', unitsize=1, starttime=0) - dec.decode({'time':0, 'duration':len(data), 'data':data, 'type':'logic'}) - - print dec.summary() -else: - import sigrok - -#Tested with: -# sigrok-cli -d 0:samplerate=1000000:rle=on --time=1s -p 1,2 -a spidec +sigrok.register(Decoder) diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py index 128b337..07fc732 100644 --- a/decoders/srd_usb.py +++ b/decoders/srd_usb.py @@ -111,6 +111,7 @@ def packet_decode(packet): return pid + ' ' + data class Decoder(): + id = 'usb' name = 'USB' desc = 'Universal Serial Bus' longname = '...longname...' @@ -184,3 +185,5 @@ class Decoder(): self.scount = 0 self.sym = sym +sigrok.register(Decoder) + |