1114 PLCstatus = self._connector.GetPLCstatus() |
1114 PLCstatus = self._connector.GetPLCstatus() |
1115 if PLCstatus is not None: |
1115 if PLCstatus is not None: |
1116 status, log_count = PLCstatus |
1116 status, log_count = PLCstatus |
1117 self.UpdatePLCLog(log_count) |
1117 self.UpdatePLCLog(log_count) |
1118 if status is None: |
1118 if status is None: |
1119 self._SetConnector(None) |
1119 self._SetConnector(None, False) |
1120 status = "Disconnected" |
1120 status = "Disconnected" |
1121 if(self.previous_plcstate != status): |
1121 if(self.previous_plcstate != status): |
1122 for args in { |
1122 for args in { |
1123 "Started" : [("_Run", False), |
1123 "Started" : [("_Run", False), |
1124 ("_Stop", True)], |
1124 ("_Stop", True)], |
1378 # debugthread should die on his own |
1378 # debugthread should die on his own |
1379 #self.KillDebugThread() |
1379 #self.KillDebugThread() |
1380 |
1380 |
1381 wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
1381 wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
1382 |
1382 |
1383 def _SetConnector(self, connector): |
1383 def _SetConnector(self, connector, update_status=True): |
1384 self._connector = connector |
1384 self._connector = connector |
1385 if self.AppFrame is not None: |
1385 if self.AppFrame is not None: |
1386 self.AppFrame.LogViewer.SetLogSource(connector) |
1386 self.AppFrame.LogViewer.SetLogSource(connector) |
1387 if connector is not None: |
1387 if connector is not None: |
1388 # Start the status Timer |
1388 # Start the status Timer |
1389 self.StatusTimer.Start(milliseconds=500, oneShot=False) |
1389 self.StatusTimer.Start(milliseconds=500, oneShot=False) |
1390 else: |
1390 else: |
1391 # Stop the status Timer |
1391 # Stop the status Timer |
1392 self.StatusTimer.Stop() |
1392 self.StatusTimer.Stop() |
|
1393 if update_status: |
|
1394 wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
1393 |
1395 |
1394 def _Connect(self): |
1396 def _Connect(self): |
1395 # don't accept re-connetion if already connected |
1397 # don't accept re-connetion if already connected |
1396 if self._connector is not None: |
1398 if self._connector is not None: |
1397 self.logger.write_error(_("Already connected. Please disconnect\n")) |
1399 self.logger.write_error(_("Already connected. Please disconnect\n")) |
1491 self.EnableMethod("_Transfer", False) |
1493 self.EnableMethod("_Transfer", False) |
1492 |
1494 |
1493 |
1495 |
1494 def _Disconnect(self): |
1496 def _Disconnect(self): |
1495 self._SetConnector(None) |
1497 self._SetConnector(None) |
1496 wx.CallAfter(self.UpdateMethodsFromPLCStatus) |
|
1497 |
1498 |
1498 def _Transfer(self): |
1499 def _Transfer(self): |
1499 # Get the last build PLC's |
1500 # Get the last build PLC's |
1500 MD5 = self.GetLastBuildMD5() |
1501 MD5 = self.GetLastBuildMD5() |
1501 |
1502 |