Проверка контрольной сумму для MHZ-19.

[weathermon.git] / bin / weathermon-iio

diff --git a/bin/weathermon-iio b/bin/weathermon-iio
index 9298f6f5a4aab760a6b6968f3ebbbebbd222a8ef..d288edf935d599d63f236ca97835c663c85313fb 100755 (executable)
--- a/bin/weathermon-iio
+++ b/bin/weathermon-iio
@@ -11,6 +11,19 @@ require "wm_util"
 
 io.stdout:setvbuf('no')
 
 
 io.stdout:setvbuf('no')
 

+function dump(o)
+   if type(o) == 'table' then
+      local s = '{ '
+      for k,v in pairs(o) do
+         if type(k) ~= 'number' then k = '"'..k..'"' end
+         s = s .. '['..k..'] = ' .. dump(v) .. ','
+      end
+      return s .. '} '
+   else
+      return tostring(o)
+   end
+end
+

 function get_device_list(config_name)
 
   local devices
 function get_device_list(config_name)
 
   local devices


@@ -81,9 +94,26 @@ end
 
 function get_mhz(record)
   local p = record["rs232"]  
 
 function get_mhz(record)
   local p = record["rs232"]  

+  p:read(9,100)

   p:write(string.fromhex("ff0186000000000079"))
   local e, s = p:read(9,1000)
   p:write(string.fromhex("ff0186000000000079"))
   local e, s = p:read(9,1000)

-  return s:byte(3)*256+s:byte(4)
+  if (e == 0) and (s:len() == 9) and (s:byte(1) == 255) then
+    local crc = 0
+    for i = 2, 8 do
+      crc = crc + s:byte(i)
+      if (crc>=256) then
+        crc = crc - 256
+      end  
+    end  
+    crc = 255 - crc
+    crc = crc + 1;
+    if crc == s:byte(9) then
+      return s:byte(3)*256+s:byte(4)
+    end  
+  end
+  
+  return nil
+   

 end
 
 function init_serial_device(device,subsystem,parameters)
 end
 
 function init_serial_device(device,subsystem,parameters)