# HG changeset patch # User Edouard Tisserant # Date 1544006118 -3600 # Node ID 10437c6c294e6aea7d053b555abc5077d37069c1 # Parent 8742337a9fe3a6af0b9c4a0f143126865e084dd8 Empirically reverted calls done just after NewPLC back to the order as it was before chunked transfer. Apparently I broke something... To be continued diff -r 8742337a9fe3 -r 10437c6c294e ProjectController.py --- a/ProjectController.py Tue Dec 04 11:31:58 2018 +0100 +++ b/ProjectController.py Wed Dec 05 11:35:18 2018 +0100 @@ -1810,6 +1810,8 @@ return # Check remote target PLC correspondance to that md5 if self._connector.MatchMD5(MD5): + self.logger.write( + _("Latest build matches with connected target.\n")) self.ProgramTransferred() else: self.logger.write( @@ -1867,18 +1869,22 @@ object_path = builder.GetBinaryPath() object_blob = self._connector.BlobFromFile(object_path) + self.HidePLCProgress() + + self.logger.write(_("PLC data transfered successfully.\n")) + if self._connector.NewPLC(MD5, object_blob, extrafiles): - self.ProgramTransferred() - self.AppFrame.CloseObsoleteDebugTabs() - self.AppFrame.LogViewer.ResetLogCounters() if self.GetIECProgramsAndVariables(): self.UnsubscribeAllDebugIECVariable() + self.ProgramTransferred() + self.AppFrame.CloseObsoleteDebugTabs() self.AppFrame.RefreshPouInstanceVariablesPanel() - self.logger.write(_("Transfer completed successfully.\n")) + self.AppFrame.LogViewer.ResetLogCounters() + self.logger.write(_("PLC installed successfully.\n")) + else: + self.logger.write_error(_("Missing debug data\n")) else: - self.logger.write_error(_("Transfer failed\n")) - - self.HidePLCProgress() + self.logger.write_error(_("PLC couldn't be installed\n")) wx.CallAfter(self.UpdateMethodsFromPLCStatus)