From: Uwe Hermann Date: Wed, 22 Jan 2014 21:56:08 +0000 (+0100) Subject: All PDs: Consistent naming/case for annotation shortnames/IDs. X-Git-Tag: libsigrokdecode-0.3.0~156 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=9f2f42c064e8a7100cee13460a7a3638f468f56a All PDs: Consistent naming/case for annotation shortnames/IDs. --- diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py index ffe8f00..a0daf0b 100644 --- a/decoders/avr_isp/pd.py +++ b/decoders/avr_isp/pd.py @@ -38,8 +38,8 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['text', 'Human-readable text'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/can/pd.py b/decoders/can/pd.py index 13a4b24..0234e33 100644 --- a/decoders/can/pd.py +++ b/decoders/can/pd.py @@ -38,23 +38,23 @@ class Decoder(srd.Decoder): 'sample_point': ['Sample point', 70], # 70% } annotations = [ - ['Data', 'CAN payload data'], - ['SOF', 'Start of frame'], - ['EOF', 'End of frame'], - ['ID', 'Identifier'], - ['Ext. ID', 'Extended identifier'], - ['Full ID', 'Full identifier'], - ['IDE', 'Identifier extension bit'], - ['Reserved bit', 'Reserved bit 0 and 1'], - ['RTR', 'Remote transmission request'], - ['SRR', 'Substitute remote request'], - ['DLC', 'Data length count'], - ['CRC sequence', 'CRC sequence'], - ['CRC delimiter', 'CRC delimiter'], - ['ACK slot', 'ACK slot'], - ['ACK delimiter', 'ACK delimiter'], - ['Stuff bit', 'Stuff bit'], - ['Warnings', 'Human-readable warnings'], + ['data', 'CAN payload data'], + ['sof', 'Start of frame'], + ['eof', 'End of frame'], + ['id', 'Identifier'], + ['ext-id', 'Extended identifier'], + ['full-id', 'Full identifier'], + ['ide', 'Identifier extension bit'], + ['reserved-bit', 'Reserved bit 0 and 1'], + ['rtr', 'Remote transmission request'], + ['srr', 'Substitute remote request'], + ['dlc', 'Data length count'], + ['crc-sequence', 'CRC sequence'], + ['crc-delimiter', 'CRC delimiter'], + ['ack-slot', 'ACK slot'], + ['ack-delimiter', 'ACK delimiter'], + ['stuff-bit', 'Stuff bit'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py index 223a4c0..4c76eeb 100644 --- a/decoders/dcf77/pd.py +++ b/decoders/dcf77/pd.py @@ -40,25 +40,25 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['start_of_minute', 'Start of minute'], - ['special_bits', 'Special bits (civil warnings, weather forecast)'], - ['call_bit', 'Call bit'], - ['summer_time', 'Summer time announcement'], + ['start-of-minute', 'Start of minute'], + ['special-bits', 'Special bits (civil warnings, weather forecast)'], + ['call-bit', 'Call bit'], + ['summer-time', 'Summer time announcement'], ['cest', 'CEST bit'], ['cet', 'CET bit'], - ['leap_second', 'Leap second bit'], - ['start_of_time', 'Start of encoded time'], + ['leap-second', 'Leap second bit'], + ['start-of-time', 'Start of encoded time'], ['minute', 'Minute'], - ['minute_parity', 'Minute parity bit'], + ['minute-parity', 'Minute parity bit'], ['hour', 'Hour'], - ['hour_parity', 'Hour parity bit'], + ['hour-parity', 'Hour parity bit'], ['day', 'Day of month'], - ['day_of_week', 'Day of week'], + ['day-of-week', 'Day of week'], ['month', 'Month'], ['year', 'Year'], - ['date_parity', 'Date parity bit'], - ['raw_bits', 'Raw bits'], - ['unknown_bits', 'Unknown bits'], + ['date-parity', 'Date parity bit'], + ['raw-bits', 'Raw bits'], + ['unknown-bits', 'Unknown bits'], ['warnings', 'Human-readable warnings'], ] diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py index 8e8a708..97431e0 100644 --- a/decoders/ds1307/pd.py +++ b/decoders/ds1307/pd.py @@ -48,7 +48,7 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py index 7d584fb..3928ae3 100644 --- a/decoders/jtag_stm32/pd.py +++ b/decoders/jtag_stm32/pd.py @@ -131,7 +131,7 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py index 08f338a..2f4d135 100644 --- a/decoders/lm75/pd.py +++ b/decoders/lm75/pd.py @@ -60,11 +60,11 @@ class Decoder(srd.Decoder): 'resolution': ['Resolution', 9], # 9-12 bit, sensor/config dependent } annotations = [ - ['Celsius', 'Temperature in degrees Celsius'], - ['Kelvin', 'Temperature in Kelvin'], - ['Text (verbose)', 'Human-readable text (verbose)'], - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['celsius', 'Temperature in degrees Celsius'], + ['kelvin', 'Temperature in Kelvin'], + ['text-verbose', 'Human-readable text (verbose)'], + ['text', 'Human-readable text'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py index f37c845..983e8d9 100644 --- a/decoders/lpc/pd.py +++ b/decoders/lpc/pd.py @@ -125,7 +125,7 @@ class Decoder(srd.Decoder): annotations = [ ['warnings', 'Warnings'], ['start', 'Start'], - ['cycle_type', 'Cycle-type/direction'], + ['cycle-type', 'Cycle-type/direction'], ['addr', 'Address'], ['tar1', 'Turn-around cycle 1'], ['sync', 'Sync'], diff --git a/decoders/maxim_ds28ea00/pd.py b/decoders/maxim_ds28ea00/pd.py index 73e7356..6e1125a 100644 --- a/decoders/maxim_ds28ea00/pd.py +++ b/decoders/maxim_ds28ea00/pd.py @@ -53,7 +53,7 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py index e96b000..2bd1d89 100644 --- a/decoders/midi/pd.py +++ b/decoders/midi/pd.py @@ -37,8 +37,7 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text (verbose)', 'Human-readable text (verbose)'], - # ['Text', 'Human-readable text'], + ['text-verbose', 'Human-readable text (verbose)'], ] def __init__(self, **kwargs): diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py index 1e6c33d..08c7a7b 100644 --- a/decoders/mlx90614/pd.py +++ b/decoders/mlx90614/pd.py @@ -33,8 +33,8 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Celsius', 'Temperature in degrees Celsius'], - ['Kelvin', 'Temperature in Kelvin'], + ['celsius', 'Temperature in degrees Celsius'], + ['kelvin', 'Temperature in Kelvin'], ] def __init__(self, **kwargs): diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py index d6c84e8..fe1ca62 100644 --- a/decoders/mx25lxx05d/pd.py +++ b/decoders/mx25lxx05d/pd.py @@ -95,9 +95,9 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], - ['Verbose decode', 'Decoded register bits, read/write data'], - ['Warnings', 'Human-readable warnings'], + ['text', 'Human-readable text'], + ['verbose-decode', 'Decoded register bits, read/write data'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py index 8245914..94dff27 100644 --- a/decoders/mxc6225xu/pd.py +++ b/decoders/mxc6225xu/pd.py @@ -74,7 +74,7 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py index 90c23d2..01563c2 100644 --- a/decoders/nunchuk/pd.py +++ b/decoders/nunchuk/pd.py @@ -33,9 +33,9 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text (verbose)', 'Human-readable text (verbose)'], - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['text-verbose', 'Human-readable text (verbose)'], + ['text', 'Human-readable text'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py index 642cc0e..19ee649 100644 --- a/decoders/onewire_network/pd.py +++ b/decoders/onewire_network/pd.py @@ -45,7 +45,7 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py index f4929f3..8db3b8f 100644 --- a/decoders/pan1321/pd.py +++ b/decoders/pan1321/pd.py @@ -37,9 +37,9 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text (verbose)', 'Human-readable text (verbose)'], - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['text-verbose', 'Human-readable text (verbose)'], + ['text', 'Human-readable text'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py index 03aa7cf..d2d01d1 100644 --- a/decoders/rtc8564/pd.py +++ b/decoders/rtc8564/pd.py @@ -41,7 +41,7 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['text', 'Human-readable text'], ] def __init__(self, **kwargs): diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py index 9c09c2f..0ff0e22 100644 --- a/decoders/sdcard_spi/pd.py +++ b/decoders/sdcard_spi/pd.py @@ -82,8 +82,8 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['text', 'Human-readable text'], + ['warnings', 'Human-readable warnings'], ] def __init__(self, **kwargs): diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py index 67c210c..4939163 100644 --- a/decoders/spi/pd.py +++ b/decoders/spi/pd.py @@ -79,10 +79,10 @@ class Decoder(srd.Decoder): 'format': ['Data format', 'hex'], } annotations = [ - ['MISO/MOSI data', 'MISO/MOSI SPI data'], - ['MISO data', 'MISO SPI data'], - ['MOSI data', 'MOSI SPI data'], - ['Warnings', 'Human-readable warnings'], + ['miso-mosi-data', 'MISO/MOSI SPI data'], + ['miso-data', 'MISO SPI data'], + ['mosi-data', 'MOSI SPI data'], + ['warnings', 'Human-readable warnings'], ] def __init__(self): diff --git a/decoders/tlc5620/pd.py b/decoders/tlc5620/pd.py index 7a514e2..8c22b85 100644 --- a/decoders/tlc5620/pd.py +++ b/decoders/tlc5620/pd.py @@ -46,11 +46,11 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['dac_select', 'DAC select'], + ['dac-select', 'DAC select'], ['gain', 'Gain'], ['value', 'DAC value'], - ['data_latch', 'Data latch point'], - ['ldac_fall', 'LDAC falling edge'], + ['data-latch', 'Data latch point'], + ['ldac-fall', 'LDAC falling edge'], ] def __init__(self, **kwargs): diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py index bafe112..f1c8323 100644 --- a/decoders/uart/pd.py +++ b/decoders/uart/pd.py @@ -95,12 +95,12 @@ class Decoder(srd.Decoder): # TODO: Options to invert the signal(s). } annotations = [ - ['RX data', 'UART RX data'], - ['TX data', 'UART TX data'], - ['Start bits', 'UART start bits'], - ['Parity bits', 'UART parity bits'], - ['Stop bits', 'UART stop bits'], - ['Warnings', 'Warnings'], + ['rx-data', 'UART RX data'], + ['tx-data', 'UART TX data'], + ['start-bits', 'UART start bits'], + ['parity-bits', 'UART parity bits'], + ['stop-bits', 'UART stop bits'], + ['warnings', 'Warnings'], ] binary = ( ('rx', 'RX dump'), diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py index f79f2fc..e6fc355 100644 --- a/decoders/usb_packet/pd.py +++ b/decoders/usb_packet/pd.py @@ -149,7 +149,7 @@ class Decoder(srd.Decoder): 'signalling': ['Signalling', 'full-speed'], } annotations = [ - ['Text', 'Human-readable text'] + ['text', 'Human-readable text'] ] def __init__(self): diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py index bc55aa7..8c258cd 100644 --- a/decoders/xfp/pd.py +++ b/decoders/xfp/pd.py @@ -204,8 +204,8 @@ class Decoder(srd.Decoder): optional_probes = [] options = {} annotations = [ - ['XFP field names and values', 'XFP structure field names and values'], - ['XFP fields', 'XFP structure fields'], + ['fieldnames-and-values', 'XFP structure field names and values'], + ['fields', 'XFP structure fields'], ] def __init__(self, **kwargs):