]> sigrok.org Git - libsigrokdecode.git/blobdiff - decoders/onewire/onewire.py
onewire decoder: removed some debug code, preparations for the next protocol layer
[libsigrokdecode.git] / decoders / onewire / onewire.py
index 24d265bf32dc3dbdab14087118b68772feffa14f..9ece3797813dac7b2f114759b3ad6b72ec5af209 100644 (file)
@@ -65,10 +65,13 @@ class Decoder(srd.Decoder):
         self.lnk_present = 0
         self.lnk_bit     = 0
         # Network layer variables
-        self.net_state   = 'WAIT FOR COMMAND'
+        self.net_state   = 'ROM COMMAND'
         self.net_event   = 'NONE'
         self.net_cnt     = 0
-        self.net_cmd     = 0
+        self.net_search  = "P"
+        self.net_data_p  = 0x0
+        self.net_data_n  = 0x0
+        self.net_data    = 0x0
         # Transport layer variables
         self.trn_state   = 'WAIT FOR EVENT'
         self.trn_event   = 'NONE'
@@ -104,17 +107,15 @@ class Decoder(srd.Decoder):
                     self.lnk_state = 'WAIT FOR DATA SAMPLE'
                     self.put(self.lnk_fall, self.samplenum, self.out_ann,
                              [ANN_DEC, ['LNK: NEGEDGE: ']])
-                    print ("DEBUG: NEGEDGE t0=%d t+=%d" % (self.lnk_fall, self.samplenum))
             elif self.lnk_state == 'WAIT FOR DATA SAMPLE':
                 # Data should be sample one 'time unit' after a falling edge
-                if (self.samplenum - self.lnk_fall == 1*self.time_base):
+                if (self.samplenum - self.lnk_fall == 0.5*self.time_base):
                     self.lnk_bit  = owr & 0x1
                     self.lnk_event = "DATA BIT"
                     if (self.lnk_bit) :  self.lnk_state = 'WAIT FOR FALLING EDGE'
                     else              :  self.lnk_state = 'WAIT FOR RISING EDGE'
                     self.put(self.lnk_fall, self.samplenum, self.out_ann,
                              [ANN_DEC, ['LNK: BIT: ' + str(self.lnk_bit)]])
-                    print ("DEBUG: BIT=%d t0=%d t+=%d" % (self.lnk_bit, self.lnk_fall, self.samplenum))
             elif self.lnk_state == 'WAIT FOR RISING EDGE':
                 # The end of a cycle is a rising edge.
                 if (owr == 1):
@@ -139,9 +140,12 @@ class Decoder(srd.Decoder):
                 # Data should be sample one 'time unit' after a falling edge
                 if (self.samplenum - self.lnk_rise == 2.5*self.time_base):
                     self.lnk_present = owr & 0x1
+                    # Save the sample number for the falling edge.
+                    if not (self.lnk_present) :  self.lnk_fall = self.samplenum
+                    # create presence detect event
                     #self.lnk_event   = "PRESENCE DETECT"
-                    if (self.lnk_bit) :  self.lnk_state = 'WAIT FOR FALLING EDGE'
-                    else              :  self.lnk_state = 'WAIT FOR RISING EDGE'
+                    if (self.lnk_present) :  self.lnk_state = 'WAIT FOR FALLING EDGE'
+                    else                  :  self.lnk_state = 'WAIT FOR RISING EDGE'
                     self.put(self.lnk_fall, self.samplenum, self.out_ann,
                              [ANN_DEC, ['LNK: PRESENCE: ' + str(self.lnk_present)]])
                     print ("DEBUG: PRESENCE=%d t0=%d t+=%d" % (self.lnk_present, self.lnk_fall, self.samplenum))
@@ -154,48 +158,116 @@ class Decoder(srd.Decoder):
             self.net_event = "RESET"
             # State machine.
             if (self.lnk_event == "RESET"):
