Merge pull request #562 from etactica/reportslaveid

other: reportSlaveId: allow slaves to provide custom responses

Author: dhoomakethu

pymodbus/other_message.py

@@ -360,21 +360,26 @@ def decode(self, data):
         pass
 
     def execute(self, context=None):
-        ''' Run a read exeception status request against the store
+        ''' Run a report slave id request against the store
 
         :returns: The populated response
         '''
-        information = DeviceInformationFactory.get(_MCB)
-        identifier = "-".join(information.values()).encode()
-        identifier = identifier or b'Pymodbus'
-        return ReportSlaveIdResponse(identifier)
+        reportSlaveIdData = None
+        if context:
+            reportSlaveIdData = context.reportSlaveIdData
+        if not reportSlaveIdData:
+            information = DeviceInformationFactory.get(_MCB)
+            identifier = "-".join(information.values()).encode()
+            identifier = identifier or b'Pymodbus'
+            reportSlaveIdData = identifier
+        return ReportSlaveIdResponse(reportSlaveIdData)
 
     def __str__(self):
         ''' Builds a representation of the request
 
         :returns: The string representation of the request
         '''
-        return "ResportSlaveIdRequest(%d)" % self.function_code
+        return "ReportSlaveIdRequest(%d)" % self.function_code
 
 
 class ReportSlaveIdResponse(ModbusResponse):
@@ -430,7 +435,7 @@ def __str__(self):
         :returns: The string representation of the response
         '''
         arguments = (self.function_code, self.identifier, self.status)
-        return "ResportSlaveIdResponse(%s, %s, %s)" % arguments
+        return "ReportSlaveIdResponse(%s, %s, %s)" % arguments
 
 #---------------------------------------------------------------------------#
 # TODO Make these only work on serial