diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2013-10-08 17:49:55 +0200 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2013-10-08 23:18:54 +0200 |
| commit | 938aa7fb36fc0f172dda3b2bc5c15b226a458295 (patch) | |
| tree | ec2a3c1dbf667de094afb7cb4c4c7363a6cc0954 /decoders | |
| parent | ddeb9b32167075938aa96af0f71acfa190a9c3e1 (diff) | |
| download | libsigrokdecode-938aa7fb36fc0f172dda3b2bc5c15b226a458295.tar.gz libsigrokdecode-938aa7fb36fc0f172dda3b2bc5c15b226a458295.zip | |
onewire_link: Use annotation types.
This fixes bug #147.
Diffstat (limited to 'decoders')
| -rw-r--r-- | decoders/onewire_link/pd.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py index b875770..253e6cd 100644 --- a/decoders/onewire_link/pd.py +++ b/decoders/onewire_link/pd.py @@ -50,8 +50,10 @@ class Decoder(srd.Decoder): 'cnt_overdrive_reset': ['Overdrive mode reset time', 0], } annotations = [ - ['Text', 'Human-readable text'], - ['Warnings', 'Human-readable warnings'], + ['bit', 'Bit'], + ['warnings', 'Warnings'], + ['reset', 'Reset/presence'], + ['overdrive', 'Overdrive mode notifications'], ] def putm(self, data): @@ -211,7 +213,7 @@ class Decoder(srd.Decoder): if self.bit_cnt <= 8: self.command |= (self.bit << self.bit_cnt) elif self.bit_cnt == 8 and self.command in [0x3c, 0x69]: - self.putx([0, ['Entering overdrive mode']]) + self.putx([3, ['Entering overdrive mode']]) # Increment the bit counter. self.bit_cnt += 1 # Wait for next slot. @@ -229,7 +231,7 @@ class Decoder(srd.Decoder): self.state = 'WAIT FOR PRESENCE DETECT' # Exit overdrive mode. if self.overdrive: - self.putx([0, ['Exiting overdrive mode']]) + self.putx([3, ['Exiting overdrive mode']]) self.overdrive = 0 # Clear command bit counter and data register. self.bit_cnt = 0 @@ -259,7 +261,7 @@ class Decoder(srd.Decoder): continue p = 'false' if self.present else 'true' - self.putb([0, ['Reset/presence: %s' % p]]) + self.putb([2, ['Reset/presence: %s' % p]]) self.putpb(['RESET/PRESENCE', not self.present]) # Wait for next slot. |