X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fam230x%2Fpd.py;h=2b54cde928f09b3a8f2fdb8257142aa2c5f405c0;hb=e2ba53bbd8d176aedc8f5f9a3bb4086bc5f526f3;hp=d7cbad24258c3c56b7d2c84afbb1a19d60be8b87;hpb=47405f47db235c06d9f2ad26ae51791136b62a91;p=libsigrokdecode.git

diff --git a/decoders/am230x/pd.py b/decoders/am230x/pd.py
index d7cbad2..2b54cde 100644
--- a/decoders/am230x/pd.py
+++ b/decoders/am230x/pd.py
@@ -24,8 +24,8 @@ import sigrokdecode as srd
 timing = {
     'START LOW'     : {'min': 750, 'max': 25000},
     'START HIGH'    : {'min': 10, 'max': 10000},
-    'RESPONSE LOW'  : {'min': 70, 'max': 90},
-    'RESPONSE HIGH' : {'min': 70, 'max': 90},
+    'RESPONSE LOW'  : {'min': 50, 'max': 90},
+    'RESPONSE HIGH' : {'min': 50, 'max': 90},
     'BIT LOW'       : {'min': 45, 'max': 90},
     'BIT 0 HIGH'    : {'min': 20, 'max': 35},
     'BIT 1 HIGH'    : {'min': 65, 'max': 80},
@@ -37,9 +37,9 @@ class SamplerateError(Exception):
 class Decoder(srd.Decoder):
     api_version = 2
     id = 'am230x'
-    name = 'AM230x/DHTxx'
-    longname = 'Aosong AM230x/DHTxx'
-    desc = 'Aosong AM230x/DHTxx humidity/temperature sensor protocol.'
+    name = 'AM230x/DHTxx/RHTxx'
+    longname = 'Aosong AM230x/DHTxx/RHTxx'
+    desc = 'Aosong AM230x/DHTxx/RHTxx humidity/temperature sensor protocol.'
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['am230x']
@@ -47,8 +47,8 @@ class Decoder(srd.Decoder):
         {'id': 'sda', 'name': 'SDA', 'desc': 'Single wire serial data line'},
     )
     options = (
-        {'id': 'dht11', 'desc': 'DHT11 compatibility mode',
-            'default': 'no', 'values': ('no', 'yes')},
+        {'id': 'device', 'desc': 'Device type',
+            'default': 'am230x', 'values': ('am230x/rht', 'dht11')},
     )
     annotations = (
         ('start', 'Start'),
@@ -101,7 +101,7 @@ class Decoder(srd.Decoder):
 
     def calculate_humidity(self, bitlist):
         h = 0
-        if self.options['dht11'] == 'yes':
+        if self.options['device'] == 'dht11':
             h = self.bits2num(bitlist[0:8])
         else:
             h = self.bits2num(bitlist) / 10
@@ -109,7 +109,7 @@ class Decoder(srd.Decoder):
 
     def calculate_temperature(self, bitlist):
         t = 0
-        if self.options['dht11'] == 'yes':
+        if self.options['device'] == 'dht11':
             t = self.bits2num(bitlist[0:8])
         else:
             t = self.bits2num(bitlist[1:]) / 10
@@ -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.')
@@ -185,7 +208,7 @@ class Decoder(srd.Decoder):
                     self.bytepos.append(self.samplenum)
                     self.state = 'WAIT FOR BIT HIGH'
                 else:
-                    self.reset_variables()
+                    self.reset()
             elif self.state == 'WAIT FOR BIT HIGH':
                 if sda != 1:
                     continue
@@ -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