Changeset 4650

Timestamp:

09/16/08 16:40:57 (5 years ago)

Author:

werner

Message:

Highlights:

• yet more decoding fixes
• measurement of distance from user-defined origin, toggled with [Space]

Details:

• lib/decode.py (decode_address): range check for known FBR indices allowed too large values
• lib/decode.py (decode_arg): do not cut off the byte/block count in CMD53 reads
• lib/decode.py (decode_arg): merged common processing of CMD52 and CMD53
• lib/wave.py (digital.debounce): do not delete the beginning of the waveform if the acquisition begins inside a glitch
• lib/dxplore.py (measurement.init): follow "s" with a space to keep format from changing when changing units
• lib/dxplore.py (measurement.hide): prefix is also shown when hidden
• lib/dxplore.py: added prefixes to all measurements
• lib/dxplore.py: added measurement relative to a user-defined origin, toggled with [Space]

Location:

developers/werner/ahrt/host/tmc

Files:

• demo/dxplore.py (modified) (1 diff)
• lib/decode.py (modified) (2 diffs)
• lib/dxplore.py (modified) (8 diffs)
• lib/wave.py (modified) (1 diff)

developers/werner/ahrt/host/tmc/demo/dxplore.py

@@ -30 +30 @@
 for wv in w[1:]:
     dig.append(wv.digitize(0.5))
+#    dig[-1].debounce(100e-9)
 
 min = dig[0].sample_step()

developers/werner/ahrt/host/tmc/lib/decode.py

@@ -83 +83 @@
 
     # FBR
-    if addr >= 0x100 and addr < 0x800 and (addr & 0xff) < 0x112:
+    if addr >= 0x100 and addr < 0x800 and (addr & 0xff) < 0x12:
         return ("F%d" % (addr >> 8))+(
             "FIC", "EFC", "Pwr", "RFU",
@@ -95 +95 @@
 
 def decode_arg(cmd, arg):
-    if cmd == 52:
+    if cmd == 52 or cmd == 53:
         write = (arg >> 31) & 1
         s = ("R", "W")[write]
         s += str((arg >> 28) & 7)
-        s += (" ", "W")[(arg >> 27) & 1]
         addr = (arg >> 9) & 0x1ffff
         name = decode_address(addr)
         if name is None:
-            s += "0x%X" % addr
+            addr = "0x%X" % addr
         else:
-            s += name+("(0x%X)" % addr)
+            addr = name+("(0x%X)" % addr)
+    if cmd == 52:
+        s += (" ", "W")[(arg >> 27) & 1]
+        s += addr
         if not write:
-            return s
-        return s+",0x%X" % (arg & 0xff)
+            s += ",0x%X" % (arg & 0xff)
+        return s
     if cmd == 53:
-        write = (arg >> 31) & 1
-        s = ("R", "W")[write]
-        s += str((arg >> 28) & 7)
         s += ("b", "B")[(arg >> 27) & 1]
         s += ("=", "+")[(arg >> 26) & 1]
-        addr = (arg >> 9) & 0x1ffff
-        name = decode_address(addr)
-        if name is None:
-            s += "0x%X" % addr
-        else:
-            s += name+("(0x%X)" % addr)
-        if not write:
-            return s
+        s += addr
         return s+"*%d" % (arg & 0x1ff)
     return None

developers/werner/ahrt/host/tmc/lib/dxplore.py

@@ -146 +146 @@
         self.fn = (
           ( self.show_samples, "Sa" ),
-          ( self.show_time, "s" ),
+          ( self.show_time, "s " ),
           ( self.show_frequency, "Hz" ))
 
@@ -154 +154 @@
         self.last_prefix = None
         self.var = StringVar()
-        self.button = Button(master, textvariable = self.var, width = 12,
+        self.button = Button(master, textvariable = self.var, width = 14,
           relief = FLAT, borderwidth = 0, font = self.font,
           fg = self.color, bg = self.background_color,
@@ -256 +256 @@
 
     def hide(self):
-        self.var.set(" "*9+self.fn[self.index][1])
+        self.var.set(self.prefix+" "*9+self.fn[self.index][1])
         self.last = None
 
@@ -283 +283 @@
         self.main.wz.tag_raise(self.zoom_tag)
         self.main.meas_pos.show(self.pos)
+        if self.main.user_pos is not None:
+            self.main.meas_user.show(self.pos-self.main.user_pos)
 
     def x_to_pos(self, x):
@@ -321 +323 @@
         self.setup_events(master)
         self.decode_from = None
+        self.user_pos = None
         self.ch = []
         self.cur = cursor(self)
@@ -355 +358 @@
         w.pack(expand = 1, fill = "x")
 
-        self.meas_start = measurement(w, 0, sample_step)
-        self.meas_pos = measurement(w, t0, sample_step)
+        self.meas_start = measurement(w, 0, sample_step, "SEL ")
+        self.meas_pos = measurement(w, t0, sample_step, "CUR ")
+        self.meas_user = measurement(w, 0, sample_step, "USR ")
         self.meas_width = measurement(w, 0, sample_step)
 
@@ -388 +392 @@
         master.bind(".", self.center)
         master.bind("c", self.center)
+        master.bind("<space>", self.user_coord)
 
     def decoder_menu(self, master, ch, n):
@@ -482 +487 @@
             self.cur.pos = self.samples-1
         self.center(event)
+
+    def user_coord(self, event):
+        if self.user_pos is None:
+            self.user_pos = self.cur.pos
+            self.meas_user.show(0)
+        else:
+            self.user_pos = None
+            self.meas_user.hide()
 
     def reset(self):

developers/werner/ahrt/host/tmc/lib/wave.py

@@ -497 +497 @@
                 i += 1
             else:
-                del self.data[i]
-                del self.data[i]
+                # If we begin in a glitch, we just remove the second entry,
+                # so that the start of the waveform is preserved.
+                if i == 0:
+                    del self.data[1]
+                    self.initial = not self.initial
+                else:
+                    del self.data[i]
+                    del self.data[i]
 
     def __len__(self):