## 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 = 1
+ api_version = 2
id = 'can'
name = 'CAN'
longname = 'Controller Area Network'
('ack-delimiter', 'ACK delimiter'),
('stuff-bit', 'Stuff bit'),
('warnings', 'Human-readable warnings'),
+ ('bit', 'Bit'),
+ )
+ annotation_rows = (
+ ('bits', 'Bits', (15, 17)),
+ ('fields', 'Fields', tuple(range(15)) + (16,)),
)
- def __init__(self, **kwargs):
+ def __init__(self):
self.samplerate = None
self.reset_variables()
return False
# Stuff bit. Keep it in self.rawbits, but drop it from self.bits.
- self.putx([15, ['Stuff bit: %d' % self.rawbits[-1],
- 'SB: %d' % self.rawbits[-1], 'SB']])
self.bits.pop() # Drop last bit.
return True
# Get the index of the current CAN frame bit (without stuff bits).
bitnum = len(self.bits) - 1
- # For debugging.
- # self.putx([0, ['Bit %d (CAN bit %d): %d' % \
- # (self.curbit, bitnum, can_rx)]])
-
# If this is a stuff bit, remove it from self.bits and ignore it.
if self.is_stuff_bit():
+ self.putx([15, [str(can_rx)]])
self.curbit += 1 # Increase self.curbit (bitnum is not affected).
return
+ else:
+ self.putx([17, [str(can_rx)]])
# Bit 0: Start of frame (SOF) bit
if bitnum == 0:
self.curbit += 1
def decode(self, ss, es, data):
- if self.samplerate is None:
- raise Exception("Cannot decode without samplerate.")
+ if not self.samplerate:
+ raise SamplerateError('Cannot decode without samplerate.')
for (self.samplenum, pins) in data:
(can_rx,) = pins
if not self.reached_bit(self.curbit):
continue
self.handle_bit(can_rx)
- else:
- raise Exception("Invalid state: %s" % self.state)
-