1) Переход на доставку без гарантии (старые данные копить нет смысла)

2) Исправлена фильтрация в случае выборки <= размеру окна

diff --git a/bin/weather-filter b/bin/weather-filter
index 1fc798fbb23bb4fe2a7699e420d45082f7a7d2be..84c22653696bb52467dfe2a02a8176f815bf9eab 100755 (executable)
--- a/bin/weather-filter
+++ b/bin/weather-filter
@@ -42,6 +42,10 @@ function filter_data(dataset,width)
     width = 7
   end  
 
+  if #dataset <= width then
+    return dataset
+  end  
+
   local result = {}
   
   local window_spread = math.floor(width/2)

diff --git a/bin/weathermon b/bin/weathermon
index 804ba255a87eef42963134328191f2b52502aea5..cc58def4232fd28424b8699c89b7e8a2c24d3629 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -189,7 +189,7 @@ function processJson(str)
         if not mqtt_client:socket() then
           mqtt_client:reconnect()
         end  
-        mqtt_client:publish(mqtt_path,v)
+        mqtt_client:publish(mqtt_path,v,0,0)
         mqtt_client:loop()
       end  
     end
@@ -252,7 +252,7 @@ function processLine(str)
                 return '{'..name..'}'
               end      
             end)
-          mqtt_client:publish(mqtt_path,v)
+          mqtt_client:publish(mqtt_path,v,0,0)
           mqtt_client:loop()
         end  
       end
@@ -293,7 +293,7 @@ function processLine(str)
               return '{'..name..'}'
             end      
           end)
-        mqtt_client:publish(mqtt_path,msg_body)
+        mqtt_client:publish(mqtt_path,msg_body,0,0)
         mqtt_client:loop()
       end
       if alarm_exec then