All PDs: Consistent naming/case for annotation shortnames/IDs.

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index ffe8f005c538dbe0ab6c7154c19647293b7d809c..a0daf0bb73d25c1bac9765435ac17d7befb6a502 100644 (file)
--- 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 13a4b24ea38ef24f826a5a324a432804fb75a1bb..0234e3315fd2eeef7a8a9db7bcdb7af3ed8eb572 100644 (file)
--- 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 223a4c0f6dd06a8d71f6282acba0baeba279aaf8..4c76eeb1444fab2502af5ab79acdb7491cd30857 100644 (file)
--- 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 8e8a70807ee7cf18c391de0888164fe51bda5669..97431e01587dd6d4f933cc6f7b5e295153766f0f 100644 (file)
--- 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 7d584fb7d2f91767a5893ecd50b3e85ee311458c..3928ae36ca45fa35ab83015e363fa83dadb5a0d6 100644 (file)
--- 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 08f338ac182d5d72a503f694f9bbc6b2b1cba3b3..2f4d1358bc349ccd96e2c116b218fd27a5b7b6cd 100644 (file)
--- 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 f37c84505ac671aa82422d1596934a7adbe22bb9..983e8d9b28e6d5f85d2b4918250def9f8a9c8043 100644 (file)
--- 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 73e735620a5653a3426e0895843caf311c518371..6e1125a73c6e4d84f545466bee066a8cfc3dbd9d 100644 (file)
--- 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 e96b000a2ebbc4cc3018ffccb2dab8034f3950cd..2bd1d89995df6a8384e9d38e28f120d77ae1a556 100644 (file)
--- 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 1e6c33d0c8c0f5b40fd2cfb2d3109a7d05754c40..08c7a7bd580c7225fd688f953d8399ccda3a1245 100644 (file)
--- 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 d6c84e8cd95b70e9faf2b866628a9d488ee8697f..fe1ca623e1d73048e9c41f7ad61f40661993fae2 100644 (file)
--- 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 82459146274b2f822fc0e9e8c8aee007332037ac..94dff2779d82eae8aa425739fb774fc261819a5a 100644 (file)
--- 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 90c23d2b4a3d57ac5849763ed27b3f8a6fa94ea2..01563c28a17b4a0dfe8eb749beddd43a4efd6e82 100644 (file)
--- 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 642cc0e68c869b42bb60ad1a92c8e8091b205781..19ee649caeccf9d23a457f07c7c29a50867f932c 100644 (file)
--- 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 f4929f3a49c7a939b15e93689b1674d30ec63464..8db3b8f408618a25e9917b1c525ee6d993515b70 100644 (file)
--- 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 03aa7cf798e18c940b7df4a2fa12029a996638ca..d2d01d1fa9e8ffdffaded8f5a1260d866718de69 100644 (file)
--- 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 9c09c2f84ee0af03514e67f7e132ae51753810f6..0ff0e22c2b459c4ba4c0389dcf74b0fb52ec191b 100644 (file)
--- 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 67c210cb88763765f81c16448dfe654ebfda4ce6..49391634c55032a74e4fb06ad32c6e5f5c52de84 100644 (file)
--- 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 7a514e291331dbcfc6e6828f415417d46e13cd6e..8c22b850b06c7fe8a6e6a0024abbfd20a4170eb9 100644 (file)
--- 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 bafe1122e93865fe1e09c4b983ab75bb5a5f157a..f1c832364539fcac8d386f2a12cc41bfb5069ef0 100644 (file)
--- 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 f79f2fc7eea420468af5f3b848b83b36cc211bbd..e6fc35595740ccc3f3c5262ab128bf0f923605a6 100644 (file)
--- 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 bc55aa74adbf54218c4855c8cdc0805c5f836559..8c258cdf3eb7db159a2f0935089c9a810f09c64c 100644 (file)
--- 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):