--- a/Beremiz_service.py Tue Mar 22 14:50:46 2022 +0100
+++ b/Beremiz_service.py Tue Mar 22 14:51:30 2022 +0100
@@ -544,14 +544,12 @@
try:
website = NS.RegisterWebsite(interface, webport)
pyruntimevars["website"] = website
- NS.SetServer(pyroserver)
statuschange.append(NS.website_statuslistener_factory(website))
except Exception:
LogMessageAndException(_("Nevow Web service failed. "))
if havewamp:
try:
- WC.SetServer(pyroserver)
WC.RegisterWampClient(wampconf, PSKpath)
WC.RegisterWebSettings(NS)
except Exception:
--- a/IDEFrame.py Tue Mar 22 14:50:46 2022 +0100
+++ b/IDEFrame.py Tue Mar 22 14:51:30 2022 +0100
@@ -1992,7 +1992,7 @@
self.Bind(wx.EVT_MENU, self.GenerateChangePouTypeFunction(name, "functionBlock"), new_item)
new_item = AppendMenu(change_menu, help='', kind=wx.ITEM_NORMAL, text=_("Program"))
self.Bind(wx.EVT_MENU, self.GenerateChangePouTypeFunction(name, "program"), new_item)
- menu.AppendMenu(wx.NewId(), _("Duplicate as..."), change_menu)
+ menu.AppendMenu(wx.ID_ANY, _("Duplicate as..."), change_menu)
new_item = AppendMenu(menu, help='', kind=wx.ITEM_NORMAL, text=_("Rename"))
self.Bind(wx.EVT_MENU, self.OnRenamePouMenu, new_item)
--- a/runtime/NevowServer.py Tue Mar 22 14:50:46 2022 +0100
+++ b/runtime/NevowServer.py Tue Mar 22 14:51:30 2022 +0100
@@ -49,7 +49,6 @@
'''
WorkingDir = None
-_PySrv = None
class PLCHMI(athena.LiveElement):
@@ -417,6 +416,3 @@
return statuslistener(site).listen
-def SetServer(pysrv):
- global _PySrv
- _PySrv = pysrv
--- a/runtime/WampClient.py Tue Mar 22 14:50:46 2022 +0100
+++ b/runtime/WampClient.py Tue Mar 22 14:51:30 2022 +0100
@@ -45,7 +45,6 @@
_transportFactory = None
_WampSession = None
-_PySrv = None
WorkingDir = None
# Find pre-existing project WAMP config file
@@ -369,11 +368,6 @@
return "Disconnected"
-def SetServer(pysrv):
- global _PySrv
- _PySrv = pysrv
-
-
def PublishEvent(eventID, value):
if getWampStatus() == "Attached":
_WampSession.publish(text(eventID), value)
--- a/targets/plc_debug.c Tue Mar 22 14:50:46 2022 +0100
+++ b/targets/plc_debug.c Tue Mar 22 14:51:30 2022 +0100
@@ -337,8 +337,6 @@
UnpackVar(dsc, &value_p, NULL, &size);
- printf("Retaining %%d %%ld \n", retain_list_collect_cursor, size);
-
/* if buffer not full */
Retain(retain_offset, size, value_p);
/* increment cursor according size*/