From b0a4c23755c1d247cb3c05dca380dbe728758726 Mon Sep 17 00:00:00 2001
From: Erik Lagerwall <erik_lagerwall@hotmail.com>
Date: Sat, 23 Oct 2021 15:22:29 +0200
Subject: [PATCH] Fixes broken slave device

---
 webserver/openplc.db   | Bin 40960 -> 53248 bytes
 webserver/webserver.py |  16 ++++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/webserver/openplc.db b/webserver/openplc.db
index 994dd85fce41ee7f4e184f34cb0247e3b088dc7c..a0cc5b383c5941c2638070908348a41ec08c55ed 100644
GIT binary patch
delta 1364
zcmeHHPiWIn7=LN8_N7T)r;|)Y8UmFKH)|)jQ^6`hid`!;gY^_s6EV`-n55H+Vimj;
z53RWlrZ?wJf;)?zJqqq3dK%um2s`>EYq!kc#fujSAL09bzwgg`-;dXO7wf%<4~|c4
zBZOEm8Y~W$9?qW4ZllxHhb);#7;hl%D;Fc5*g0mMtm5x@gBZBre{UXtJ8%Pkh<)aB
zIjUcG)J9Xc?=%~Vqqj^YaFu)nNL{Q+MOhN$;)Sv#h>^G`Ow(A@^cBU>L|m%K(j}?p
z4!Og00Nz$xy68URrm}(SbWL5vva~D<l`7a$xjYN$c2ix^{Q~a!)Z`=adb_2VZOhqV
z`h<qs(G*K{AbHfnM@`i-obDb=Qyo=l7>>P<Wjk#%iW;V(YMQ0nK=$YH>j4IBdFUHz
zq8W<qs4$E_8=Mqe<35}TJO(B;nxSxN1dIu^Xjq{zbO3i8B;rj=v2;}nF}OW!OiTOF
zT{x&7;sv=Qa7-+~eRS-7H*}>|S}fM;!eyyGJ>HQ}T#~D$3aoWes>n0+49KRtlye_2
zQ>P-^Rpuj*FSBzy{9}>eNI-ecy~mt9lD``46~w_jEwBgqOor;0+%K4)`%P85y#Hzn
zE%~3SY2h!`<gGLP82*SBc%G-8bX<lzaVWti;H5$+pGxpjhC+D)@;F1W-YU73rZ*A!
zNw&x)dGAdKZ;6;qMr4JUL_Cw+Rf)HiJ9;f0ltd^7e+-uN(t{s_V%?W(lb#^FCc{DT
Nc`xa{T4Vp<{sI)rm>2*6

delta 660
zcmZXS&1=*^7{({Nh&$6HZwf*xQWK$wh1FX93t9<MSXQiA^_H161CFk2oJ?2hrKKQ3
zPc8A-L$5vO>cOKIZ!7d9dg|4K(yKFTvyB)S$oss%ndh00?Zf8wr^eou*;9lN(WCn8
z{r2796y2Kp?7$s_@ff+^-3EMhZrVq1fXBe>QF+aKjH7n}x#$Ohwd*L>AMi&5HsVRj
zN7J9yz4d4%j>33lwG)MOs?+cW!BmrpNQ=yAL)h!CJ?us8Gqrf{UR^M4wV82><LGG|
zb|2``>vRm0Pn<+bi+yrwi#{8^O0uC;e@O%M*+!a3ru5{sZXDf@){UAmDb(gUl`_SW
zzEJr;RIY~E|EkCmmZp;D8a8>%dRo)AzV@w|q$0@`(_u_Dy-8h)w|r9BI;j}c+B0WD
z1rRD^t*sq&Sv7$^mx<&otr70IR$-oz-sp|;8n;jr4Oj)9o+?>fwu_f=+al$Wz1zSa
z(30=_*3L#@yYqzhaxQZkF3)J@dhrbtjNuDvnI}^ozzeT+jNmt%z;QWy_z~t8o6RRy
m{(7K8^ySdG&<w2U-9ve@beVdS7v~`azu*UqVO)B9Kj9B=M9nS$

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():
                         <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()