## This file is part of the libsigrokdecode project.
##
## Copyright (C) 2014 Torsten Duwe <duwe@suse.de>
+## Copyright (C) 2014 Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
inputs = ['logic']
outputs = ['pwm']
channels = (
- {'id': 'pwm', 'name': 'PWM in', 'desc': 'Modulation pulses'},
+ {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
)
options = (
- {'id': 'new_cycle_edge', 'desc': 'New cycle on which edge',
- 'default': 'rising', 'values': ('rising', 'falling')},
+ {'id': 'polarity', 'desc': 'Polarity', 'default': 'active-high',
+ 'values': ('active-low', 'active-high')},
)
annotations = (
- ('value', 'PWM value'),
+ ('duty-cycle', 'Duty cycle'),
+ ('period', 'Period'),
+ )
+ annotation_rows = (
+ ('duty-cycle', 'Duty cycle', (0,)),
+ ('period', 'Period', (1,)),
)
binary = (
('raw', 'RAW file'),
)
- def __init__(self, **kwargs):
- self.ss = self.es = -1
- self.high = 1
- self.low = 1
- self.lastedge = 0
- self.oldpin = 0
- self.startedge = 0
+ def __init__(self):
+ self.ss_block = self.es_block = None
+ self.first_transition = True
+ self.first_samplenum = None
+ self.start_samplenum = None
+ self.end_samplenum = None
+ self.oldpin = None
self.num_cycles = 0
+ self.average = 0
+
+ def metadata(self, key, value):
+ if key == srd.SRD_CONF_SAMPLERATE:
+ self.samplerate = value
def start(self):
- self.out_python = self.register(srd.OUTPUT_PYTHON)
+ self.startedge = 0 if self.options['polarity'] == 'active-low' else 1
self.out_ann = self.register(srd.OUTPUT_ANN)
- self.out_bin = self.register(srd.OUTPUT_BINARY)
- self.out_freq = self.register(srd.OUTPUT_META,
- meta=(int, 'Frequency', 'PWM base (cycle) frequency'))
- self.startedge = 0
- if self.options['new_cycle_edge'] == 'falling':
- self.startedge = 1
+ self.out_binary = self.register(srd.OUTPUT_BINARY)
+ self.out_average = \
+ self.register(srd.OUTPUT_META,
+ meta=(float, 'Average', 'PWM base (cycle) frequency'))
def putx(self, data):
- self.put(self.ss, self.es, self.out_ann, data)
+ self.put(self.ss_block, self.es_block, self.out_ann, data)
+
+ def putp(self, period_t):
+ # Adjust granularity.
+ if period_t == 0 or period_t >= 1:
+ period_s = '%.1f s' % (period_t)
+ elif period_t <= 1e-12:
+ period_s = '%.1f fs' % (period_t * 1e15)
+ elif period_t <= 1e-9:
+ period_s = '%.1f ps' % (period_t * 1e12)
+ elif period_t <= 1e-6:
+ period_s = '%.1f ns' % (period_t * 1e9)
+ elif period_t <= 1e-3:
+ period_s = '%.1f μs' % (period_t * 1e6)
+ else:
+ period_s = '%.1f ms' % (period_t * 1e3)
- def putp(self, data):
- self.put(self.ss, self.es, self.out_python, data)
+ self.put(self.ss_block, self.es_block, self.out_ann, [1, [period_s]])
def putb(self, data):
- self.put(self.num_cycles, self.num_cycles, self.out_bin, data)
+ self.put(self.num_cycles, self.num_cycles, self.out_binary, data)
def decode(self, ss, es, data):
+
for (self.samplenum, pins) in data:
# Ignore identical samples early on (for performance reasons).
if self.oldpin == pins[0]:
continue
- if self.oldpin == 0: # Rising edge.
- self.low = self.samplenum - self.lastedge
- else:
- self.high = self.samplenum - self.lastedge
-
- if self.oldpin == self.startedge:
- self.es = self.samplenum # This interval ends at this edge.
- if self.ss >= 0: # Have we completed a hi-lo sequence?
- self.putx([0, ["%d%%" % ((100 * self.high) // (self.high + self.low))]])
- self.putb((0, bytes([(256 * self.high) // (self.high + self.low)])))
- self.num_cycles += 1
+ # Initialize self.oldpins with the first sample value.
+ if self.oldpin is None:
+ self.oldpin = pins[0]
+ continue
+
+ if self.first_transition:
+ # First rising edge
+ if self.oldpin != self.startedge:
+ self.first_samplenum = self.samplenum
+ self.start_samplenum = self.samplenum
+ self.first_transition = False
else:
- # Mid-interval.
- # This interval started at the previous edge.
- self.ss = self.lastedge
+ if self.oldpin != self.startedge:
+ # Rising edge
+ # We are on a full cycle we can calculate
+ # the period, the duty cycle and its ratio.
+ period = self.samplenum - self.start_samplenum
+ duty = self.end_samplenum - self.start_samplenum
+ ratio = float(duty / period)
+
+ # This interval starts at this edge.
+ self.ss_block = self.start_samplenum
+ # Store the new rising edge position and the ending
+ # edge interval.
+ self.start_samplenum = self.es_block = self.samplenum
+
+ # Report the duty cycle in percent.
+ percent = float(ratio * 100)
+ self.putx([0, ['%f%%' % percent]])
+
+ # Report the duty cycle in the binary output.
+ self.putb([0, bytes([int(ratio * 256)])])
+
+ # Report the period in units of time.
+ period_t = float(period / self.samplerate)
+ self.putp(period_t)
+
+ # Update and report the new duty cycle average.
+ self.num_cycles += 1
+ self.average += percent
+ self.put(self.first_samplenum, self.es_block, self.out_average,
+ float(self.average / self.num_cycles))
+ else:
+ # Falling edge
+ self.end_samplenum = self.ss_block = self.samplenum
- self.lastedge = self.samplenum
self.oldpin = pins[0]