Mirrors_Framework/OpenPLC_v3
1
0
Fork 0
mirror of https://github.com/thiagoralves/OpenPLC_v3.git synced 2026-09-25 17:14:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes broken slave device

Browse Source
This commit is contained in:
Erik Lagerwall
2021-10-23 15:22:29 +02:00
parent c581a8d159
commit b0a4c23755
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webserver/openplc.db
BIN
View File
Binary file not shown.
webserver/webserver.py
+10 -6
View File
@@ -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():
<br>
<h2>Add new device</h2>
<br>
<div style="float:left; width:45%; height:730px">
<div style="float:left; width:45%; height:780px">
<form id = "uploadForm"
enctype = "multipart/form-data"
action = "add-modbus-device"
@@ -1145,6 +1146,7 @@ def add_modbus_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')
@@ -1165,7 +1167,7 @@ def add_modbus_device():
if (conn != None):
try:
cur = conn.cursor()
cur.execute("INSERT INTO Slave_dev (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) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (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))
cur.execute("INSERT INTO Slave_dev (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) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (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))
conn.commit()
cur.close()
conn.close()
@@ -1212,7 +1214,7 @@ def modbus_edit_device():
<br>
<h2>Edit slave device</h2>
<br>
<div style="float:left; width:45%; height:730px">
<div style="float:left; width:45%; height:780px">
<form id = "uploadForm"
enctype = "multipart/form-data"
action = "modbus-edit-device"
@@ -1296,7 +1298,8 @@ def modbus_edit_device():
return_str += 'aorstart.value = "' + str(row[17]) + '";'
return_str += 'aorsize.value = "' + str(row[18]) + '";'
return_str += 'aowstart.value = "' + str(row[19]) + '";'
return_str += 'aowsize.value = "' + str(row[20]) + '";}</script></html>'
return_str += 'aowsize.value = "' + str(row[20]) + '";'
return_str += 'devpause.value = "' + str(row[21]) + '";}</script></html>'
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()