diff --git a/SonOff/SonOff_2/web_srv2.lua b/SonOff/SonOff_2/web_srv2.lua
index 15a8048..0695bf0 100644
--- a/SonOff/SonOff_2/web_srv2.lua
+++ b/SonOff/SonOff_2/web_srv2.lua
@@ -1,16 +1,7 @@
-- petit script de serveur WEB avec Active Server Page ZYX
+-- permet d'exécuter du code LUA inline dans l'HTML !
-print("\n web_srv2.lua zf191222.2335 \n")
-
--- dû refaire la commande file.readline car elle bug quand ligne longue
-function zread_line()
- local zline = ""
- while true do
- local t = file_web:read(1) if t == nil then return end
- zline = zline..t
- if t == "\n" then return zline end
- end
-end
+print("\n web_srv2.lua zf200112.1530 \n")
-- envoie sur le port ouvert mais depuis l'environnement global !
function zout(zstring)
@@ -28,24 +19,16 @@ function send_file(zclient, zfilename)
if file_web then
repeat
local line = file_web:readline()
--- local line = file_web:read('\n')
--- local line = zread_line()
--- print("hello toto",string.len(line))
if line then
if string.find(line, "<%%") then
--- print("start lua...")
flag_lua_code = true -- bascule sur le code lua inline
lua_code = ""
elseif string.find(line, "%%>") then
--- print("stop lua...")
flag_lua_code = false -- revient sur le code HTML
--- print("Et voici le code lua inline:\n"..lua_code)
loadstring(lua_code)() --on exécute ici le code lua inline !
elseif flag_lua_code then
--- print(line)
lua_code = lua_code..line -- récupère le code lua inline
else
--- print(line)
zclient:send(line) -- envoie le code HTML
end
end
@@ -56,16 +39,10 @@ function send_file(zclient, zfilename)
end
end
-
srv = net.createServer()
srv:listen(80, function(conn)
conn:on("receive", function(client, request)
_, _, method, path, vars = string.find(request, "([A-Z]+) (.+)?(.+) HTTP")
-
--- print("zrequest: \n---\n"..request.."---")
-
--- print("method: ", method) print("path: ", path) print("vars: ", vars)
-
if not string.find(request, "/favicon.ico") then
print("coucou")
if (method == nil) then
@@ -80,7 +57,6 @@ srv:listen(80, function(conn)
end
end
file_html=string.gsub(path, "/", "")
- -- print("file_html: ",file_html)
send_file(client, file_html)
end
end)
diff --git a/SonOff/SonOff_2/z_index.html b/SonOff/SonOff_2/z_index.html
index f12989b..5940321 100644
--- a/SonOff/SonOff_2/z_index.html
+++ b/SonOff/SonOff_2/z_index.html
@@ -1,15 +1,18 @@
+
+
+
SonOff home page
- SonOff home page 2001011.1351
+ SonOff home page 2001012.1526
Home...
Menu:
-
+
SonOff API LED
On
Off
@@ -39,7 +42,7 @@
print("On demande le setup wifi depuis le browser !")
wifi_setup_ok=(math.floor(100*node.random()))
zout("
Etes-vous vraiment certain ?
Si oui, faites: ")
- zout(' Ok
')
+ zout(' Ok
')
end
%>
@@ -74,7 +77,7 @@
zout("
")
%>
-<%
+<%
if zRELAY ~= nil then
zout("Etat du RELAY:")
if gpio.read(zRELAY) == 0 then zout("OFF") else zout("ON") end
@@ -85,7 +88,9 @@
<%
a,b,c = wifi.sta.getip()
if a ~= nil then
- zout("
IP: "..a.." MASK: "..b.." GATEWAY: "..c.."
")
+ zout("
IP: "..a.."
")
+ zout("MASK: "..b.."
")
+ zout("GATEWAY: "..c.."
")
end
collectgarbage() zout("RAM: "..node.heap())
%>