MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165 from Manawyrm/patch-1 

Fixed DS18B20 handling because of new floating point handling
This commit is contained in:
Vowstar 2015-02-03 12:54:16 +08:00
parent a30ff88dc3 4bde88cd81
commit 513c46b453
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua_modules/ds18b20/ds18b20.lua
View File

@ -105,11 +105,10 @@ function readNumber(addr, unit)
else else
return nil return nil
end end
t1 = t / 10000 t = t / 10000
t2 = t % 10000
-- print("Temperature="..t1.."."..t2.." Centigrade") -- print("Temperature="..t1.."."..t2.." Centigrade")
-- result = t1.."."..t2 -- result = t1.."."..t2
return t1, t2 return t
end end
tmr.wdclr() tmr.wdclr()
else else
@ -122,11 +121,11 @@ function readNumber(addr, unit)
end end
function read(addr, unit) function read(addr, unit)
t1, t2 = readNumber(addr, unit) t = readNumber(addr, unit)
if((t1 == nil ) or (t2 ==nil)) then if (t == nil) then
return nil return nil
else else
return t1.."."..string.format("%04u", t2) return t
end end
end end