From 1861e61ceda9b1217e339c78248dff0b73539bf4 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 12 Aug 2018 11:27:02 +0100
Subject: [PATCH] Tree tidying

---
 fifo/fifo.lua     |  8 +++++++-
 init.lua          | 10 +++++++++-
 net/nwfnet-go.lua |  5 ++++-
 util/diag.lua     | 28 ++++++++++++++--------------
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/fifo/fifo.lua b/fifo/fifo.lua
index 794ad08..eadc579 100644
--- a/fifo/fifo.lua
+++ b/fifo/fifo.lua
@@ -6,7 +6,13 @@
 -- Returns 'true' if the queue was not empty, 'false' otherwise.
 local function dequeue(q,k)
   if #q > 0
-   then local new = k(q[1]) ; if new == nil then table.remove(q,1) else q[1] = new end ; return true
+   then
+     local new = k(q[1])
+     if new == nil
+       then table.remove(q,1)
+       else q[1] = new
+     end
+     return true
    else q._go = true ; return false
   end
 end
diff --git a/init.lua b/init.lua
index 5957601..0762247 100644
--- a/init.lua
+++ b/init.lua
@@ -77,6 +77,14 @@ local function bootPANIC()
   tmr.alarm(6,300000,tmr.ALARM_SINGLE,node.restart)
   goab()
 end
-local bct = { [0] = waitFLASH, [1] = bootPANIC, [2] = bootPANIC, [3] = bootPANIC, [4] = waitFLASH, [5] = goi2, [6] = waitFLASH }
+local bct = {
+  [0] = waitFLASH, -- power on
+  [1] = bootPANIC, -- hardware watchdog
+  [2] = bootPANIC, -- exception
+  [3] = bootPANIC, -- software watchdog
+  [4] = waitFLASH, -- software reset
+  [5] = goi2,      -- deep sleep
+  [6] = waitFLASH, -- external reset
+}
 local _, bc = node.bootreason()
 if bct[bc] then bct[bc]() else waitFLASH() end
diff --git a/net/nwfnet-go.lua b/net/nwfnet-go.lua
index 4579cae..7d4f201 100644
--- a/net/nwfnet-go.lua
+++ b/net/nwfnet-go.lua
@@ -49,7 +49,10 @@ end
 if file.open("nwfnet.conf2","r") then
   local conf = sjson.decode(file.read() or "")
   if type(conf) == "table" then
-    if conf["verify"] == 1 then print("Enabling certificate verification"); pcall(net.cert.verify,true) end
+    if conf["verify"] == 1 then
+      print("Enabling certificate verification")
+      pcall(net.cert.verify,true)
+    end
    else print("nwfnet.conf2 malformed")
   end
 end
diff --git a/util/diag.lua b/util/diag.lua
index 7c31258..977aea8 100644
--- a/util/diag.lua
+++ b/util/diag.lua
@@ -1,31 +1,31 @@
 -- SOFT DEPENDS: file, rtcfifo, node, wifi
 local k,v
 if node then
-  print('INFO:',string.format("major=%d minor=%d dev=%d chip=%d flash=%d fs=%d fm=%d fs=%d",node.info()))
-  print('HEAP:', node.heap())
+  print('INFO',string.format("major=%d minor=%d dev=%d chip=%d flash=%d fs=%d fm=%d fs=%d",node.info()))
+  print('HEAP', node.heap())
 end
 if wifi then
-  print('WIFI:',wifi.getmode())
-  print('MAC:',wifi.sta.getmac(), wifi.ap.getmac())
-  print('HOST:',wifi.sta.gethostname())
-  print('WSTA:',wifi.sta.getconfig())
-  print('WAP:',wifi.ap.getconfig())
-  print('IP:',wifi.sta.getip(), wifi.ap.getip())
+  print('WIFI',wifi.getmode())
+  print('MAC',wifi.sta.getmac(), wifi.ap.getmac())
+  print('HOST',wifi.sta.gethostname())
+  print('WSTA',wifi.sta.getconfig())
+  print('WAP',wifi.ap.getconfig())
+  print('IP',wifi.sta.getip(), wifi.ap.getip())
 end
 if rtcfifo then
-  if rtcfifo.ready() ~= 0 then print('RTCF:',rtcfifo.count()) else print('RTCF:','NOT PREPARED') end
+  if rtcfifo.ready() ~= 0 then print('RTCF',rtcfifo.count()) else print('RTCF','NOT PREPARED') end
 end
 if file then
-  print('FS:', file.fsinfo()); for k,v in pairs(file.list()) do print("",k,v) end
+  print('FS', file.fsinfo()); for k,v in pairs(file.list()) do print("",k,v) end
 end
 if node.flashindex then
  local ut, fa, ma, sz, t = node.flashindex()
  if ut then
-   print('LFS:', ut, fa, ma, sz)
+   print('LFS', ut, fa, ma, sz)
    for k,v in ipairs(t) do print("", v) end
  else
-   print('LFS:', fa, ma)
+   print('LFS', fa, ma)
  end
 end
-print('PACKAGES:'); for k,v in pairs(package.loaded) do print("",k,v) end
-print('GLOBAL:'); for k,v in pairs(_G) do print("",k,v) end
+print('PACKAGES'); for k,v in pairs(package.loaded) do print("",k,v) end
+print('GLOBAL'); for k,v in pairs(_G) do print("",k,v) end
-- 
2.50.1