djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/onewire: Fix ds18x20.read_temp so it works when no rom given.

Browse Source
This commit is contained in:
Damien George 2015-07-30 23:10:39 +01:00
parent 92d4b51ad5
commit a95b06fc6b
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/onewire/ds18x20.py
View File

@ -7,14 +7,13 @@ temperature sensors. It supports multiple devices on the same 1-wire bus.
The following example assumes the ground of your DS18x20 is connected to The following example assumes the ground of your DS18x20 is connected to
Y11, vcc is connected to Y9 and the data pin is connected to Y10. Y11, vcc is connected to Y9 and the data pin is connected to Y10.
>>> gnd = Pin('Y11') >>> from pyb import Pin
>>> gnd.init(Pin.OUT_PP) >>> gnd = Pin('Y11', Pin.OUT_PP)
>>> gnd.low() >>> gnd.low()
>>> vcc = Pin('Y9', Pin.OUT_PP)
>>> vcc = Pin('Y9')
>>> vcc.init(Pin.OUT_PP)
>>> vcc.high() >>> vcc.high()
>>> from ds18x20 import DS18X20
>>> d = DS18X20(Pin('Y10')) >>> d = DS18X20(Pin('Y10'))
Call read_temps to read all sensors: Call read_temps to read all sensors:
@ -47,27 +46,22 @@ class DS18X20(object):
# correct # first byte in their rom for a DS18x20 device. # correct # first byte in their rom for a DS18x20 device.
self.roms = [rom for rom in self.ow.scan() if rom[0] == 0x10 or rom[0] == 0x28] self.roms = [rom for rom in self.ow.scan() if rom[0] == 0x10 or rom[0] == 0x28]
def _select_rom(self, rom):
if rom:
self.ow.select_rom(rom)
else:
self.ow.skip_rom()
def read_temp(self, rom=None): def read_temp(self, rom=None):
""" """
Read and return the temperature of one DS18x20 device. Read and return the temperature of one DS18x20 device.
Pass the 8-byte bytes object with the ROM of the specific device you want to read. Pass the 8-byte bytes object with the ROM of the specific device you want to read.
If only one DS18x20 device is attached to the bus you may omit the rom parameter. If only one DS18x20 device is attached to the bus you may omit the rom parameter.
""" """
rom = rom or self.roms[0]
ow = self.ow ow = self.ow
ow.reset() ow.reset()
self._select_rom(rom) ow.select_rom(rom)
ow.write_byte(0x44) # Convert Temp ow.write_byte(0x44) # Convert Temp
while True: while True:
if ow.read_bit(): if ow.read_bit():
break break
ow.reset() ow.reset()
self._select_rom(rom) ow.select_rom(rom)
ow.write_byte(0xbe) # Read scratch ow.write_byte(0xbe) # Read scratch
data = ow.read_bytes(9) data = ow.read_bytes(9)
return self.convert_temp(rom[0], data) return self.convert_temp(rom[0], data)