beremiz: comparison modbus/web

equal deleted inserted replaced

-:f71c22b2ca25
+:703ebf57508a
-def _SetSavedConfiguration(WebNode_id, newConfig):
+def _SetModbusSavedConfiguration(WebNode_id, newConfig):
 """ Stores a dictionary in a persistant file containing the Modbus parameter configuration """
 WebNode_entry = _WebNodeList[WebNode_id]
 if WebNode_entry["DefaultConfiguration"] == newConfig:
-_DelSavedConfiguration(WebNode_id)
+_DelModbusSavedConfiguration(WebNode_id)
-WebNode_entry["SavedConfiguration"] = None
+WebNode_entry["ModbusSavedConfiguration"] = None
 else:
 # Add the addr_type and node_type to the data that will be saved to file
 # This allows us to confirm the saved data contains the correct addr_type
 filename = WebNode_entry["filename"]
 with open(os.path.realpath(filename), 'w') as f:
 json.dump(save_info, f, sort_keys=True, indent=4)
-WebNode_entry["SavedConfiguration"] = newConfig
+WebNode_entry["ModbusSavedConfiguration"] = newConfig
-def _DelSavedConfiguration(WebNode_id):
+def _DelModbusSavedConfiguration(WebNode_id):
 """ Deletes the file cotaining the persistent Modbus configuration """
 filename = _WebNodeList[WebNode_id]["filename"]
 if os.path.exists(filename):
 os.remove(filename)
-def _GetSavedConfiguration(WebNode_id):
+def _GetModbusSavedConfiguration(WebNode_id):
 """
 Returns a dictionary containing the Modbus parameter configuration
 that was last saved to file. If no file exists, or file contains
 wrong addr_type (i.e. 'tcp', 'rtu' or 'ascii' -> does not match the
 addr_type of the WebNode_id), then return None
 return saved_config
-def _GetPLCConfiguration(WebNode_id):
+def _GetModbusPLCConfiguration(WebNode_id):
 """
 Returns a dictionary containing the current Modbus parameter configuration
 stored in the C variables in the loaded PLC (.so file)
 """
 current_config = {}
 return current_config
-def _SetPLCConfiguration(WebNode_id, newconfig):
+def _SetModbusPLCConfiguration(WebNode_id, newconfig):
 """
 Stores the Modbus parameter configuration into the
 the C variables in the loaded PLC (.so file)
 """
 C_node_id      = _WebNodeList[WebNode_id]["C_node_id"]
 SetParamFuncs[par_name](C_node_id, value)
-def _GetWebviewConfigurationValue(ctx, WebNode_id, argument):
+def _GetModbusWebviewConfigurationValue(ctx, WebNode_id, argument):
 """
 Callback function, called by the web interface (NevowServer.py)
 to fill in the default value of each parameter of the web form
 Note that the real callback function is a dynamically created function that
 except Exception:
 return ""
-def OnButtonSave(**kwargs):
+def OnModbusButtonSave(**kwargs):
 """
 Function called when user clicks 'Save' button in web interface
 The function will configure the Modbus plugin in the PLC with the values
 specified in the web interface. However, values must be validated first!
 Note that this function does not get called directly. The real callback
 function is the dynamic __OnButtonSave() function, which will add the
 "WebNode_id" argument, and call this function to do the work.
 """
-#PLCObject.LogMessage("Modbus web server extension::OnButtonSave()  Called")
+#PLCObject.LogMessage("Modbus web server extension::OnModbusButtonSave()  Called")
 newConfig    = {}
 WebNode_id   =  kwargs.get("WebNode_id", None)
 WebParamList = _WebNodeList[WebNode_id]["WebParamList"]
 #    return
 # store to file the new configuration so that
 # we can recoup the configuration the next time the PLC
 # has a cold start (i.e. when Beremiz_service.py is retarted)
-_SetSavedConfiguration(WebNode_id, newConfig)
+_SetModbusSavedConfiguration(WebNode_id, newConfig)
 # Configure PLC with the current Modbus parameters
-_SetPLCConfiguration(WebNode_id, newConfig)
+_SetModbusPLCConfiguration(WebNode_id, newConfig)
 # Update the viewable configuration
-# The PLC may have coerced the values on calling _SetPLCConfiguration()
+# The PLC may have coerced the values on calling _SetModbusPLCConfiguration()
 # so we do not set it directly to newConfig
-_WebNodeList[WebNode_id]["WebviewConfiguration"] = _GetPLCConfiguration(WebNode_id)
+_WebNodeList[WebNode_id]["WebviewConfiguration"] = _GetModbusPLCConfiguration(WebNode_id)
-def OnButtonReset(**kwargs):
+def OnModbusButtonReset(**kwargs):
 """
 Function called when user clicks 'Delete' button in web interface
 The function will delete the file containing the persistent
 Modbus configution
 """
 WebNode_id = kwargs.get("WebNode_id", None)
 # Delete the file
