fix

apps/modbus/include/modbus_ast.hrl

@@ -17,15 +17,15 @@
 }).
 
 -record(modbus_transport_tcp, {
-    host :: string(),
+    host :: binary(),
-    port :: string(),
+    port :: binary(),
     timeout = 0 :: integer()
 }).
 
 -record(modbus, {
     transport :: #modbus_transport_rtu{} | #modbus_transport_tcp{},
-    error_log = "" :: string(),
+    error_log :: binary() | undefined,
-    access_log = "" :: string()
+    access_log :: binary() | undefined
 }).
 
 -record(modbus_device_io, {
@@ -45,12 +45,12 @@
 
 -record(modbus_device, {
     %% 设备名称
-    name :: string(),
+    name :: binary(),
     %% 设备标识
     slave_id :: integer(),
 
-    model :: string() | undefined,
+    model :: binary() | undefined,
-    description :: string() | undefined,
+    description :: binary() | undefined,
 
     device_io :: binary() | undefined,
 
@@ -82,19 +82,19 @@
 }).
 
 -record(modbus_processor, {
-    name :: string(),
+    name :: binary(),
-    input :: string(),
+    input :: binary(),
     transform :: any(),
 
     output :: []
 }).
 
 -record(modbus_alarm, {
-    name :: string(),
+    name :: binary(),
-    condition :: string(),
+    condition :: binary(),
 
     %% 持续判定
-    hold_time :: string(),
+    hold_time :: binary(),
 
     %% 动作
     actions :: [],
@@ -107,7 +107,7 @@
     address :: integer(),
     type :: atom(),
     scale = 1.0 :: float(),
-    unit :: string() | undefined,
+    unit :: binary() | undefined,
     poll = true :: boolean()
 }).
 

apps/modbus/src/modbus_device.erl

@@ -96,11 +96,12 @@ handle_info({timeout, _, {poll_ticker, Name}}, State = #state{parent_pid = Paren
     %% 开启下一次的循环
     poll_ticker(PollInterval, Name),
 
-    #modbus_metric{address = Address} = maps:get(Name, MetricsMap),
+    #modbus_metric{address = Address, type = Type} = maps:get(Name, MetricsMap),
     %% 读取采集项目
     ReceiverPid = self(),
     Ref = make_ref(),
-    ParentPid ! {request, ReceiverPid, Ref, SlaveId, Address, 1},
+    Cnt = get_register_count(Type),
+    ParentPid ! {request, ReceiverPid, Ref, SlaveId, Address, Cnt},
 
     {noreply, State#state{inflight = maps:put(Ref, Name, Inflight)}};
 
@@ -109,9 +110,11 @@ handle_info({request_reply, Ref, Val}, State = #state{parent_pid = ParentPid, de
         error ->
             {noreply, State};
         {MetricName, NInflight} ->
-            #modbus_metric{} = maps:get(MetricName, MetricsMap),
+            #modbus_metric{type = Type} = maps:get(MetricName, MetricsMap),
             lager:debug("[modbus_device] metric_name: ~p, get value: ~p", [MetricName, Val]),
             %% todo 还需要解决数据的上传问题
+            RealVal = parse_value(Val, Type),
+            lager:debug("[modbus_device] real val is: ~p", [RealVal]),
 
             %% 解决值的广播问题
             Key = <<"$", DeviceName/binary, ".", MetricName/binary>>,
@@ -155,4 +158,38 @@ start_ticker([Name|T], Step) ->
 
 -spec poll_ticker(PollInterval :: integer(), Name :: binary()) -> no_return().
 poll_ticker(PollInterval, Name) when is_integer(PollInterval), is_binary(Name) ->
-    erlang:start_timer(PollInterval, self(), {poll_ticker, Name}).
+    erlang:start_timer(PollInterval, self(), {poll_ticker, Name}).
+
+get_register_count(<<"int16">>) ->
+    1;
+get_register_count(<<"uint16">>) ->
+    1;
+get_register_count(<<"int32">>) ->
+    2;
+get_register_count(<<"uint32">>) ->
+    2;
+get_register_count(<<"int64">>) ->
+    4;
+get_register_count(<<"uint64">>) ->
+    4;
+get_register_count(<<"float32">>) ->
+    2;
+get_register_count(<<"float64">>) ->
+    4;
+get_register_count(_) ->
+    1.
+
+parse_value(<<Val:8>>, _) ->
+    Val;
+parse_value(<<Val:16>>, <<"int16">>) ->
+    Val;
+parse_value(<<Val:16>>, <<"uint16">>) ->
+    Val;
+parse_value(<<Val:32>>, <<"int32">>) ->
+    Val;
+parse_value(<<Val:32/unsigned-integer>>, <<"uint32">>) ->
+    Val;
+parse_value(<<Val:32/big-float>>, <<"float32">>) ->
+    Val;
+parse_value(<<Val:64/big-float>>, <<"float32">>) ->
+    Val.

apps/modbus/src/modbus_service.erl

@@ -98,7 +98,7 @@ init([AST = #ast{modbus = Modbus = #modbus{transport = Transport, error_log = Er
                     {ok, ?CONNECTED, #state{ast = AST, access_log_pid = create_log_file(AccessLog), error_log_pid = create_log_file(ErrorLog),
                         mode = #rtu_mode{port = Port, delay_ms = DelayMs},
                         queue = queue:new(), packet_id = 1, devices_map = DevicesMap, alarm_pids = []}};
-                Socket ->
+                {tcp, Socket} ->
                     {ok, ?CONNECTED, #state{ast = AST, access_log_pid = create_log_file(AccessLog), error_log_pid = create_log_file(ErrorLog),
                         mode = #tcp_mode{socket = Socket},
                         queue = queue:new(), packet_id = 1, devices_map = DevicesMap, alarm_pids = []}}
@@ -218,7 +218,7 @@ handle_event(info, {timeout, _Ref, modbus_connect}, ?DISCONNECTED, State = #stat
             case ConnectResult of
                 {rtu, Port, DelayMs} ->
                     {next_state, ?CONNECTED, State#state{mode = #rtu_mode{port = Port, delay_ms = DelayMs}}, Actions};
-                Socket ->
+                {tcp, Socket} ->
                     {next_state, ?CONNECTED, State#state{mode = #tcp_mode{socket = Socket}}, Actions}
             end;
         {error, Reason} ->
@@ -292,7 +292,8 @@ connect(#modbus_transport_tcp{host = Host, port = Port, timeout = Timeout0}) ->
                   false ->
                       2000
               end,
-    gen_tcp:connect(Host, Port, [binary], Timeout).
+    Socket = gen_tcp:connect(Host, Port, [binary], Timeout),
+    {ok, {tcp, Socket}}.
 
 %% 计算3.5个字符的静默时间
 -spec frame_delay(BaudRate :: integer(), DataBits :: integer(), Parity :: integer(), StopBits :: integer()) -> integer().

modbus.conf

@@ -36,7 +36,6 @@ device_io t1 {
            type int16;
            scale 0.1;
            unit "°C";
-           poll on;
        }
 
        # 压力传感器(输入寄存器)
@@ -45,7 +44,6 @@ device_io t1 {
            type uint16;
            scale 0.01;
            unit "kPa";
-           poll on;
        }
    }
 
@@ -119,7 +117,6 @@ device xyz {
             type int16;
             scale 0.1;
             unit "°  C";
-            poll on;
         }
 
         # 压力传感器(输入寄存器)
@@ -128,7 +125,6 @@ device xyz {
             type uint16;
             scale 0.01;
             unit "kPa";
-            poll on;
         }
 
         # 状态位(线圈)