Mirrors_Framework/OpenPLC_v3
1
0
Fork 0
mirror of https://github.com/thiagoralves/OpenPLC_v3.git synced 2026-08-18 11:41:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
185 Commits 7 Branches 0 Tags
b021107e02df5d445fb752dd8eca030802471afe
Commit Graph
185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Kordmaa b021107e02 ethercat_src added to fixes 2022-11-12 18:04:17 +02:00
Rainer Kordmaa 85ed4f0b41 ethercat_callcyclic 2022-11-12 17:38:42 +02:00
Rainer Kordmaa edb5516d9b ethercat install and ldconfig 2022-11-12 15:41:41 +02:00
Rainer Kordmaa a507590130 include ethercat erc 2022-11-12 15:29:15 +02:00
Rainer Kordmaa ebc8ca9a8b added hook for ethercat configure 2022-11-11 21:25:16 +02:00
Rainer Kordmaa 75be134d34 Checks and initializes default database if needed 2022-11-11 19:57:07 +02:00
Rainer Kordmaa a705a8a678 ignore CMakeFiles 2022-11-11 18:16:34 +02:00
Thiago Alves f8fa47f680 Merge pull request #184 from r2k-in-the-vortex/fixes 
inconsistent whitespace fixed
 2022-11-11 09:04:43 -05:00
Rainer b159874579 more inconsistent whitespace 2022-11-11 09:40:42 +02:00
Rainer d335c8735b inconsistent indetation fixed 2022-11-11 09:33:41 +02:00
Thiago Alves 0503195dc1 Merge pull request #181 from lhartmann/long_long_sleep 
Long long sleep: Fix for task period above 1 second
 2022-11-02 18:06:01 -04:00
Thiago Alves 99a0de0405 Merge pull request #182 from Jeffmackinnon/patch-1 
Update README.md
 2022-10-21 14:05:16 -04:00
Jeff 80c17aaef9 Update README.md 
Updated the programming editor link to the documentation page. Removed HMI reference to SCADABR
 2022-10-21 14:27:20 -03:00
Thiago Alves fb839cce2b For now, use pymodbus 2.5.3. 
The new pymodbus version broke PSM
 2022-10-18 17:27:51 -04:00
Lucas Hartmann 0675f84701 Merge branch 'thiagoralves:master' into long_long_sleep 2022-10-13 14:43:56 -03:00
Thiago Alves 7ade9ad393 Fedora fix 2022-09-28 16:30:08 -04:00
Thiago Alves c54d10a208 Added support for Fedora 2022-09-28 16:06:05 -04: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
Lucas Hartmann 16d77d2740 Fix for long delays (over 1<<32 nsec). 2021-09-12 01:40:40 -03:00
Lucas Hartmann a7ba2d3faf Fixed long sleep, over 1s. 2021-09-11 23:07:02 -03: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