Commit Graph

94 Commits

Author SHA1 Message Date
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
T 57789ab3e8 test appveyor 2019-02-07 19:29:52 +01:00
T 5f45a0496f
Update README.md 2019-02-06 23:27:25 +01:00
T 9b52ca5ff4
Appveyor (#3)
This is just a placeholder
2019-02-06 23:24:32 +01:00
T bb926300dd fix directory 2019-02-06 20:41:26 +01:00
T 0f2fea33eb forgot to install doxygen 2019-02-06 20:27:34 +01:00
T 70487305fe test out gh-pages 2019-02-06 20:22:02 +01:00
Thiago Alves 88a1f9cbc9
Merge pull request #29 from shrmrf/patch-1
Add travis build badge
2019-02-06 16:47:03 -02:00
T f0b6453081
Add travis build badge 2019-02-06 19:37:26 +01:00
Thiago Alves 305eebdc60
Merge pull request #27 from pedromorgan/pedro_fixes
add gitlab.ci and doxygen
2019-02-06 15:10:31 -02:00
pedromorgan 5e86ba241d add gitlab.ci and doxygen 2019-02-06 17:01:59 +00:00
Thiago Alves 022215470d
Merge pull request #26 from shrmrf/master
Add Travis CI build
2019-02-06 14:04:04 -02:00
T faaa9e6a05
Update .travis.yml 2019-02-06 09:23:27 +01:00
T 5673695fb6
Update .travis.yml 2019-02-06 09:04:27 +01:00
T bc517610ea
Update .travis.yml 2019-02-06 09:01:18 +01:00
T 1fa0d07cf2
Create .travis.yml 2019-02-06 08:57:34 +01:00
Thiago Alves dff87e18ac
Merge pull request #24 from shrmrf/fix-install-script
Fix install script
2019-02-01 18:05:29 -02:00
T c010812cb2 Accidentally deleted disabling of UNIPI services 2019-02-01 21:01:27 +01:00
T 6c95631fee forgot -y and pushed 2019-02-01 19:36:28 +01:00
T c620a12c5f add missing rpi specific package 2019-02-01 19:35:28 +01:00
T 819c96c321 Simplify install.sh script
requirements.txt also simplified
2019-02-01 19:17:33 +01:00
T ca382c0f8a move installation into install.sh 2019-02-01 19:17:16 +01:00
Thiago Alves d33e9b1970
Merge pull request #23 from shrmrf/shrmrf-pip-requirements
use requirements.txt to fix python package versions
2019-02-01 13:45:03 -02:00
T e522282179 use requirements.txt to fix python package versions
Resolve issue with `docker run` not having correct privilege
Closes thiagoralves/OpenPLC_v3#22
2019-02-01 16:26:49 +01:00
Thiago Alves 8099f5a7ce
Merge pull request #21 from shrmrf/dockerify
Dockerify
2019-01-31 20:53:50 -02:00
T ae7028b6f6 update README with Docker instructions 2019-01-31 23:46:19 +01:00
T 6a95336a9d Tested with Dockerfile 2019-01-31 23:38:16 +01:00
T cf5feaea8a add Dockerfile 2019-01-31 17:04:29 +01:00
Thiago Alves 0c87c66c92
dnp3 offsets starting on zero 2019-01-14 03:46:33 -06:00
Thiago Alves 19bafca0ba
Fixed not reading last input register 2019-01-07 12:31:19 -06:00