diff --git a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs
index 2843718..61de44d 100644
--- a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs
+++ b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs
@@ -145,10 +145,9 @@ namespace Modbus.Net
/// 任务ID,每个触发器唯一
/// 要获取数据的设备实例
/// 获取数据的方式
- /// 调用函数的名称
///
///
- public async Task From(string queryId, IMachineReflectionCall machine, MachineDataType machineDataType, string callFunction = "Datas")
+ public async Task From(string queryId, IMachineReflectionCall machine, MachineDataType machineDataType)
{
JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name);
@@ -159,7 +158,7 @@ namespace Modbus.Net
job.JobDataMap.Put("DataType", machineDataType);
job.JobDataMap.Put("Machine", machine);
- job.JobDataMap.Put("Function", callFunction);
+ job.JobDataMap.Put("Function", "Datas");
if (_parentJobKey != null)
{
@@ -353,10 +352,9 @@ namespace Modbus.Net
///
/// 任务ID,每个触发器唯一
/// 写入数据的设备实例
- /// 调用函数的名称
///
///
- public async Task To(string queryId, IMachineReflectionCall machine, string callFunction = "Datas")
+ public async Task To(string queryId, IMachineReflectionCall machine)
{
JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name);
@@ -366,7 +364,7 @@ namespace Modbus.Net
.Build();
job.JobDataMap.Put("Machine", machine);
- job.JobDataMap.Put("Function", callFunction);
+ job.JobDataMap.Put("Function", "Datas");
var listener = _scheduler.ListenerManager.GetJobListener("Modbus.Net.DataQuery.Chain." + _trigger.Key.Name) as JobChainingJobListenerWithDataMap;
if (listener == null) throw new NullReferenceException("Listener " + "Modbus.Net.DataQuery.Chain." + _trigger.Key.Name + " is null");
@@ -383,11 +381,10 @@ namespace Modbus.Net
/// 任务ID,每个触发器唯一
/// 要获取数据的设备实例
/// 获取数据的方式
- /// 调用函数的名称
///
- public async Task From(string queryId, IMachineReflectionCall machine, MachineDataType machineDataType, string callFunction = "Datas")
+ public async Task From(string queryId, IMachineReflectionCall machine, MachineDataType machineDataType)
{
- return await new MachineGetJobScheduler(_scheduler, _trigger, _parentJobKey).From(queryId, machine, machineDataType, callFunction);
+ return await new MachineGetJobScheduler(_scheduler, _trigger, _parentJobKey).From(queryId, machine, machineDataType);
}
///