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

Change address printing to Hex from Base64. (#1840)

This commit is contained in:
Jonathan Karras 2017-03-06 23:06:50 -07:00 committed by devsaurus
parent 52f41a840c
commit d53ac8db90
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua_modules/ds18b20/ds18b20-example.lua
View File

@ -7,7 +7,7 @@ pin = 3 -- gpio0 = 3, gpio2 = 4
function readout(temp) function readout(temp)
for addr, temp in pairs(temp) do for addr, temp in pairs(temp) do
-- print(string.format("Sensor %s: %s 'C", addr, temp)) -- print(string.format("Sensor %s: %s 'C", addr, temp))
print(string.format("Sensor %s: %s 'C", encoder.toBase64(addr), temp)) -- readable address with base64 encoding is preferred when encoder module is available print(string.format("Sensor %s: %s °C", encoder.toHex(addr), temp)) -- readable address with base64 encoding is preferred when encoder module is available
end end
-- Module can be released when it is no longer needed -- Module can be released when it is no longer needed
@ -21,6 +21,6 @@ if t.sens then
print("Total number of DS18B20 sensors: "..table.getn(t.sens)) print("Total number of DS18B20 sensors: "..table.getn(t.sens))
for i, s in ipairs(t.sens) do for i, s in ipairs(t.sens) do
-- print(string.format(" sensor #%d address: %s%s", i, s.addr, s.parasite == 1 and " (parasite)" or "")) -- print(string.format(" sensor #%d address: %s%s", i, s.addr, s.parasite == 1 and " (parasite)" or ""))
print(string.format(" sensor #%d address: %s%s", i, encoder.toBase64(s.addr), s.parasite == 1 and " (parasite)" or "")) -- readable address with base64 encoding is preferred when encoder module is available print(string.format(" sensor #%d address: %s%s", i, encoder.toHex(s.addr), s.parasite == 1 and " (parasite)" or "")) -- readable address with base64 encoding is preferred when encoder module is available
end end
end end

11
lua_modules/ds18b20/ds18b20.lua
View File

@ -17,7 +17,7 @@ return({
local pin = self.pin local pin = self.pin
for i,s in ipairs(self.sens) do for i,s in ipairs(self.sens) do
if s.status == 0 then if s.status == 0 then
print("starting conversion:", encoder.toBase64(s.addr), s.parasite == 1 and "parasite" or " ") print("starting conversion:", encoder.toHex(s.addr), s.parasite == 1 and "parasite" or " ")
ow.reset(pin) ow.reset(pin)
ow.select(pin, s.addr) -- select the sensor ow.select(pin, s.addr) -- select the sensor
ow.write(pin, 0x44, 1) -- and start conversion ow.write(pin, 0x44, 1) -- and start conversion
@ -50,7 +50,7 @@ return({
ow.write(pin, 0xB4, 1) -- Read Power Supply [B4h] ow.write(pin, 0xB4, 1) -- Read Power Supply [B4h]
local parasite = (ow.read(pin)==0 and 1 or 0) local parasite = (ow.read(pin)==0 and 1 or 0)
table.insert(self.sens,{addr=addr, parasite=parasite, status=0}) table.insert(self.sens,{addr=addr, parasite=parasite, status=0})
print("contact: ", encoder.toBase64(addr), parasite == 1 and "parasite" or " ") print("contact: ", encoder.toHex(addr), parasite == 1 and "parasite" or " ")
end end
addr = ow.search(pin) addr = ow.search(pin)
@ -68,7 +68,7 @@ return({
local next = false local next = false
if not self.sens then return 0 end if not self.sens then return 0 end
for i,s in ipairs(self.sens) do for i,s in ipairs(self.sens) do
-- print(encoder.toBase64(s.addr), s.status) -- print(encoder.toHex(s.addr), s.status)
if s.status == 1 then if s.status == 1 then
ow.reset(pin) ow.reset(pin)
ow.select(pin, s.addr) -- select the sensor ow.select(pin, s.addr) -- select the sensor
@ -91,14 +91,14 @@ return({
if tH and (tH~=85) then if tH and (tH~=85) then
self.temp[s.addr]=(sgn<0 and "-" or "")..tH.."."..tL self.temp[s.addr]=(sgn<0 and "-" or "")..tH.."."..tL
print(encoder.toBase64(s.addr),(sgn<0 and "-" or "")..tH.."."..tL) print(encoder.toHex(s.addr),(sgn<0 and "-" or "")..tH.."."..tL)
s.status = 2 s.status = 2
end end
-- end integer version -- end integer version
-- -- float version -- -- float version
-- if t and (math.floor(t/10000)~=85) then -- if t and (math.floor(t/10000)~=85) then
-- self.temp[s.addr]=t -- self.temp[s.addr]=t
-- print(encoder.toBase64(s.addr), t) -- print(encoder.toHex(s.addr), t)
-- s.status = 2 -- s.status = 2
-- end -- end
-- -- end float version -- -- end float version
@ -116,4 +116,3 @@ return({
end end
}) })