summaryrefslogtreecommitdiff
path: root/decoders/nrf24l01
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2014-08-10 09:22:29 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2014-08-14 17:44:20 +0200
commitf04964c696336f5699a099bbd64785f199d91f4c (patch)
tree78c63f1f0c5c4ac6d2e0b022bc9d463a43f40300 /decoders/nrf24l01
parent8aeedf9ee376f1b48fe9c42924ebf34f9c8c2ddd (diff)
downloadlibsigrokdecode-f04964c696336f5699a099bbd64785f199d91f4c.tar.gz
libsigrokdecode-f04964c696336f5699a099bbd64785f199d91f4c.zip
spi/nrf24l01/uart: Use ChannelError exception.
Rename the old MissingDataError to the clearer ChannelError. Also, add ChannelError in the UART decoder.
Diffstat (limited to 'decoders/nrf24l01')
-rw-r--r--decoders/nrf24l01/pd.py4
-rw-r--r--decoders/nrf24l01/test/test.conf4
2 files changed, 4 insertions, 4 deletions
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