Thiago Alves
cc7a6da844
Merge pull request #199 from dcoutinho1328/dev-python3
...
Dev python3
2023-03-01 13:52:52 -05:00
Daniel
80af7314bc
formatting code
2023-03-01 15:12:37 -03:00
Daniel
76ff3a4f4f
formatting code
2023-03-01 15:03:33 -03:00
Daniel Coutinho
6e4979240e
features: settings page and modbus devices
2023-03-01 14:58:27 -03:00
Thiago Alves
7464ac0868
Merge pull request #185 from dcoutinho1328/dev-python3
...
Dev python3
2022-11-17 09:51:55 -05:00
Daniel Coutinho
8dc6df6966
smallfixes: ui fixes and login redirects
2022-11-17 11:51:12 -03:00
Daniel Coutinho
1ae28b5423
flask login implemented
2022-11-15 15:07:42 -03:00
Thiago Alves
9eae3afb29
Merge pull request #183 from dcoutinho1328/dev-python3
...
feat: user and login implemented + fix: codemirror styling
2022-11-02 17:22:46 -04:00
Daniel Coutinho
2c2fb96863
feat: user and login implemented + fix: codemirror styling
2022-11-02 18:22:11 -03:00
Thiago Alves
8185a8b5dc
Merge pull request #179 from dcoutinho1328/dev-python3
...
Error panel + fixes
2022-09-16 12:43:05 -04:00
Daniel Coutinho
5f95bcfea3
Error panel + fixes
2022-09-16 13:41:50 -03:00
Thiago Alves
f4b59c1180
Merge pull request #176 from dcoutinho1328/dev-python3
...
Dev python3
2022-08-19 12:17:34 -04:00
Daniel Coutinho
c75ed1f858
first commit
2022-08-19 13:15:26 -03:00
daniel
796416a59e
Initial static implementation to new webserver
2022-08-16 17:25:47 -03:00
Thiago Alves
da2c9674b6
Update windows installer
2022-05-25 08:49:55 -04:00
Thiago Alves
e6c38a4367
Merge pull request #171 from koztkozt/patch-2
...
Fix "floating point exception" error
2022-03-22 11:35:14 -04:00
Thiago Alves
d8853e0e6b
Merge pull request #165 from koztkozt/patch-1
...
Parse ST file upon webserver start up
2022-03-22 11:33:53 -04:00
kozt
950ce6b0bb
Fix "floating point exception" error
...
Fix "floating point exception" error due to rtu_baud = 0 or null for Modbus TCP device
2022-03-20 00:13:36 +08:00
kozt
d1d133cb25
Parse ST file upon webserver starts up
...
When OpenPLC starts in RUN mode, monitoring page shows blank when webserver (./start_openplc.sh) is restarted. To fix the issue, ST file should be parsed when openplc_runtime starts.
2022-01-08 18:03:26 +08:00
Thiago Alves
4b22bf78ee
Fix race condition on persistent storage
...
Drivers that takes a longer time to initialize would end up making the runtime call startPstorage() before readPersistentStorage(), which is incorrect. This fix ensures that those functions are called in the right order.
2021-12-13 14:45:15 -05:00
Thiago Alves
9fb92166fc
Merge pull request #163 from joakimr-axis/joakimr-axis_dockerfilesimplify
...
Dockerfile: simplify by reordering WORKDIR line
2021-12-10 11:47:54 -05:00
Joakim Roubert
69c89b8075
Dockerfile: simplify by reordering WORKDIR line
...
Moving WORKDIR before the ./install.sh command, there is no need for the
cd command.
Change-Id: Ia4a43f18ae21d14b78e8eb22a48f3e31984c797c
Signed-off-by: Joakim Roubert <joakimr@axis.com >
2021-12-10 09:56:58 +01:00
Thiago Alves
c776ec6822
Merge pull request #164 from joakimr-axis/joakimr-axis_dockerdebianversion
...
Dockerfile: Use specific base image tag
2021-12-02 13:00:57 -05:00
Joakim Roubert
7871d4bb19
Dockerfile: Use specific base image tag
...
In accordance with container security best practices, specify the base
image tag.
Change-Id: I4dadd77a830ee76d69096ae32869d3b375c6aebe
Signed-off-by: Joakim Roubert <joakimr@axis.com >
2021-12-02 10:07:55 +01:00
Thiago Alves
24743b1e31
Merge pull request #160 from eriklagerwall/master
...
Fixed broken slave device
2021-10-23 13:48:17 -04:00
Erik Lagerwall
3558955a70
Fixes broken slave device
2021-10-23 15:39:15 +02:00
Erik Lagerwall
b0a4c23755
Fixes broken slave device
2021-10-23 15:22:29 +02:00
Thiago Alves
c581a8d159
Merge pull request #157 from eriklagerwall/Tx_pause
...
Tx pause
2021-10-22 10:32:46 -04:00
Thiago Alves
ac27231542
Merge branch 'master' into Tx_pause
2021-10-22 10:32:35 -04:00
Thiago Alves
189135288e
Merge pull request #156 from eriklagerwall/master
...
Connection status issues resolved
2021-10-22 10:25:28 -04:00
eriklagerwall
c96c397c72
Merge branch 'thiagoralves:master' into Tx_pause
2021-10-18 20:44:34 +02:00
Erik Lagerwall
842ec53779
Webserver merged with cloned from github
2021-10-18 20:20:58 +02:00
eriklagerwall
380d9037db
Merge branch 'thiagoralves:master' into master
2021-10-18 19:17:11 +02:00
Thiago Alves
ef1d4a9974
Merge pull request #155 from greenslumber/glueGenFix
...
Provided bounds checking on ParseIecVars to prevent vulnerability
2021-10-18 12:21:10 -04:00
Erik Lagerwall
f932c157cd
Revert "Added Transmission pause for RTU devices"
...
This reverts commit 34f2a2dafe
2021-10-17 23:13:39 +02:00
Erik Lagerwall
34f2a2dafe
Added Transmission pause for RTU devices
2021-10-17 22:58:29 +02:00
Erik Lagerwall
b829e615dd
Fixes connection status issues
2021-10-17 20:26:55 +02:00
Erik Lagerwall
41d30b327a
Fixes connection status issues
2021-10-17 20:04:36 +02:00
Lorne Giles
c2e5ec464a
Provided bounds checking on ParseIecVars to prevent vulnerability
2021-10-15 19:06:23 +01:00
Thiago Alves
b6f1e2ab35
Fix missing python3-pip dependency
2021-10-04 12:33:52 -04:00
Thiago Alves
eb3e22d810
Merge pull request #152 from vembacher/master
...
Improve input sanitation by escaping possible HTML characters in order to prevent the embedding of custom JavasScript
2021-08-23 10:31:30 -04:00
Victor Embacher
9fdb863f18
clarified wording
2021-08-23 14:55:44 +02:00
Victor Embacher
f61bfa7d5e
Improve input sanitation by escaping possible HTML characters
2021-08-23 14:33:00 +02:00
Thiago Alves
f662bf36cd
Fix issue with multiple RTU connected to same port
2021-06-18 11:23:47 -04:00
Thiago Alves
185da1176a
Fix windows installer [pip and python]
2021-04-19 14:34:52 -04:00
Thiago Alves
a115c389e4
Install required packages for PSM
2021-04-16 23:30:34 -04:00
Thiago Alves
de88b568af
Change hardware layer - PSM
2021-04-16 19:06:45 -04:00
Thiago Alves
9bff47176c
PSM hardware layer
2021-04-16 19:00:29 -04:00
Thiago Alves
2275c4c156
PSM Python code
2021-04-16 18:59:44 -04:00
Thiago Alves
cb8c7e9023
PSM code first commit
2021-04-16 18:59:06 -04:00
