equal
deleted
inserted
replaced
121 |
121 |
122 # Check connection is effective. |
122 # Check connection is effective. |
123 # lambda is for getattr of GetPLCstatus to happen inside catcher |
123 # lambda is for getattr of GetPLCstatus to happen inside catcher |
124 IDPSK = PyroCatcher(RemotePLCObjectProxy.GetPLCID)() |
124 IDPSK = PyroCatcher(RemotePLCObjectProxy.GetPLCID)() |
125 if IDPSK is None: |
125 if IDPSK is None: |
126 confnodesroot.logger.write_error(_("Cannot get PLC ID - connection failed.\n")) |
126 confnodesroot.logger.write_warning(_("PLC did not provide identity and security infomation.\n")) |
127 return None |
127 else: |
|
128 ID,secret = IDPSK |
|
129 PSK.UpdateID(confnodesroot.ProjectPath, ID, secret, uri) |
128 |
130 |
129 ID,secret = IDPSK |
|
130 PSK.UpdateID(confnodesroot.ProjectPath, ID, secret, uri) |
|
131 |
131 |
132 _special_return_funcs = { |
132 _special_return_funcs = { |
133 "StartPLC": False, |
133 "StartPLC": False, |
134 "GetTraceVariables": (PlcStatus.Broken, None), |
134 "GetTraceVariables": (PlcStatus.Broken, None), |
135 "GetPLCstatus": (PlcStatus.Broken, None), |
135 "GetPLCstatus": (PlcStatus.Broken, None), |