diff --git a/apps/modbus/src/modbus_device.erl b/apps/modbus/src/modbus_device.erl index 2d3a6fb..b67c171 100644 --- a/apps/modbus/src/modbus_device.erl +++ b/apps/modbus/src/modbus_device.erl @@ -48,7 +48,7 @@ start_link(ParentPid, Device = #modbus_device{}) when is_pid(ParentPid) -> {stop, Reason :: term()} | ignore). init([ParentPid, Device = #modbus_device{metrics = Metrics0, poll_interval = PollInterval}]) -> - lager:debug("device is: ~p", [Device]), + lager:warning("device metrics is: ~p", [Metrics0]), %% 处理采集项目 MetricsMap = maps:from_list(lists:map(fun(Metric0 = #modbus_metric{name = Name}) -> {Name, Metric0} end, Metrics0)), diff --git a/apps/modbus/src/modbus_service.erl b/apps/modbus/src/modbus_service.erl index ce443f1..93568e2 100644 --- a/apps/modbus/src/modbus_service.erl +++ b/apps/modbus/src/modbus_service.erl @@ -83,15 +83,16 @@ start_link(AST = #ast{}) -> %% gen_statem:start_link/[3,4], this function is called by the new %% process to initialize. init([AST = #ast{modbus = Modbus = #modbus{error_log = ErrorLog, access_log = AccessLog}, device_ios = IOs, devices = Devices, alarms = Alarms}]) -> - lager:debug("[modbus_service] ast is: ~p", [AST]), + %lager:debug("[modbus_service] ast is: ~p", [AST]), lager:debug("[modbus_service] io is: ~p", [IOs]), - lager:debug("[modbus_service] devices is: ~p", [Devices]), + %lager:debug("[modbus_service] devices is: ~p", [Devices]), %% 建立连接 erlang:start_timer(0, self(), modbus_connect), %% 启动设备相关的进程 DevicesPids = lists:map(fun(Device = #modbus_device{slave_id = SlaveId}) -> + lager:debug("merge result is: ~p", [merge_io(Device, IOs)]), {ok, DevicePid} = modbus_device:start_link(self(), merge_io(Device, IOs)), {SlaveId, DevicePid} end, Devices), diff --git a/modbus.conf b/modbus.conf index 1853668..bfa0acb 100644 --- a/modbus.conf +++ b/modbus.conf @@ -76,7 +76,7 @@ device boiler_controller { model "Siemens S7-1200"; description "Main boiler controller"; - io t1; + device_io t1; # 写入控制 controls {