X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fam230x%2Fpd.py;h=3c5003d129693dd0bb3f42dd968532c9cdbb307f;hp=9a783b9cb4849ac0eeb73c50b433804e51306dee;hb=97b874bd0b6913ed52df1b8aac5e7491479fac9a;hpb=f87162978a3f804d43ae12208c3d6a4a86382c1c diff --git a/decoders/am230x/pd.py b/decoders/am230x/pd.py index 9a783b9..3c5003d 100644 --- a/decoders/am230x/pd.py +++ b/decoders/am230x/pd.py @@ -14,8 +14,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## along with this program; if not, see . ## import sigrokdecode as srd @@ -24,8 +23,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}, @@ -35,11 +34,11 @@ class SamplerateError(Exception): pass class Decoder(srd.Decoder): - api_version = 2 + api_version = 3 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 +46,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'), @@ -77,7 +76,6 @@ class Decoder(srd.Decoder): def reset(self): self.state = 'WAIT FOR START LOW' - self.samplenum = 0 self.fall = 0 self.rise = 0 self.bits = [] @@ -101,7 +99,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 +107,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 @@ -123,7 +121,7 @@ class Decoder(srd.Decoder): checksum += self.bits2num(bitlist[i-8:i]) return checksum % 256 - def __init__(self, **kwargs): + def __init__(self): self.samplerate = None self.reset() @@ -141,27 +139,47 @@ class Decoder(srd.Decoder): for t in timing[e]: self.cnt[e][t] = timing[e][t] * self.samplerate / 1000000 - def decode(self, ss, es, data): + 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): if not self.samplerate: raise SamplerateError('Cannot decode without samplerate.') - for (self.samplenum, (sda,)) in data: + while True: # State machine. if self.state == 'WAIT FOR START LOW': - if sda != 0: - continue + self.wait({0: 'f'}) self.fall = self.samplenum self.state = 'WAIT FOR START HIGH' elif self.state == 'WAIT FOR START HIGH': - if sda != 1: - continue + self.wait({0: 'r'}) if self.is_valid('START LOW'): self.rise = self.samplenum self.state = 'WAIT FOR RESPONSE LOW' else: self.reset() elif self.state == 'WAIT FOR RESPONSE LOW': - if sda != 0: - continue + self.wait({0: 'f'}) if self.is_valid('START HIGH'): self.putfs([0, ['Start', 'S']]) self.fall = self.samplenum @@ -169,16 +187,14 @@ class Decoder(srd.Decoder): else: self.reset() elif self.state == 'WAIT FOR RESPONSE HIGH': - if sda != 1: - continue + self.wait({0: 'r'}) if self.is_valid('RESPONSE LOW'): self.rise = self.samplenum self.state = 'WAIT FOR FIRST BIT' else: self.reset() elif self.state == 'WAIT FOR FIRST BIT': - if sda != 0: - continue + self.wait({0: 'f'}) if self.is_valid('RESPONSE HIGH'): self.putfs([1, ['Response', 'R']]) self.fall = self.samplenum @@ -187,16 +203,14 @@ class Decoder(srd.Decoder): else: self.reset() elif self.state == 'WAIT FOR BIT HIGH': - if sda != 1: - continue + self.wait({0: 'r'}) if self.is_valid('BIT LOW'): self.rise = self.samplenum self.state = 'WAIT FOR BIT LOW' else: self.reset() elif self.state == 'WAIT FOR BIT LOW': - if sda != 0: - continue + self.wait({0: 'f'}) if self.is_valid('BIT 0 HIGH'): bit = 0 elif self.is_valid('BIT 1 HIGH'): @@ -204,29 +218,8 @@ 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 + self.wait({0: 'r'}) self.putfs([3, ['End', 'E']]) self.reset()