diff --git a/model/ProjectModel/DeviceManage.py b/model/ProjectModel/DeviceManage.py index 6b677a7..fb5623e 100644 --- a/model/ProjectModel/DeviceManage.py +++ b/model/ProjectModel/DeviceManage.py @@ -85,8 +85,11 @@ class Device(): # self.recalculateAddress() - def getArea(self, index): - return self.areas[index] + def getAreaValues(self, index): + if self.masterOrSlave == "主站" + return self.outputAreas[index].currentValue + else: + return self.inputAreas[index].currentValue def getLength(self, nums, bytes): length = int(nums) * int(bytes)