Commit Graph

123 Commits

Author SHA1 Message Date
Andy Whittaker e8223db854
Merge pull request #1 from thiagoralves/master
Sync with master
2020-09-30 11:40:43 +01:00
Thiago Alves eca999ad8d
Merge pull request #135 from yukia10/ftrig
Fix for F_TRIG
2020-08-07 17:18:47 -07:00
Yuki Atoh 8f3351d4e0 Fix for F_TRIG 2020-08-08 07:26:18 +09:00
Thiago Alves 6a183dc78e
Fix systems that removed python2 symlink 2020-07-29 13:53:26 -07:00
Thiago Alves 7a9051fba3
Fix systems that removed python2 symlink 2020-07-29 13:52:55 -07:00
Thiago Alves ad9a70f432
Fix for Ubuntu 20.04 2020-06-05 15:21:52 -04:00
Thiago Alves 85a6504668
Fix monitoring update error 2020-03-06 10:27:22 -05:00
Thiago Alves f7e9b79fea
Fix monitoring issues
- Improved located variables parsing to avoid parsing commented lines in code
 - Fixed server 502 error when modbus service is not running or running on a port different than 502
2020-03-06 09:52:08 -05:00
Thiago Alves 2d535b8dca
Merge pull request #125 from LeeBrown/master
Provide UTC clock and optimize tzset()
2020-01-05 14:57:24 -05:00
rladmin 309f5daf8c tzset() only needs to be called once at program invokation, not every cycle
UTC clock stored in ML1027
2020-01-04 11:27:16 -08:00
Thiago Alves 3e59bbf74a
Add include for "enipStruct.h" 2019-12-02 09:23:54 -05:00
Thiago Alves 1694d3a5a8
Remove enipStruct.h include from ladder.h 2019-12-02 09:23:10 -05:00
Thiago Alves b7906f86e6
Added ability to update program st file 2019-11-20 15:24:49 -05:00
Thiago Alves 0b2507e14a
Fix "sudo: command not found" error on installation 2019-11-05 08:54:45 -05:00
Thiago Alves 485d1d7f1a
Implementation of PCCC protocol over EtherNet/IP 2019-09-16 04:45:20 -07:00
Thiago Alves deb05e5cd6
Included EtherNet/IP documentation 2019-09-16 04:39:39 -07:00
Thiago Alves 74347b9795
Create readme.md 2019-09-16 08:38:21 -03:00
Thiago Alves 216acca724
Improved point-info responsiveness 2019-09-05 11:57:04 -03:00
Thiago Alves 4146e1b12b
Added force variables page
Fixed a bug on monitoring.py when digital variables are incomplete (eg %QX0 instead of %QX0.0)
2019-09-05 07:08:25 -07:00
Thiago Alves a2d340baee
make it consistent with Beremiz plc_main.c 2019-09-02 10:34:11 -03:00
Thiago Alves 820112410b
Fix internal server error on monitoring 2019-09-02 08:37:09 -03:00
Thiago Alves f6b8de465d
Monitoring update: Added support for %MD and %ML 2019-08-29 12:04:04 -07:00
Thiago Alves 8cd28fcd23
Fix bug on monitoring page update 2019-08-23 15:59:17 -03:00
Thiago Alves ffe392752a
sudo -H (fix errors with root) 2019-08-20 10:05:55 -03:00
Thiago Alves f585f4643e
Make sure the Runtime is using Python 2.7 2019-08-20 09:40:06 -03:00
Thiago Alves b41569a5e6
Fixed slave devices analog input offset 2019-07-25 06:50:18 -05:00
Thiago Alves 474b60b961
Disabled st_optimizer until I get it fixed 2019-06-27 08:15:45 -05:00
thiagoralves eaf5112286 Initial Persistent Storage support + minor bug fixes 2019-06-21 07:02:01 -05:00
Thiago Alves 3ad96c294c
Get latest version of pip packages 2019-06-18 11:46:54 -05:00
Thiago Alves 42b9fb5d10
Added pymodbus 2019-06-17 12:39:42 -05:00
Thiago Alves 159ba763a9
Added pymodbus 2019-06-17 12:37:39 -05:00
thiagoralves 92c8fede60 Initial monitoring support 2019-06-17 12:32:07 -05:00
thiagoralves 6ac8d4f76b Minor fix on server.cpp 2019-06-17 12:13:33 -05:00
thiagoralves a95ce61356 Initial EtherNet/IP support 2019-06-17 11:59:48 -05:00
Thiago Alves 0d0e2f0715
Don't remove git or wget 2019-06-11 10:29:17 -05:00
Thiago Alves 11b6532fd6
Update apt-cyg database
This is an attempt to fix OpenPLC installation on some windows hosts. Apparently apt-cyg incorrectly assumes some packages to be installed when in fact they are not. These lines will force all packages to be reinstalled
2019-06-11 08:16:02 -05:00
Thiago Alves bc7097e510
Merge pull request #63 from justason/master
Add resource finalizing routines.
2019-06-08 22:00:36 -05:00
Pavel Kopylov 279a1679c3 Add resources finalizing routines/blanks 2019-06-07 08:20:21 +00:00
thiagoralves f30058ac02 added +x to background installer 2019-06-06 09:52:19 -05:00
Thiago Alves 1300209f71
Added installer log support 2019-06-06 09:06:15 -05:00
Thiago Alves 266a4f5e46
Fix error caused by glue generator on some platforms 2019-05-09 09:12:19 -05:00
Thiago Alves 8731dcbe00
Merge pull request #49 from iPAS/fix_defunct
To prevent the native /webserver/core/openplc getting defunct
2019-04-25 08:55:35 -07:00
Thiago Alves ff8012068a
Merge branch 'master' into fix_defunct 2019-04-25 08:55:26 -07:00
Thiago Alves 14b6ad3928
Merge pull request #44 from smartergridsolutions/feature/PR-665
Add tests for glue generator as preliminary for for adding support for DNP3
2019-04-15 11:04:43 -05:00
Garret Fick 9185e9502b PR-665 Add tests for glue generator as preliminary for for adding support for DNP3 2019-04-10 12:12:57 -04:00
Thiago Alves 4ccc085376
Merge pull request #37 from garretfick/feature/GIT_CONFIG_FOR_WINDOWS_DEV
Make checking out the code from Windows work by default
2019-03-29 18:29:30 -04:00
Garret Fick e6206ddd3d Make checking out the code from Windows work by default 2019-03-29 11:46:47 -04:00
Thiago Alves 9caa392268
Merge pull request #34 from shrmrf/master
GITHUB_TOKEN not defined on main repo
2019-02-07 19:34:08 -02:00
T 85a820efb0 GITHUB_TOKEN not defined on main repo 2019-02-07 22:26:14 +01:00
Thiago Alves 57b30f2078
Merge pull request #32 from shrmrf/appveyor-final
Appveyor final
2019-02-07 19:05:45 -02:00