-_DelSavedConfiguration(WebNode_id)
+_DelModbusSavedConfiguration(WebNode_id)
 # Set the current configuration to the default (hardcoded in C)
 new_config = _WebNodeList[WebNode_id]["DefaultConfiguration"]
-_SetPLCConfiguration(WebNode_id, new_config)
+_SetModbusPLCConfiguration(WebNode_id, new_config)
 #Update the webviewconfiguration
 _WebNodeList[WebNode_id]["WebviewConfiguration"] = new_config
-# Reset SavedConfiguration
+# Reset ModbusSavedConfiguration
-_WebNodeList[WebNode_id]["SavedConfiguration"] = None
+_WebNodeList[WebNode_id]["ModbusSavedConfiguration"] = None
 WebNode_entry["WebviewConfiguration"] = None
 # Upon PLC load, this Dictionary is initialised with the Modbus configuration
 # hardcoded in the C file
 # (i.e. the configuration inserted in Beremiz IDE when project was compiled)
-WebNode_entry["DefaultConfiguration"] = _GetPLCConfiguration(WebNode_id)
+WebNode_entry["DefaultConfiguration"] = _GetModbusPLCConfiguration(WebNode_id)
 WebNode_entry["WebviewConfiguration"] = WebNode_entry["DefaultConfiguration"]
 # Dictionary that stores the Modbus configuration currently stored in a file
 # Currently only used to decide whether or not to show the "Delete" button on the
-# web interface (only shown if "SavedConfiguration" is not None)
+# web interface (only shown if "ModbusSavedConfiguration" is not None)
-SavedConfig = _GetSavedConfiguration(WebNode_id)
+SavedConfig = _GetModbusSavedConfiguration(WebNode_id)
-WebNode_entry["SavedConfiguration"] = SavedConfig
+WebNode_entry["ModbusSavedConfiguration"] = SavedConfig
 if SavedConfig is not None:
-_SetPLCConfiguration(WebNode_id, SavedConfig)
+_SetModbusPLCConfiguration(WebNode_id, SavedConfig)
 WebNode_entry["WebviewConfiguration"] = SavedConfig
 # Define the format for the web form used to show/change the current parameters
 # We first declare a dynamic function to work as callback to obtain the default values for each parameter
 # Note: We transform every parameter into a string
 #       However, the annotate.Choice parameters (and all parameters that derive from it,
 #           sucn as Parity, Baud, etc.) require the default value as a string
 #           even though we store it as an integer, which is the data type expected
 #           by the set_***() C functions in mb_runtime.c
 def __GetWebviewConfigurationValue(ctx, argument):
-return str(_GetWebviewConfigurationValue(ctx, WebNode_id, argument))
+return str(_GetModbusWebviewConfigurationValue(ctx, WebNode_id, argument))
 webFormInterface = [(name, web_dtype (label=web_label, default=__GetWebviewConfigurationValue))
 for name, web_label, c_dtype, web_dtype in WebNode_entry["WebParamList"]]
 # Configure the web interface to include the Modbus config parameters
 def __OnButtonSave(**kwargs):
-OnButtonSave(WebNode_id=WebNode_id, **kwargs)
+OnModbusButtonSave(WebNode_id=WebNode_id, **kwargs)
 WebSettings = NS.newExtensionSetting("Modbus #"+ str(WebNode_id), config_hash)
 WebSettings.addSettings(
 "ModbusConfigParm"          + config_hash,     # name (internal, may not contain spaces, ...)
 webFormInterface,                              # fields
 _("Apply"), # button label
 __OnButtonSave)                                # callback
 def __OnButtonReset(**kwargs):
-return OnButtonReset(WebNode_id = WebNode_id, **kwargs)
+return OnModbusButtonReset(WebNode_id = WebNode_id, **kwargs)
-def getConfigStatus():
+def getModbusConfigStatus():
 if WebNode_entry["WebviewConfiguration"] == WebNode_entry["DefaultConfiguration"]:
 return "Unchanged"
 return "Modified"
 WebSettings.addSettings(
 "ModbusConfigDelSaved"      + config_hash,  # name (internal, may not contain spaces, ...)
 _("Modbus Configuration: ") + config_name,  # description (user visible label)
 [ ("status",
 annotate.String(label=_("Current state"),
 immutable=True,
-default=lambda *k:getConfigStatus())),
+default=lambda *k:getModbusConfigStatus())),
 ],                                       # fields  (empty, no parameters required!)
 _("Reset"), # button label
 __OnButtonReset)

changeset 2686	703ebf57508a
parent 2676	b276d05bdb09
child 2690	4de6a587f7f9
child 2993	b76f303ffce6