[tmpod] sensor config publishing is now exclusively handled by tmpod

Author: icarus75

openwrt/package/flukso/luasrc/kubed.lua

@@ -66,7 +66,6 @@ local MOSQ_QOS1 = 1
 local MOSQ_RETAIN = true
 
 local MOSQ_TOPIC_KUBE_CONFIG = string.format("/device/%s/config/kube", DEVICE)
-local MOSQ_TOPIC_SENSOR_CONFIG = string.format("/device/%s/config/sensor", DEVICE)
 local MOSQ_TOPIC_SENSOR = "/sensor/%s/%s"
 
 local FMT_CMD_SET_GROUP = "sg %s"
@@ -209,8 +208,6 @@ local function load_config()
 
 	local kube = luci.json.encode(config_clean(KUBE))
 	mqtt:publish(MOSQ_TOPIC_KUBE_CONFIG, kube, MOSQ_QOS0, MOSQ_RETAIN)
-	local sensor = luci.json.encode(config_clean(SENSOR))
-	mqtt:publish(MOSQ_TOPIC_SENSOR_CONFIG, sensor, MOSQ_QOS0, MOSQ_RETAIN)
 
 	if DEBUG.config then
 		dbg.vardump(KUBE)

openwrt/package/flukso/luasrc/tmpod.lua

@@ -94,6 +94,8 @@ local MOSQ_QOS1 = 1
 local MOSQ_RETAIN = true
 local MOSQ_ERROR = "MQTT error: %s"
 
+local MOSQ_TOPIC_SENSOR_CONFIG = string.format("/device/%s/config/sensor", DEVICE)
+
 -- increase process niceness
 nixio.nice(TMPO_NICE)
 
@@ -117,40 +119,54 @@ local config = {
 	sensor = nil,
 
 	load = function(self)
-		local function clean(itbl)
-			local otbl = { }
-			for sidx, params in pairs(itbl) do
-				if tonumber(sidx) -- only interested in sensor entries
+		local function clean(tbl)
+			for section, params in pairs(tbl) do
+				params[".index"] = nil
+				params[".name"] = nil
+				params[".type"] = nil
+				params[".anonymous"] = nil
+
+				if tonumber(section) -- sensor entries only
 				and params.enable
 				and params.enable == "1"
 				then
-					otbl[params.id] = params
-					params[".index"] = nil
-					params[".name"] = nil
-					params[".type"] = nil
-					params[".anonymous"] = nil
-					params.enable = nil
-					params.counter = nil
 					if not params.data_type then params.data_type = "counter" end
 					if not params.rid then params.rid = 0 end
+				end
 
-					for option, value in pairs(params) do
-						params[option] = tonumber(value) or value
-						if type(value) == "table" then -- dealing with a list
-							for i in pairs(value) do
-								value[i] = tonumber(value[i]) or value[i]
-							end 
-						else
-							params[option] = tonumber(value) or value
+				for option, value in pairs(params) do
+					params[option] = tonumber(value) or value
+					if type(value) == "table" then -- we're dealing with a list
+						for i in pairs(value) do
+							value[i] = tonumber(value[i]) or value[i]
 						end
 					end
 				end
 			end
+			return tbl
+		end
+
+		local function purge(itbl)
+			local otbl = { }
+			for section, params in pairs(itbl) do
+				if tonumber(section)
+				and params.enable
+				and params.enable == "1"
+				then
+					otbl[params.id] = params
+					params.enable = nil
+					params.counter = nil
+				end
+			end
 			return otbl
 		end
 
 		uci:load("flukso")
-		self.sensor = clean(uci:get_all("flukso"))
+		local sensor = clean(uci:get_all("flukso"))
+		local jsensor = luci.json.encode(sensor)
+		mqtt:publish(MOSQ_TOPIC_SENSOR_CONFIG, jsensor, MOSQ_QOS0, MOSQ_RETAIN)
+		self.sensor = purge(sensor)
+
 		if DEBUG.config then dbg.vardump(self.sensor) end
 	end
 }

openwrt/package/flukso/luasrc/wwd.lua

@@ -67,7 +67,6 @@ local MOSQ_MAX_PKTS = 10 -- packets
 local MOSQ_QOS0 = 0
 local MOSQ_QOS1 = 1
 local MOSQ_RETAIN = true
-local MOSQ_TOPIC_SENSOR_CONFIG = string.format("/device/%s/config/sensor", DEVICE)
 local MOSQ_TOPIC_SENSOR = "/sensor/%s/%s"
 local MOSQ_TOPIC_WW_UPGRADE = "/device/%s/ww/upgrade"
 
@@ -542,32 +541,6 @@ local sensor = {
 			local payload = luci.json.encode({ timestamp, bitfield, cfg.unit })
 			mqtt:publish(topic, payload, MOSQ_QOS0, MOSQ_RETAIN)
 		end
-	end,
-
-	publish_cfg = function(self)
-		local function config_clean(itbl)
-			local otbl = luci.util.clone(itbl, true)
-			for section, section_tbl in pairs(otbl) do
-				section_tbl[".index"] = nil
-				section_tbl[".name"] = nil
-				section_tbl[".type"] = nil
-				section_tbl[".anonymous"] = nil
-
-				for option, value in pairs(section_tbl) do
-					section_tbl[option] = tonumber(value) or value
-					if type(value) == "table" then -- we're dealing with a list
-						for i in pairs(value) do
-							value[i] = tonumber(value[i]) or value[i]
-						end 
-					end
-				end
-			end
-
-			return otbl
-		end
-
-		local flukso = luci.json.encode(config_clean(uci:get_all("flukso")))
-		mqtt:publish(MOSQ_TOPIC_SENSOR_CONFIG, flukso, MOSQ_QOS0, MOSQ_RETAIN)
 	end
 }
 
@@ -605,7 +578,6 @@ local root = state {
 	load_config = state {
 		entry = function()
 			sensor:load_cfg()
-			sensor:publish_cfg()
 		end
 	},