diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2014-10-12 20:21:33 +0200 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2014-10-12 20:22:08 +0200 |
| commit | 0b6bc7f9554c0980153563b6a3d16c3642fc4651 (patch) | |
| tree | 7a913c921a66f198a5f4ca3ed9468a1959b9e0b2 /decoders | |
| parent | dcfb60a1658243c3130774fe00645e7fedb23211 (diff) | |
| download | libsigrokdecode-0b6bc7f9554c0980153563b6a3d16c3642fc4651.tar.gz libsigrokdecode-0b6bc7f9554c0980153563b6a3d16c3642fc4651.zip | |
am230x: Factor out handle_byte() to simplify state machine.
Diffstat (limited to 'decoders')
| -rw-r--r-- | decoders/am230x/pd.py | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/decoders/am230x/pd.py b/decoders/am230x/pd.py index 5375ab2..fd1e825 100644 --- a/decoders/am230x/pd.py +++ b/decoders/am230x/pd.py @@ -141,6 +141,29 @@ class Decoder(srd.Decoder): for t in timing[e]: self.cnt[e][t] = timing[e][t] * self.samplerate / 1000000 + def handle_byte(self, bit): + self.bits.append(bit) + self.putfs([2, ['Bit: %d' % bit, '%d' % bit]]) + self.fall = self.samplenum + self.state = 'WAIT FOR BIT HIGH' + if len(self.bits) % 8 == 0: + byte = self.bits2num(self.bits[-8:]) + self.putb([4, ['Byte: %#04x' % byte, '%#04x' % byte]]) + if len(self.bits) == 16: + h = self.calculate_humidity(self.bits[-16:]) + self.putv([5, ['Humidity: %.1f %%' % h, 'RH = %.1f %%' % h]]) + elif len(self.bits) == 32: + t = self.calculate_temperature(self.bits[-16:]) + self.putv([6, ['Temperature: %.1f °C' % t, 'T = %.1f °C' % t]]) + elif len(self.bits) == 40: + parity = self.bits2num(self.bits[-8:]) + if parity == self.calculate_checksum(self.bits[0:32]): + self.putb([7, ['Checksum: OK', 'OK']]) + else: + self.putb([7, ['Checksum: not OK', 'NOK']]) + self.state = 'WAIT FOR END' + self.bytepos.append(self.samplenum) + def decode(self, ss, es, data): if not self.samplerate: raise SamplerateError('Cannot decode without samplerate.') @@ -204,27 +227,7 @@ class Decoder(srd.Decoder): else: self.reset() continue - self.bits.append(bit) - self.putfs([2, ['Bit: %d' % bit, '%d' % bit]]) - self.fall = self.samplenum - self.state = 'WAIT FOR BIT HIGH' - if len(self.bits) % 8 == 0: - byte = self.bits2num(self.bits[-8:]) - self.putb([4, ['Byte: %#04x' % byte, '%#04x' % byte]]) - if len(self.bits) == 16: - h = self.calculate_humidity(self.bits[-16:]) - self.putv([5, ['Humidity: %.1f %%' % h, 'RH = %.1f %%' % h]]) - elif len(self.bits) == 32: - t = self.calculate_temperature(self.bits[-16:]) - self.putv([6, ['Temperature: %.1f °C' % t, 'T = %.1f °C' % t]]) - elif len(self.bits) == 40: - parity = self.bits2num(self.bits[-8:]) - if parity == self.calculate_checksum(self.bits[0:32]): - self.putb([7, ['Checksum: OK', 'OK']]) - else: - self.putb([7, ['Checksum: not OK', 'NOK']]) - self.state = 'WAIT FOR END' - self.bytepos.append(self.samplenum) + self.handle_byte(bit) elif self.state == 'WAIT FOR END': if sda != 1: continue |