-                self.net_state = "WAIT FOR COMMAND"
-                self.net_cnt = 0
-                self.net_cmd = 0
+                self.net_state = "ROM COMMAND"
+                self.net_search = "P"
+                self.net_cnt    = 0
             elif (self.lnk_event == "DATA BIT"):
-                if (self.net_state == "WAIT FOR COMMAND"):
-                    self.net_cnt = self.net_cnt + 1
-                    self.net_cmd = (self.net_cmd << 1) & self.lnk_bit
-                    if (self.net_cnt == 8):
-                        self.put(self.lnk_fall, self.samplenum,
-                                 self.out_proto, ['LNK: COMMAND', self.net_cmd])
+                if (self.net_state == "ROM COMMAND"):
+                    if (self.collect_data(8)):
+#                        self.put(self.lnk_fall, self.samplenum,
+#                                 self.out_proto, ['LNK: COMMAND', self.net_data])
                         self.put(self.lnk_fall, self.samplenum, self.out_ann,
-                                 [ANN_DEC, ['LNK: COMMAND: ' + self.net_cmd]])
-                        if   (self.net_cmd == 0x33):
+                                 [ANN_DEC, ['NET: ROM COMMAND: 0x' + hex(self.net_data)]])
+                        print ("DEBUG: ROM_COMMAND=0x%02x t0=%d t+=%d" % (self.net_data, self.lnk_fall, self.samplenum))
+                        if   (self.net_data == 0x33):
                             # READ ROM
-                            break
-                        elif (self.net_cmd == 0x0f):
-                            # READ ROM
-                            break
-                        elif (self.net_cmd == 0xcc):
+                            self.net_state = "ADDRESS"
+                        elif (self.net_data == 0x0f):
+                            # READ ROM TODO
+                            self.net_state = "ADDRESS"
+                        elif (self.net_data == 0xcc):
                             # SKIP ROM
-                            break
-                        elif (self.net_cmd == 0x55):
+                            self.net_state = "CONTROL COMMAND"
+                        elif (self.net_data == 0x55):
                             # MATCH ROM
-                            break
-                        elif (self.net_cmd == 0xf0):
+                            self.net_state = "ADDRESS"
+                        elif (self.net_data == 0xf0):
                             # SEARCH ROM
-                            break
-                        elif (self.net_cmd == 0x3c):
+                            self.net_state = "SEARCH"
+                        elif (self.net_data == 0x3c):
                             # OVERDRIVE SKIP ROM
-                            break
-                        elif (self.net_cmd == 0x69):
+                            self.net_state = "CONTROL COMMAND"
+                        elif (self.net_data == 0x69):
                             # OVERDRIVE MATCH ROM
-                            break
-                        self.net_cnt = 0
-                elif (self.net_state == "WAIT FOR ROM"):
-                    #
-                    break
+                            self.net_state = "ADDRESS"
+                elif (self.net_state == "ADDRESS"):
+                    # family code (1B) + serial number (6B) + CRC (1B)
+                    if (self.collect_data((1+6+1)*8)):
+                        self.net_address = self.net_data & 0xffffffffffffffff
+                        self.net_state = "CONTROL COMMAND"
+                elif (self.net_state == "SEARCH"):
+                    # family code (1B) + serial number (6B) + CRC (1B)
+                    if (self.collect_search((1+6+1)*8)):
+                        self.net_address = self.net_data & 0xffffffffffffffff
+                        self.net_state = "CONTROL COMMAND"
+                elif (self.net_state == "CONTROL COMMAND"):
+                    if (self.collect_data(8)):
+#                        self.put(self.lnk_fall, self.samplenum,
+#                                 self.out_proto, ['LNK: COMMAND', self.net_data])
+                        self.put(self.lnk_fall, self.samplenum, self.out_ann,
+                                 [ANN_DEC, ['NET: FUNCTION COMMAND: 0x' + hex(self.net_data)]])
+                        print ("DEBUG: FUNCTION_COMMAND=0x%02x t0=%d t+=%d" % (self.net_data, self.lnk_fall, self.samplenum))
+                        if   (self.net_data == 0x48):
+                            # COPY SCRATCHPAD
+                            self.net_state = "TODO"
+                        elif (self.net_data == 0x4e):
+                            # WRITE SCRATCHPAD
+                            self.net_state = "TODO"
+                        elif (self.net_data == 0xbe):
+                            # READ SCRATCHPAD
+                            self.net_state = "TODO"
+                        elif (self.net_data == 0xb8):
+                            # RECALL E2
+                            self.net_state = "TODO"
+                        elif (self.net_data == 0xb4):
+                            # READ POWER SUPPLY
+                            self.net_state = "TODO"
+                        else:
+                            # unsupported commands
+                            self.net_state = "UNDEFINED"
+                elif (self.net_state == "UNDEFINED"):
+                    pass
                 else:
