##
-## This file is part of the sigrok project.
+## This file is part of the libsigrokdecode project.
##
## Copyright (C) 2012 Iztok Jeras <iztok.jeras@gmail.com>
##
]
options = {
'overdrive': ['Overdrive', 1],
- # Time options (specified in number of samplerate periods):
- 'cnt_normal_bit': ['Normal mode sample bit time', 0],
- 'cnt_normal_slot': ['Normal mode data slot time', 0],
- 'cnt_normal_presence': ['Normal mode sample presence time', 0],
- 'cnt_normal_reset': ['Normal mode reset time', 0],
- 'cnt_overdrive_bit': ['Overdrive mode sample bit time', 0],
- 'cnt_overdrive_slot': ['Overdrive mode data slot time', 0],
- 'cnt_overdrive_presence': ['Overdrive mode sample presence time', 0],
- 'cnt_overdrive_reset': ['Overdrive mode reset time', 0],
+ # Time options (specified in microseconds):
+ 'cnt_normal_bit': ['Normal mode sample bit time (us)', 15],
+ 'cnt_normal_slot': ['Normal mode data slot time (us)', 60],
+ 'cnt_normal_presence': ['Normal mode sample presence time (us)', 75],
+ 'cnt_normal_reset': ['Normal mode reset time (us)', 480],
+ 'cnt_overdrive_bit': ['Overdrive mode sample bit time (us)', 2],
+ # 'cnt_overdrive_slot': ['Overdrive mode data slot time (us)', 7.3],
+ 'cnt_overdrive_slot': ['Overdrive mode data slot time (us)', 7],
+ 'cnt_overdrive_presence': ['Overdrive mode sample presence time (us)', 10],
+ 'cnt_overdrive_reset': ['Overdrive mode reset time (us)', 48],
}
annotations = [
- ['Text', 'Human-readable text'],
- ['Warnings', 'Human-readable warnings'],
+ ['bit', 'Bit'],
+ ['warnings', 'Warnings'],
+ ['reset', 'Reset/presence'],
+ ['overdrive', 'Overdrive mode notifications'],
]
+ def putm(self, data):
+ self.put(0, 0, self.out_ann, data)
+
+ def putpb(self, data):
+ self.put(self.fall, self.samplenum, self.out_proto, data)
+
+ def putb(self, data):
+ self.put(self.fall, self.samplenum, self.out_ann, data)
+
+ def putx(self, data):
+ self.put(self.fall, self.cnt_bit[self.overdrive], self.out_ann, data)
+
def __init__(self, **kwargs):
self.samplenum = 0
self.state = 'WAIT FOR FALLING EDGE'
# Check if samplerate is appropriate.
if self.options['overdrive']:
if self.samplerate < 2000000:
- self.put(0, 0, self.out_ann, [1,
- ['ERROR: Sampling rate is too low. Must be above 2MHz ' +
- 'for proper overdrive mode decoding.']])
+ self.putm([1, ['Sampling rate is too low. Must be above ' +
+ '2MHz for proper overdrive mode decoding.']])
elif self.samplerate < 5000000:
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: Sampling rate is suggested to be above 5MHz ' +
- 'for proper overdrive mode decoding.']])
+ self.putm([1, ['Sampling rate is suggested to be above 5MHz ' +
+ 'for proper overdrive mode decoding.']])
else:
if self.samplerate < 400000:
- self.put(0, 0, self.out_ann, [1,
- ['ERROR: Sampling rate is too low. Must be above ' +
- '400kHz for proper normal mode decoding.']])
+ self.putm([1, ['Sampling rate is too low. Must be above ' +
+ '400kHz for proper normal mode decoding.']])
elif (self.samplerate < 1000000):
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: Sampling rate is suggested to be above ' +
- '1MHz for proper normal mode decoding.']])
+ self.putm([1, ['Sampling rate is suggested to be above ' +
+ '1MHz for proper normal mode decoding.']])
# The default 1-Wire time base is 30us. This is used to calculate
# sampling times.
samplerate = float(self.samplerate)
- if self.options['cnt_normal_bit']:
- self.cnt_normal_bit = self.options['cnt_normal_bit']
- else:
- self.cnt_normal_bit = int(samplerate * 0.000015) - 1 # 15ns
- if self.options['cnt_normal_slot']:
- self.cnt_normal_slot = self.options['cnt_normal_slot']
- else:
- self.cnt_normal_slot = int(samplerate * 0.000060) - 1 # 60ns
- if self.options['cnt_normal_presence']:
- self.cnt_normal_presence = self.options['cnt_normal_presence']
- else:
- self.cnt_normal_presence = int(samplerate * 0.000075) - 1 # 75ns
- if self.options['cnt_normal_reset']:
- self.cnt_normal_reset = self.options['cnt_normal_reset']
- else:
- self.cnt_normal_reset = int(samplerate * 0.000480) - 1 # 480ns
- if self.options['cnt_overdrive_bit']:
- self.cnt_overdrive_bit = self.options['cnt_overdrive_bit']
- else:
- self.cnt_overdrive_bit = int(samplerate * 0.000002) - 1 # 2ns
- if self.options['cnt_overdrive_slot']:
- self.cnt_overdrive_slot = self.options['cnt_overdrive_slot']
- else:
- self.cnt_overdrive_slot = int(samplerate * 0.0000073) - 1 # 6ns+1.3ns
- if self.options['cnt_overdrive_presence']:
- self.cnt_overdrive_presence = self.options['cnt_overdrive_presence']
- else:
- self.cnt_overdrive_presence = int(samplerate * 0.000010) - 1 # 10ns
- if self.options['cnt_overdrive_reset']:
- self.cnt_overdrive_reset = self.options['cnt_overdrive_reset']
- else:
- self.cnt_overdrive_reset = int(samplerate * 0.000048) - 1 # 48ns
+
+ x = float(self.options['cnt_normal_bit']) / 1000000.0
+ self.cnt_normal_bit = int(samplerate * x) - 1
+ x = float(self.options['cnt_normal_slot']) / 1000000.0
+ self.cnt_normal_slot = int(samplerate * x) - 1
+ x = float(self.options['cnt_normal_presence']) / 1000000.0
+ self.cnt_normal_presence = int(samplerate * x) - 1
+ x = float(self.options['cnt_normal_reset']) / 1000000.0
+ self.cnt_normal_reset = int(samplerate * x) - 1
+ x = float(self.options['cnt_overdrive_bit']) / 1000000.0
+ self.cnt_overdrive_bit = int(samplerate * x) - 1
+ x = float(self.options['cnt_overdrive_slot']) / 1000000.0
+ self.cnt_overdrive_slot = int(samplerate * x) - 1
+ x = float(self.options['cnt_overdrive_presence']) / 1000000.0
+ self.cnt_overdrive_presence = int(samplerate * x) - 1
+ x = float(self.options['cnt_overdrive_reset']) / 1000000.0
+ self.cnt_overdrive_reset = int(samplerate * x) - 1
# Organize values into lists.
self.cnt_bit = [self.cnt_normal_bit, self.cnt_overdrive_bit]
time_min = float(self.cnt_normal_bit) / self.samplerate
time_max = float(self.cnt_normal_bit + 1) / self.samplerate
if (time_min < 0.000005) or (time_max > 0.000015):
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: The normal mode data sample time interval ' +
+ self.putm([1, ['The normal mode data sample time interval ' +
'(%2.1fus-%2.1fus) should be inside (5.0us, 15.0us).'
% (time_min * 1000000, time_max * 1000000)]])
time_min = float(self.cnt_normal_presence) / self.samplerate
time_max = float(self.cnt_normal_presence + 1) / self.samplerate
if (time_min < 0.0000681) or (time_max > 0.000075):
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: The normal mode presence sample time interval ' +
+ self.putm([1, ['The normal mode presence sample time interval ' +
'(%2.1fus-%2.1fus) should be inside (68.1us, 75.0us).'
% (time_min * 1000000, time_max * 1000000)]])
time_min = float(self.cnt_overdrive_bit) / self.samplerate
time_max = float(self.cnt_overdrive_bit + 1) / self.samplerate
if (time_min < 0.000001) or (time_max > 0.000002):
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: The overdrive mode data sample time interval ' +
+ self.putm([1, ['The overdrive mode data sample time interval ' +
'(%2.1fus-%2.1fus) should be inside (1.0us, 2.0us).'
% (time_min * 1000000, time_max * 1000000)]])
time_min = float(self.cnt_overdrive_presence) / self.samplerate
time_max = float(self.cnt_overdrive_presence + 1) / self.samplerate
if (time_min < 0.0000073) or (time_max > 0.000010):
- self.put(0, 0, self.out_ann, [1,
- ['WARNING: The overdrive mode presence sample time interval ' +
+ self.putm([1, ['The overdrive mode presence sample time interval ' +
'(%2.1fus-%2.1fus) should be inside (7.3us, 10.0us).'
% (time_min*1000000, time_max*1000000)]])
self.state = 'WAIT FOR RISING EDGE'
continue
- self.put(self.fall, self.samplenum, self.out_ann,
- [0, ['Bit: %d' % self.bit]])
- self.put(self.fall, self.samplenum, self.out_proto,
- ['BIT', self.bit])
+ self.putb([0, ['Bit: %d' % self.bit]])
+ self.putpb(['BIT', self.bit])
# Checking the first command to see if overdrive mode
# should be entered.
if self.bit_cnt <= 8:
self.command |= (self.bit << self.bit_cnt)
elif self.bit_cnt == 8 and self.command in [0x3c, 0x69]:
- self.put(self.fall, self.cnt_bit[self.overdrive],
- self.out_ann, [0, ['Entering overdrive mode']])
+ self.putx([3, ['Entering overdrive mode']])
# Increment the bit counter.
self.bit_cnt += 1
# Wait for next slot.
self.state = 'WAIT FOR PRESENCE DETECT'
# Exit overdrive mode.
if self.overdrive:
- self.put(self.fall, self.cnt_bit[self.overdrive],
- self.out_ann, [0, ['Exiting overdrive mode']])
+ self.putx([3, ['Exiting overdrive mode']])
self.overdrive = 0
# Clear command bit counter and data register.
self.bit_cnt = 0
self.state = 'WAIT FOR RISING EDGE'
continue
- self.put(self.fall, self.samplenum, self.out_ann,
- [0, ['Reset/presence: %s'
- % ('false' if self.present else 'true')]])
- self.put(self.fall, self.samplenum, self.out_proto,
- ['RESET/PRESENCE', not self.present])
+ p = 'false' if self.present else 'true'
+ self.putb([2, ['Reset/presence: %s' % p]])
+ self.putpb(['RESET/PRESENCE', not self.present])
+
# Wait for next slot.
self.state = 'WAIT FOR FALLING EDGE'
else: