Corrigé un gros bug dans mon pico framework où il me manquait la réponse content-type text/html
This commit is contained in:
Christian Zufferey
64
Meteo/oldies/a_meteo2-tests.lua
Normal file
64
Meteo/oldies/a_meteo2-tests.lua
Normal file
@@ -0,0 +1,64 @@
|
||||
-- Juste un tests pour voir si on arrive juste à afficher en live un JSON
|
||||
-- pour aller chercher les prévision de la pluie pour une ville sur Internet
|
||||
-- Permet de ne prendre que ce qui est nécéssaire dans un grand flux JSON
|
||||
-- affiche de https://www.prevision-meteo.ch/services/json/lausanne
|
||||
-- les précipitation de 7h à 19h
|
||||
-- Source: https://github.com/nodemcu/nodemcu-firmware/blob/master/lua_examples/sjson-streaming.lua
|
||||
|
||||
print("\n a_meteo2-tests.lua zf190306.1806 \n")
|
||||
|
||||
dofile("a_meteo3-tests.lua")
|
||||
|
||||
-- site pour les données réelles
|
||||
--zhost="www.prevision-meteo.ch"
|
||||
--zport=80
|
||||
--zpath="/services/json/lausanne"
|
||||
|
||||
--simulation pour les tests
|
||||
zhost="192.168.0.153"
|
||||
zport=8080
|
||||
zpath="/meteo.lausanne.190302.1231.json"
|
||||
--zpath="/meteo.lausanne.190304.0930.json"
|
||||
--zpath="/meteo.st-luc.190304.0930.json"
|
||||
|
||||
|
||||
|
||||
--local s = tls.createConnection()
|
||||
local s = net.createConnection()
|
||||
|
||||
s:on("connection", function(sck, c)
|
||||
print("connected...")
|
||||
-- sck:send("GET /repos/nodemcu/nodemcu-firmware/git/trees/master HTTP/1.0\r\nUser-agent: nodemcu/0.1\r\nHost: api.github.com\r\nConnection: close\r\nAccept: application/json\r\n\r\n")
|
||||
-- sck:send("GET /services/json/lausanne HTTP/1.0\r\nHost: www.prevision-meteo.ch\r\n\r\n")
|
||||
zstring="GET "..zpath.." HTTP/1.0\r\nHost: "..zhost.."\r\n\r\n"
|
||||
print("ztring: ",zstring)
|
||||
sck:send(zstring)
|
||||
end)
|
||||
|
||||
zcmpt=1
|
||||
zsum=0
|
||||
s:on("receive", function(sck, c)
|
||||
zlen=string.len(c)
|
||||
zsum=zsum+zlen
|
||||
-- print("...zcmpt, zsum, zlen: ",zcmpt,zsum,zlen,string.sub(c,1,100))
|
||||
-- print(node.heap())
|
||||
-- print("len3: "..string.len(zjson))
|
||||
-- print("zjson3: ",string.sub(zjson,1,100))
|
||||
ztoto(c)
|
||||
zcmpt=zcmpt+1
|
||||
end)
|
||||
|
||||
local function zdisconnection()
|
||||
print("disconnect",node.heap())
|
||||
print("pluie_am: ",zpluie_am,"pluie_pm: ",zpluie_pm)
|
||||
end
|
||||
|
||||
local function zreconnection()
|
||||
print("reconnect",node.heap())
|
||||
end
|
||||
|
||||
s:on("disconnection", zdisconnection)
|
||||
s:on("reconnection", zreconnection)
|
||||
print("zport: ",zport,"zhost: ",zhost)
|
||||
s:connect(zport, zhost)
|
||||
|
||||
125
Meteo/oldies/a_meteo3-tests.lua
Normal file
125
Meteo/oldies/a_meteo3-tests.lua
Normal file
@@ -0,0 +1,125 @@
|
||||
-- Juste un tests pour voir si j'arrive à réduire et extraire à la mano des data d'un un gros JSON
|
||||
|
||||
-- Source: https://github.com/nodemcu/nodemcu-firmware/blob/master/lua_examples/sjson-streaming.lua
|
||||
|
||||
print("\n a_meteo3-tests.lua zf190306.1757 \n")
|
||||
|
||||
function set_json()
|
||||
zjson=[[
|
||||
{"city_info":{"name":"Lausanne","country":"Suisse","latitude":"46.5194190","longitude":"6.6337000","elevation":"495","sunrise":"07:06","sunset":"18:24"},"forecast_info":{"latitude":null,"longitude":null,"elevation":"561.0"},"current_condition":{"date":"04.03.2019","hour":"10:00","tmp":6,"wnd_spd":39,"wnd_gust":64,"wnd_dir":"SO","pressure":1006.4,"humidity":96,"condition":"Averses de pluie faible","condition_key":"averses-de-pluie-faible","icon":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/averses-de-pluie-faible.png","icon_big":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/averses-de-pluie-faible-big.png"},"fcst_day_0":{"date":"04.03.2019","day_short":"Lun.","day_long":"Lundi","tmin":2,"tmax":8,"condition":"Averses de pluie faible","condition_key":"averses-de-pluie-faible","icon":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/averses-de-pluie-faible.png","icon_big":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/averses-de-pluie-faible-big.png","hourly_data":{"0H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":3.2,"DPT2m":0.1,"WNDCHILL2m":-0.1,"HUMIDEX":null,"RH2m":80,"PRMSL":1010.3,"APCPsfc":0,"WNDSPD10m":13,"WNDGUST10m":26,"WNDDIR10m":235,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"0.00","MCDC":"33.30","LCDC":"0.00","HGT0C":2500,"KINDEX":41,"CAPE180_0":"0.000","CIN180_0":0},"1H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":2.5,"DPT2m":-2.5,"WNDCHILL2m":-0.3,"HUMIDEX":null,"RH2m":70,"PRMSL":1009.3,"APCPsfc":0,"WNDSPD10m":10,"WNDGUST10m":20,"WNDDIR10m":229,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"0.00","MCDC":"100.00","LCDC":"0.00","HGT0C":2500,"KINDEX":39,"CAPE180_0":"0.000","CIN180_0":0},"2H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":2.4,"DPT2m":-3.1,"WNDCHILL2m":-0.4,"HUMIDEX":null,"RH2m":67,"PRMSL":1008.3,"APCPsfc":0,"WNDSPD10m":10,"WNDGUST10m":17,"WNDDIR10m":221,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"18.70","MCDC":"100.00","LCDC":"0.00","HGT0C":2600,"KINDEX":40,"CAPE180_0":"0.000","CIN180_0":0},"3H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":2.5,"DPT2m":-3.4,"WNDCHILL2m":-0.3,"HUMIDEX":null,"RH2m":65,"PRMSL":1007.1,"APCPsfc":0,"WNDSPD10m":10,"WNDGUST10m":16,"WNDDIR10m":221,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"100.00","MCDC":"99.70","LCDC":"0.00","HGT0C":2600,"KINDEX":40,"CAPE180_0":"0.000","CIN180_0":0},"4H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":2.8,"DPT2m":-2.4,"WNDCHILL2m":-0.4,"HUMIDEX":null,"RH2m":69,"PRMSL":1006,"APCPsfc":0,"WNDSPD10m":12,"WNDGUST10m":19,"WNDDIR10m":233,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"100.00","MCDC":"100.00","LCDC":"0.00","HGT0C":2500,"KINDEX":36,"CAPE180_0":"0.000","CIN180_0":0},"5H00":{"ICON":"https:\/\/www.prevision-meteo.ch\/style\/images\/icon\/nuit-nuageuse.png","CONDITION":"Nuit nuageuse","CONDITION_KEY":"nuit-nuageuse","TMP2m":3.9,"DPT2m":0.2,"WNDCHILL2m":0.7,"HUMIDEX":null,"RH2m":77,"PRMSL":1004.2,"APCPsfc":0,"WNDSPD10m":13,"WNDGUST10m":20,"WNDDIR10m":241,"WNDDIRCARD10":"SO","ISSNOW":0,"HCDC":"100.00","MCDC":"100.00","LCDC":"0.00","HGT0C":2500,"KINDEX":33,"CAPE180_0":"0.000","CIN180_0":0},
|
||||
]]
|
||||
end
|
||||
|
||||
function zget_json_key()
|
||||
-- print("zget_json_key entrée...",zjson_stat)
|
||||
if zjson_stat==1 then
|
||||
p1=string.find(zjson, [["hourly_data":{]])
|
||||
if p1~=nil then
|
||||
print("trouvé le header: ",p1)
|
||||
zjson=string.sub(zjson,p1)
|
||||
print(string.sub(zjson,1,100))
|
||||
print("go go go...")
|
||||
zjson_stat=2
|
||||
end
|
||||
end
|
||||
if zjson_stat==2 then
|
||||
-- print("len1: "..string.len(zjson))
|
||||
zjson_key='"'..zh..'H00":{'
|
||||
print("zjson_key: "..zjson_key)
|
||||
p1=string.find(zjson, zjson_key)
|
||||
print("p1: ",p1)
|
||||
if p1~=nil then
|
||||
zjson=string.sub(zjson,p1)
|
||||
print("zjson: ",string.sub(zjson,1,100))
|
||||
-- p1,p2=string.find(zjson, '"CONDITION_KEY":"')
|
||||
p1,p2=string.find(zjson, '"APCPsfc":')
|
||||
|
||||
|
||||
print(p1,p2)
|
||||
if p1~=nil then
|
||||
-- p3=string.find(zjson, '","',p2)
|
||||
p3=string.find(zjson, ',',p2)
|
||||
print(p3)
|
||||
if p3~=nil then
|
||||
zpluie=tonumber(string.sub(zjson,p2+1,p3-1))
|
||||
print("zpluie: ",zpluie)
|
||||
-- print("len2: "..string.len(zjson))
|
||||
if zh >=7 and zh<=13 then
|
||||
zpluie_am=zpluie_am+zpluie
|
||||
end
|
||||
if zh >=13 and zh<=19 then
|
||||
zpluie_pm=zpluie_pm+zpluie
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- print("zget_json_key sortie...",zjson_stat)
|
||||
end
|
||||
|
||||
|
||||
zhmin=7
|
||||
zhmax=19
|
||||
zh=zhmin
|
||||
zpluie_am=0
|
||||
zpluie_pm=0
|
||||
zjson_stat=1
|
||||
zjson=""
|
||||
|
||||
function ztoto(c1)
|
||||
-- print("ztoto entrée...")
|
||||
if zjson=="" then
|
||||
zjson=c1
|
||||
else
|
||||
zjson=zjson..c1
|
||||
end
|
||||
-- print("zh: ",zh,"len(zjson): ",string.len(zjson))
|
||||
while zh<=zhmax do
|
||||
zget_json_key()
|
||||
if p1~=nil then
|
||||
zh=zh+1
|
||||
else
|
||||
print("ouille ouille ouille, pas trouvé...")
|
||||
if string.len(zjson)>510 then
|
||||
zjson=string.sub(zjson,string.len(zjson)-500)
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
if zh>zhmax then
|
||||
zjson=""
|
||||
end
|
||||
-- print("ztoto sortie...")
|
||||
end
|
||||
|
||||
|
||||
--set_json()
|
||||
--zjson_stat=1
|
||||
--zget_json_all_keys()
|
||||
|
||||
|
||||
--[[
|
||||
set_json()
|
||||
zjson_stat=1
|
||||
zh=1
|
||||
zget_json_key()
|
||||
zh=2
|
||||
zget_json_key()
|
||||
|
||||
set_json()
|
||||
zjson_stat=1
|
||||
zh=0
|
||||
for i=0, 5 do
|
||||
zget_json_key()
|
||||
zh=zh+1
|
||||
end
|
||||
|
||||
set_json()
|
||||
print("len1: "..string.len(zjson))
|
||||
zjson=string.sub(zjson,string.len(zjson)-500)
|
||||
print("len2: "..string.len(zjson))
|
||||
print("zjson1: ",string.sub(zjson,1,100))
|
||||
]]
|
||||
|
||||
|
||||
72
Meteo/oldies/a_test1_connect.lua
Normal file
72
Meteo/oldies/a_test1_connect.lua
Normal file
@@ -0,0 +1,72 @@
|
||||
-- Juste pour tester la connection avec un socket
|
||||
|
||||
print("\n a_test1_connect.lua zf190310.1607 \n")
|
||||
|
||||
function zgetstream()
|
||||
zgetstream_tmr=tmr.create()
|
||||
tmr.alarm(zgetstream_tmr, 1000, tmr.ALARM_AUTO , function()
|
||||
if wifi.sta.getip() == nil then
|
||||
print("Connecting to AP...")
|
||||
else
|
||||
tmr.unregister(zgetstream_tmr)
|
||||
zgetstream_tmr = nil
|
||||
|
||||
zcount = 0 zsum = 0
|
||||
zhost = "192.168.0.34" zurl = "/json/meteo/meteo.lausanne.190302.1231.json"
|
||||
|
||||
srv = net.createConnection(net.TCP, 0)
|
||||
|
||||
srv:on("connection", function(sck, c)
|
||||
print("on est connecté...")
|
||||
sck:send("GET "..zurl.." HTTP/1.1\r\nHost: "..zhost.."\r\nConnection: close\r\nAccept: */*\r\n\r\n")
|
||||
end)
|
||||
|
||||
srv:on("disconnection", function(a,b)
|
||||
print("a: ",a,"b: ",b)
|
||||
print("on est déconnecté...",node.heap())
|
||||
end)
|
||||
|
||||
srv:on("reconnection", function(a,b)
|
||||
print("a: ",a,"b: ",b)
|
||||
print("on est reconnecté...",node.heap())
|
||||
end)
|
||||
|
||||
srv:on("receive", function(sck, payload)
|
||||
zcount = zcount + 1 zlen = string.len(payload) zsum = zsum + zlen
|
||||
print("counter: ",zcount,"payload len: ",zlen,"sum: ",zsum)
|
||||
-- print(payload)
|
||||
end)
|
||||
|
||||
print("on connecte...",node.heap())
|
||||
srv:connect(80, zhost)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
--[[
|
||||
-- On affiche combien on a de RAM
|
||||
print(node.heap())
|
||||
|
||||
-- On charge le module et regarde combien cela a pris de RAM
|
||||
zh0=node.heap() print("zh0: ",zh0)
|
||||
f= "a_test1_connect.lua" if file.exists(f) then dofile(f) end
|
||||
zh1=node.heap() print("zh0-zh1: ",zh0-zh1)
|
||||
|
||||
-- On exécute le module
|
||||
zh0=node.heap() print("zh0: ",zh0)
|
||||
zgetstream()
|
||||
|
||||
-- On regarde combien cela a pris de RAM pour exécuter le module
|
||||
zh1=node.heap() print("zh0-zh1: ",zh0-zh1)
|
||||
|
||||
-- On libère le module et on regarde combien on a libéré de RAM
|
||||
zh0=node.heap() print("zh0: ",zh0)
|
||||
srv = nil
|
||||
zgetstream = nil
|
||||
zh1=node.heap() print("zh0-zh1: ",zh0-zh1)
|
||||
|
||||
-- On affiche combien on a de RAM
|
||||
print(node.heap())
|
||||
|
||||
]]
|
||||
Reference in New Issue
Block a user