-                    raise Exception('Invalid net_state: %d' % self.net_state)
-            elif not (self.lnk_event == "NONE"):
+                    raise Exception('Invalid net_state: %s' % self.net_state)
+            elif (self.lnk_event != "NONE"):
                 raise Exception('Invalid lnk_event: %s' % self.lnk_event)
 
 
-#                    if (self.samplenum == self.lnk_start + 8*self.time_base):
-#                        self.put(self.lnk_fall, self.samplenum - 1, self.out_proto, ['RESET'])
+    # Link/Network layer data collector
+    def collect_data (self, length):
+        #print ("DEBUG: BIT=%d t0=%d t+=%d" % (self.lnk_bit, self.lnk_fall, self.samplenum))
+        self.net_data = self.net_data & ~(1 << self.net_cnt) | (self.lnk_bit << self.net_cnt)
+        self.net_cnt  = self.net_cnt + 1
+        if (self.net_cnt == length):
+            self.net_data = self.net_data & ((1<<length)-1)
+            self.net_cnt  = 0
+            print ("DEBUG: DATA=0x%0x t0=%d t+=%d" % (self.net_data, self.lnk_fall, self.samplenum))
+            return (1)
+        else:
+            return (0)
+
+    # Link/Network layer search collector
+    def collect_search (self, length):
+        #print ("DEBUG: SEARCH=%s BIT=%d t0=%d t+=%d" % (self.net_search, self.lnk_bit, self.lnk_fall, self.samplenum))
+        if   (self.net_search == "P"):
+          self.net_data_p = self.net_data_p & ~(1 << self.net_cnt) | (self.lnk_bit << self.net_cnt)
+          self.net_search = "N"
+        elif (self.net_search == "N"):
+          self.net_data_n = self.net_data_n & ~(1 << self.net_cnt) | (self.lnk_bit << self.net_cnt)
+          self.net_search = "D"
+        elif (self.net_search == "D"):
+          self.net_data   = self.net_data   & ~(1 << self.net_cnt) | (self.lnk_bit << self.net_cnt)
+          self.net_search = "P"
+          self.net_cnt    = self.net_cnt + 1
+        if (self.net_cnt == length):
+            self.net_data_p = self.net_data_p & ((1<<length)-1)
+            self.net_data_n = self.net_data_n & ((1<<length)-1)
+            self.net_data   = self.net_data   & ((1<<length)-1)
+            self.net_search = "P"
+            self.net_cnt    = 0
+            print ("DEBUG: SEARCH_P=0x%0x t0=%d t+=%d" % (self.net_data_p, self.lnk_fall, self.samplenum))
+            print ("DEBUG: SEARCH_N=0x%0x t0=%d t+=%d" % (self.net_data_n, self.lnk_fall, self.samplenum))
+            print ("DEBUG: SEARCH  =0x%0x t0=%d t+=%d" % (self.net_data  , self.lnk_fall, self.samplenum))
+            return (1)
+        else:
+            return (0)