X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fstepper_motor%2Fpd.py;h=05463958a28797b196405843cda420f4fd7d543d;hb=d1b7bd1b602149cef4183f5a05188c0467bcd280;hp=b6ff9b105960c0a269de6818970f7a6cb8ac2fc2;hpb=e500b376b5cf74f4862688f310b9b8008bfc3eea;p=libsigrokdecode.git

diff --git a/decoders/stepper_motor/pd.py b/decoders/stepper_motor/pd.py
index b6ff9b1..0546395 100644
--- a/decoders/stepper_motor/pd.py
+++ b/decoders/stepper_motor/pd.py
@@ -14,15 +14,11 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 import sigrokdecode as srd
 
-class SamplerateError(Exception):
-    pass
-
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'stepper_motor'
@@ -51,6 +47,10 @@ class Decoder(srd.Decoder):
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
+        self.samplerate = None
         self.oldstep = None
         self.ss_prev_step = None
         self.pos = 0
@@ -71,12 +71,13 @@ class Decoder(srd.Decoder):
 
     def step(self, ss, direction):
         if self.ss_prev_step is not None:
-            delta = ss - self.ss_prev_step
-            speed = self.samplerate / delta / self.scale
-            speed_txt = self.format % speed
+            if self.samplerate:
+                delta = ss - self.ss_prev_step
+                speed = self.samplerate / delta / self.scale
+                speed_txt = self.format % speed
+                self.put(self.ss_prev_step, ss, self.out_ann,
+                    [0, [speed_txt + ' ' + self.unit + '/s', speed_txt]])
             pos_txt = self.format % (self.pos / self.scale)
-            self.put(self.ss_prev_step, ss, self.out_ann,
-                [0, [speed_txt + ' ' + self.unit + '/s', speed_txt]])
             self.put(self.ss_prev_step, ss, self.out_ann,
                 [1, [pos_txt + ' ' + self.unit, pos_txt]])
 
@@ -88,8 +89,6 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     def decode(self):
-        if not self.samplerate:
-            raise SamplerateError('Cannot decode without samplerate.')
         while True:
             step, direction = self.wait({0: 'r'})
             self.step(self.samplenum, direction)