La nouvelle version avec le telnet complexe comme à marchotter, mais il y a encore pleins de trucs à améliorer

Mesures/ADC/ADS1115/0_tst3_socat.lua

@@ -0,0 +1,211 @@
+-- tests connection reverse telnet
+-- commande à faire tourner sur le serveur
+--[[
+socat TCP-LISTEN:23002,fork,reuseaddr STDIO
+socat TCP-LISTEN:23002,reuseaddr,fork TCP-LISTEN:24002,reuseaddr,bind=127.0.0.1
+]]
+
+print("\n 0_tst3_socat.lua   zf200209.1924   \n")
+
+
+
+
+
+local node, table, tmr, wifi, uwrite,     tostring =
+      node, table, tmr, wifi, uart.write, tostring
+
+local function telnet_listener(socket)
+  local insert,       remove,       concat,       heap,      gc   =
+        table.insert, table.remove, table.concat, node.heap, collectgarbage
+  local fifo1, fifo1l, fifo2, fifo2l = {}, 0, {}, 0
+  local s -- s is a copy of the TCP socket if and only if sending is in progress
+  local wdclr, cnt = tmr.wdclr, 0
+  local function debug(fmt, ...)
+    if (...) then fmt = fmt:format(...) end
+    uwrite(0, "\r\nDBG: ",fmt,"\r\n" )
+    cnt = cnt + 1
+    if cnt % 10 then wdclr() end
+  end
+
+  local function flushGarbage()
+    if heap() < 13440 then gc() end
+  end
+
+  local function sendLine()
+     if not s then return end
+
+      if fifo2l + fifo1l == 0 then -- both FIFOs empty, so clear down s
+        s = nil
+        return
+    end
+    flushGarbage()
+    if #fifo2 < 4 then -- Flush FIFO1 into FIFO2
+      insert(fifo2,concat(fifo1))
+      fifo2l, fifo1, fifo1l = fifo2l + fifo1l, {}, 0
+    end
+    local rec =  remove(fifo2,1)        .. (remove(fifo2,1) or '') ..
+                (remove(fifo2,1) or '') .. (remove(fifo2,1) or '')
+    fifo2l = fifo2l - #rec
+    flushGarbage()
+    s:send(rec)
+  end
+
+  local F1_SIZE = 256
+
+  local function queueLine(str)
+    while #str > 0 do  -- this is because str might be longer than the packet size!
+      local k, l = F1_SIZE - fifo1l, #str
+      local chunk
+      if #fifo1 >= 32 or (k < l and k < 16) then
+        insert(fifo2, concat(fifo1))
+        fifo2l, fifo1, fifo1l, k = fifo2l + fifo1l, {}, 0, F1_SIZE
+      end
+      if l > k+16 then -- also tolerate a size overrun of 16 bytes to avoid a split
+        chunk, str = str:sub(1,k), str:sub(k+1)
+      else
+        chunk, str = str, ''
+      end
+      insert(fifo1, chunk)
+      fifo1l = fifo1l + #chunk
+    end
+    if not s and socket then
+      s = socket
+      sendLine()
+    else
+      flushGarbage()
+    end
+  end
+
+  local function receiveLine(s, line)
+    node.input(line)
+  end
+
+  local function disconnect(s)
+    fifo1, fifo1l, fifo2, fifo2l, s = {}, 0, {}, 0, nil
+    node.output(nil)
+  end
+
+  --zzz
+  local function zconnection(s)
+    print("Welcome to NodeMCU world.")
+  end
+
+  socket:on("connection",    zconnection)
+  socket:on("receive",       receiveLine)
+  socket:on("disconnection", disconnect)
+  socket:on("sent",          sendLine)
+  node.output(queueLine, 0)
+end
+
+--net.createServer(net.TCP, 180):listen(23, telnet_listener)
+--print("Telnet server running...\nUsage: telnet -rN ip\n")
+
+
+
+srv_rt = net.createConnection(net.TCP, 0)
+
+srv_rt:on("connection", function(sck)
+    print("c'est connected...")
+    telnet_listener(sck)
+end)
+
+srv_rt:connect(console_port,console_host)
+
+print("Telnet server running...\nUsage: telnet -rN ip\n")
+
+
+
+
+
+tmr_socat1=tmr.create()
+tmr_socat1:alarm(3*1000, tmr.ALARM_AUTO , function()
+
+    gpio.write(zLED, gpio.LOW)   tmr.delay(10000)   gpio.write(zLED, gpio.HIGH)
+    if console_port == srv_rt:getpeer() then
+        gpio.write(zLED, gpio.LOW)
+    else
+        gpio.write(zLED, gpio.HIGH)
+        print("trying...")
+        srv_rt:connect(console_port,console_host)
+    end
+
+
+end)
+
+
+
+
+
+
+
+--[[
+
+srv_rt = net.createConnection(net.TCP, 0)
+
+srv_rt:on("connection", function(sck)
+
+    print("c'est connected...")
+
+    function s_output(str)
+      if(sck~=nil)
+        then sck:send(str)
+      end
+    end
+    node.output(s_output, 0)
+    -- re-direct output to function s_ouput.
+
+    sck:on("receive",function(c,l)
+      node.input(l)
+      --like pcall(loadstring(l)), support multiple separate lines
+    end)
+
+    sck:on("disconnection",function(c)
+      node.output(nil)
+      print("c'est disconnected...")
+      --unregist redirect output function, output goes to serial
+    end)
+
+
+
+    sck:on("reconnection",function(c)
+      print("c'est reconnection...")
+    end)
+
+
+
+
+    print("Welcome to NodeMcu world.")
+end)
+
+
+tmr_socat1=tmr.create()
+tmr_socat1:alarm(3*1000, tmr.ALARM_AUTO , function()
+
+    gpio.write(zLED, gpio.LOW)   tmr.delay(10000)   gpio.write(zLED, gpio.HIGH)
+    if console_port == srv_rt:getpeer() then
+        gpio.write(zLED, gpio.LOW)
+    else
+        gpio.write(zLED, gpio.HIGH)
+        print("trying...")
+        srv_rt:connect(console_port,console_host)
+    end
+
+
+end)
+]]
+
+--[[
+
+print(srv_rt:getpeer())
+
+srv_rt:connect(console_port,console_host)
+
+gpio.write(zLED, gpio.LOW)   tmr.delay(10000)   gpio.write(zLED, gpio.HIGH)
+if console_port == srv_rt:getpeer() then
+    gpio.write(zLED, gpio.LOW)
+else
+    gpio.write(zLED, gpio.HIGH)
+end
+
+
+]]

Mesures/ADC/ADS1115/goodies/cat.lua

@@ -1,5 +1,5 @@
 -- fonction cat() pour afficher le contenu d'un fichier dans la flash
-print("\n cat.lua   zf200209.1630   \n")
+print("\n cat.lua   zf191124.2204   \n")
 
 function zread_line()
     local zline = ""
@@ -15,13 +15,7 @@ function cat(zfile)
     zf = file.open(zfile, "r")
     while true do
         zline = zread_line()   if zline == nil then break end
-
-        tmr.delay(100*1000)
-
         print(zline)
-
-
-        
     end
     zf:close()
     print("-------------------------------")