From f04964c696336f5699a099bbd64785f199d91f4c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 10 Aug 2014 09:22:29 +0200 Subject: spi/nrf24l01/uart: Use ChannelError exception. Rename the old MissingDataError to the clearer ChannelError. Also, add ChannelError in the UART decoder. --- decoders/nrf24l01/pd.py | 4 ++-- decoders/nrf24l01/test/test.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'decoders/nrf24l01') diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py index 410a847..99a7d6e 100644 --- a/decoders/nrf24l01/pd.py +++ b/decoders/nrf24l01/pd.py @@ -20,7 +20,7 @@ import sigrokdecode as srd -class MissingDataError(Exception): +class ChannelError(Exception): pass regs = { @@ -284,7 +284,7 @@ class Decoder(srd.Decoder): pos = (ss, es) if miso is None or mosi is None: - raise MissingDataError('Both MISO and MOSI pins required.') + raise ChannelError('Both MISO and MOSI pins required.') if self.first: self.first = False diff --git a/decoders/nrf24l01/test/test.conf b/decoders/nrf24l01/test/test.conf index 8b6d77b..986d30d 100644 --- a/decoders/nrf24l01/test/test.conf +++ b/decoders/nrf24l01/test/test.conf @@ -56,14 +56,14 @@ test no-mosi protocol-decoder nrf24l01 stack spi nrf24l01 input spi/nrf24l01/nrf24l01-test-no-command.sr - output nrf24l01 exception match MissingDataError + output nrf24l01 exception match ChannelError test no-miso protocol-decoder spi channel cs=0 channel clk=1 channel mosi=2 protocol-decoder nrf24l01 stack spi nrf24l01 input spi/nrf24l01/nrf24l01-test-no-command.sr - output nrf24l01 exception match MissingDataError + output nrf24l01 exception match ChannelError test unknown-command protocol-decoder spi channel cs=0 channel clk=1 channel mosi=2 channel miso=3 -- cgit v1.2.3-70-g09d2