X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fonewire_network%2Fonewire_network.py;h=a4f6f4af3e9cccaf4f2304ceeb5d8365e40342c9;hp=836bce980b9c4de10d77ecdb2f25d0d34eb7dd47;hb=6188e4e41ef0d9468a1b9f9bad5637ca862d73df;hpb=9cfb16e8532e34b40edf1d980c7438afb31668e0 diff --git a/decoders/onewire_network/onewire_network.py b/decoders/onewire_network/onewire_network.py index 836bce9..a4f6f4a 100644 --- a/decoders/onewire_network/onewire_network.py +++ b/decoders/onewire_network/onewire_network.py @@ -18,29 +18,27 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -# 1-Wire protocol decoder +# 1-Wire protocol decoder (network layer) import sigrokdecode as srd -# Annotation feed formats -ANN_NETWORK = 0 -ANN_TRANSPORT = 1 - -# a dictionary of ROM commands and their names -rom_command = {0x33: "READ ROM", - 0x0f: "CONDITIONAL READ ROM", - 0xcc: "SKIP ROM", - 0x55: "MATCH ROM", - 0xf0: "SEARCH ROM", - 0xec: "CONDITIONAL SEARCH ROM", - 0x3c: "OVERDRIVE SKIP ROM", - 0x6d: "OVERDRIVE MATCH ROM"} +# Dictionary of ROM commands and their names, next state. +command = { + 0x33: ['READ ROM' , 'GET ROM' ], + 0x0f: ['CONDITIONAL READ ROM' , 'GET ROM' ], + 0xcc: ['SKIP ROM' , 'TRANSPORT' ], + 0x55: ['MATCH ROM' , 'GET ROM' ], + 0xf0: ['SEARCH ROM' , 'SEARCH ROM'], + 0xec: ['CONDITIONAL SEARCH ROM', 'SEARCH ROM'], + 0x3c: ['OVERDRIVE SKIP ROM' , 'TRANSPORT' ], + 0x6d: ['OVERDRIVE MATCH ROM' , 'GET ROM' ], +} class Decoder(srd.Decoder): api_version = 1 id = 'onewire_network' name = '1-Wire network layer' - longname = '1-Wire serial communication bus' + longname = '1-Wire serial communication bus (network layer)' desc = 'Bidirectional, half-duplex, asynchronous serial bus.' license = 'gplv2+' inputs = ['onewire_link'] @@ -50,7 +48,6 @@ class Decoder(srd.Decoder): options = {} annotations = [ ['Network', 'Network layer events (device addressing)'], - ['Transport', 'Transport layer events'], ] def __init__(self, **kwargs): @@ -58,120 +55,128 @@ class Decoder(srd.Decoder): self.net_beg = 0 self.net_end = 0 # Network layer variables - self.state = 'COMMAND' + self.state = 'COMMAND' self.bit_cnt = 0 - self.search = "P" - self.data_p = 0x0 - self.data_n = 0x0 - self.data = 0x0 + self.search = 'P' + self.data_p = 0x0 + self.data_n = 0x0 + self.data = 0x0 self.net_rom = 0x0000000000000000 def start(self, metadata): self.out_proto = self.add(srd.OUTPUT_PROTO, 'onewire_network') - self.out_ann = self.add(srd.OUTPUT_ANN , 'onewire_network') + self.out_ann = self.add(srd.OUTPUT_ANN, 'onewire_network') def report(self): pass + def putx(self, data): + # Helper function for most annotations. + self.put(self.net_beg, self.net_end, self.out_ann, data) + + def puty(self, data): + # Helper function for most protocol packets. + self.put(self.net_beg, self.net_end, self.out_proto, data) + def decode(self, ss, es, data): - [code, val] = data + code, val = data # State machine. - if (self.code == "RESET"): - self.state = "COMMAND" - self.search = "P" + if code == 'RESET/PRESENCE': + self.search = 'P' self.bit_cnt = 0 - elif (self.code == "BIT"): - if (self.state == "COMMAND"): - # Receiving and decoding a ROM command - if (self.onewire_collect(8, val)): - self.put(self.net_beg, self.net_end, self.out_ann, [ANN_NETWORK, - ['ROM COMMAND: 0x%02x \'%s\'' % (self.data, rom_command[self.data])]]) - if (self.data == 0x33): # READ ROM - self.state = "GET ROM" - elif (self.data == 0x0f): # CONDITIONAL READ ROM - self.state = "GET ROM" - elif (self.data == 0xcc): # SKIP ROM - self.state = "TRANSPORT" - elif (self.data == 0x55): # MATCH ROM - self.state = "GET ROM" - elif (self.data == 0xf0): # SEARCH ROM - self.state = "SEARCH ROM" - elif (self.data == 0xec): # CONDITIONAL SEARCH ROM - self.state = "SEARCH ROM" - elif (self.data == 0x3c): # OVERDRIVE SKIP ROM - self.state = "TRANSPORT" - elif (self.data == 0x69): # OVERDRIVE MATCH ROM - self.state = "GET ROM" - elif (self.state == "GET ROM"): - # A 64 bit device address is selected - # family code (1B) + serial number (6B) + CRC (1B) - if (self.onewire_collect(64, val)): + self.put(ss, es, self.out_ann, + [0, ['RESET/PRESENCE: %s' % ('True' if val else 'False')]]) + self.put(ss, es, self.out_proto, ['RESET/PRESENCE', val]) + self.state = 'COMMAND' + elif code == 'BIT': + if self.state == 'COMMAND': + # Receiving and decoding a ROM command. + if self.onewire_collect(8, val, ss, es): + if self.data in command: + self.putx([0, ['ROM COMMAND: 0x%02x \'%s\'' + % (self.data, command[self.data][0])]]) + self.state = command[self.data][1] + else: + self.putx([0, ['ROM COMMAND: 0x%02x \'%s\'' + % (self.data, 'UNRECOGNIZED')]]) + self.state = 'COMMAND ERROR' + elif self.state == 'GET ROM': + # A 64 bit device address is selected. + # Family code (1B) + serial number (6B) + CRC (1B) + if self.onewire_collect(64, val, ss, es): self.net_rom = self.data & 0xffffffffffffffff - self.put(self.net_beg, self.net_end, self.out_ann, [ANN_NETWORK, ['ROM: 0x%016x' % self.net_rom]]) - self.state = "TRANSPORT" - elif (self.state == "SEARCH ROM"): - # A 64 bit device address is searched for - # family code (1B) + serial number (6B) + CRC (1B) - if (self.onewire_search(64)): + self.putx([0, ['ROM: 0x%016x' % self.net_rom]]) + self.puty(['ROM', self.net_rom]) + self.state = 'TRANSPORT' + elif self.state == 'SEARCH ROM': + # A 64 bit device address is searched for. + # Family code (1B) + serial number (6B) + CRC (1B) + if self.onewire_search(64, val, ss, es): self.net_rom = self.data & 0xffffffffffffffff - self.put(self.net_beg, self.net_end, self.out_ann, [ANN_NETWORK, ['ROM: 0x%016x' % self.net_rom]]) - self.state = "TRANSPORT" - elif (self.state == "TRANSPORT"): - # The transport layer is handled in byte sized units - if (self.onewire_collect(8, val)): - self.put(self.net_beg, self.net_end, self.out_ann, [ANN_NETWORK , ['TRANSPORT: 0x%02x' % self.data]]) - self.put(self.net_beg, self.net_end, self.out_ann, [ANN_TRANSPORT, ['TRANSPORT: 0x%02x' % self.data]]) - self.put(self.net_beg, self.net_end, self.out_proto, ['transfer', self.data]) - # TODO: Sending translort layer data to 1-Wire device models + self.putx([0, ['ROM: 0x%016x' % self.net_rom]]) + self.puty(['ROM', self.net_rom]) + self.state = 'TRANSPORT' + elif self.state == 'TRANSPORT': + # The transport layer is handled in byte sized units. + if self.onewire_collect(8, val, ss, es): + self.putx([0, ['DATA: 0x%02x' % self.data]]) + self.puty(['DATA', self.data]) + elif self.state == 'COMMAND ERROR': + # Since the command is not recognized, print raw data. + if self.onewire_collect(8, val, ss, es): + self.putx([0, ['ROM ERROR DATA: 0x%02x' % self.data]]) else: raise Exception('Invalid state: %s' % self.state) - - # Link/Network layer data collector - def onewire_collect (self, length, val): - # Storing the sampe this sequence begins with - if (self.bit_cnt == 1): - self.net_beg = self.ss + # Link/Network layer data collector. + def onewire_collect(self, length, val, ss, es): + # Storing the sample this sequence begins with. + if self.bit_cnt == 1: + self.net_beg = ss self.data = self.data & ~(1 << self.bit_cnt) | (val << self.bit_cnt) - self.bit_cnt = self.bit_cnt + 1 - # Storing the sampe this sequence ends with - # In case the full length of the sequence is received, return 1 - if (self.bit_cnt == length): - self.net_end = self.es - self.data = self.data & ((1<