diff --git a/webserver/openplc.db b/webserver/openplc.db index 994dd85..a0cc5b3 100644 Binary files a/webserver/openplc.db and b/webserver/openplc.db differ diff --git a/webserver/webserver.py b/webserver/webserver.py index a0cc3d3..d900016 100644 --- a/webserver/webserver.py +++ b/webserver/webserver.py @@ -139,7 +139,8 @@ def generate_mbconfig(): mbconfig += 'device' + str(device_counter) + '.RTU_Baud_Rate = "' + str(row[5]) + '"\n' mbconfig += 'device' + str(device_counter) + '.RTU_Parity = "' + str(row[6]) + '"\n' mbconfig += 'device' + str(device_counter) + '.RTU_Data_Bits = "' + str(row[7]) + '"\n' - mbconfig += 'device' + str(device_counter) + '.RTU_Stop_Bits = "' + str(row[8]) + '"\n\n' + mbconfig += 'device' + str(device_counter) + '.RTU_Stop_Bits = "' + str(row[8]) + '"\n' + mbconfig += 'device' + str(device_counter) + '.RTU_TX_Pause = "' + str(row[21]) + '"\n\n' mbconfig += 'device' + str(device_counter) + '.Discrete_Inputs_Start = "' + str(row[11]) + '"\n' mbconfig += 'device' + str(device_counter) + '.Discrete_Inputs_Size = "' + str(row[12]) + '"\n' @@ -1093,7 +1094,7 @@ def add_modbus_device():

Add new device


-
+

Edit slave device


-
+
' + return_str += 'aowsize.value = "' + str(row[20]) + '";' + return_str += 'devpause.value = "' + str(row[21]) + '";}' except Error as e: print("error connecting to the database" + str(e)) @@ -1318,6 +1321,7 @@ def modbus_edit_device(): devparity = flask.request.form.get('device_parity') devdata = flask.request.form.get('device_data') devstop = flask.request.form.get('device_stop') + devpause = flask.request.form.get('device_pause') di_start = flask.request.form.get('di_start') di_size = flask.request.form.get('di_size') @@ -1338,7 +1342,7 @@ def modbus_edit_device(): if (conn != None): try: cur = conn.cursor() - cur.execute("UPDATE Slave_dev SET dev_name = ?, dev_type = ?, slave_id = ?, com_port = ?, baud_rate = ?, parity = ?, data_bits = ?, stop_bits = ?, ip_address = ?, ip_port = ?, di_start = ?, di_size = ?, coil_start = ?, coil_size = ?, ir_start = ?, ir_size = ?, hr_read_start = ?, hr_read_size = ?, hr_write_start = ?, hr_write_size = ? WHERE dev_id = ?", (devname, devtype, devid, devcport, devbaud, devparity, devdata, devstop, devip, devport, di_start, di_size, do_start, do_size, ai_start, ai_size, aor_start, aor_size, aow_start, aow_size, int(devid_db))) + cur.execute("UPDATE Slave_dev SET dev_name = ?, dev_type = ?, slave_id = ?, com_port = ?, baud_rate = ?, parity = ?, data_bits = ?, stop_bits = ?, ip_address = ?, ip_port = ?, di_start = ?, di_size = ?, coil_start = ?, coil_size = ?, ir_start = ?, ir_size = ?, hr_read_start = ?, hr_read_size = ?, hr_write_start = ?, hr_write_size = ?, pause = ? WHERE dev_id = ?", (devname, devtype, devid, devcport, devbaud, devparity, devdata, devstop, devip, devport, di_start, di_size, do_start, do_size, ai_start, ai_size, aor_start, aor_size, aow_start, aow_size, devpause, int(devid_db))) conn.commit() cur.close() conn.close()