beremiz: comparison modbus/web

equal deleted inserted replaced

-:76e8ec46828a
+:745b64e7c695
 #                                                                       annotate.Integer, ...)
 ("device"           , _("Serial Port")           , ctypes.c_char_p,    MB_StrippedString),
 ("baud"             , _("Baud Rate")             , ctypes.c_int,       MB_Baud         ),
 ("parity"           , _("Parity")                , ctypes.c_int,       MB_Parity       ),
 ("stop_bits"        , _("Stop Bits")             , ctypes.c_int,       MB_StopBits     ),
-("slave_id"         , _("Slave ID")              , ctypes.c_ulonglong, annotate.Integer)
+("slave_id"         , _("Slave ID")              , ctypes.c_ubyte,     annotate.Integer)
 ]
 # 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
 # when loading from file
 save_info = {}
-save_info["addr_type"] = ["addr_type"]
+save_info["addr_type"] = WebNode_entry["addr_type"]
 save_info["node_type"] = WebNode_entry["node_type"]
 save_info["config"   ] = newConfig
 filename = WebNode_entry["filename"]
 addr_type of the WebNode_id), then return None
 """
 filename = _WebNodeList[WebNode_id]["filename"]
 try:
 #if os.path.isfile(filename):
-save_info = json.load(open(filename))
+save_info = json.load(open(os.path.realpath(filename)))
 except Exception:
 return None
 if save_info["addr_type"] != _WebNodeList[WebNode_id]["addr_type"]:
 return None
 __OnButtonReset)
-def _runtime_modbus_websettings_%(location_str)s_init():
+def _runtime_%(location_str)s_modbus_websettings_init():
 """
 Callback function, called (by PLCObject.py) when a new PLC program
 (i.e. XXX.so file) is transfered to the PLC runtime
 and loaded into memory
 """
-def _runtime_modbus_websettings_%(location_str)s_cleanup():
+def _runtime_%(location_str)s_modbus_websettings_cleanup():
 """
 Callback function, called (by PLCObject.py) when a PLC program is unloaded from memory
 """
 #PLCObject.LogMessage("Modbus web server extension::OnUnLoadPLC() Called...")

changeset 2719	745b64e7c695
parent 2703	32ffdb32b14e
child 3163	7cf38cd0d820