AndyWhittaker
/
OpenPLC_v3
mirror of https://github.com/AndyWhittaker/OpenPLC_v3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from thiagoralves/master 

Sync with master
This commit is contained in:
Andy Whittaker 2020-09-30 11:40:43 +01:00 committed by GitHub
parent 85a6504668 eca999ad8d
commit e8223db854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
background_installer.sh
View File

@ -23,15 +23,17 @@ fi
function linux_install_deps { function linux_install_deps {
$1 apt-get update $1 apt-get update
$1 apt-get install -y build-essential pkg-config bison flex autoconf \ $1 apt-get install -y build-essential pkg-config bison flex autoconf \
automake libtool make git python2.7 python-pip \ automake libtool make git python2.7 \
sqlite3 cmake git sqlite3 cmake git curl
curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
$1 python2.7 get-pip.py
} }
function install_py_deps { function install_py_deps {
$1 pip install flask $1 pip2 install flask
$1 pip install flask-login $1 pip2 install flask-login
$1 pip install pyserial $1 pip2 install pyserial
$1 pip install pymodbus $1 pip2 install pymodbus
} }
function install_all_libs { function install_all_libs {

4
utils/matiec_src/lib/C/iec_std_FB.h
View File

@ -613,8 +613,8 @@ static void F_TRIG_body__(F_TRIG *data__) {
} }
// Initialise TEMP variables // Initialise TEMP variables
__SET_VAR(data__->,Q,,(!(__GET_VAR(data__->CLK,)) && !(__GET_VAR(data__->M,)))); __SET_VAR(data__->,Q,,(!(__GET_VAR(data__->CLK,)) && (__GET_VAR(data__->M,))));
__SET_VAR(data__->,M,,!(__GET_VAR(data__->CLK,))); __SET_VAR(data__->,M,,__GET_VAR(data__->CLK,));
goto __end; goto __end;

4
utils/matiec_src/lib/edge_detection.txt
View File

@ -29,7 +29,7 @@ FUNCTION_BLOCK F_TRIG
VAR_INPUT CLK: BOOL; END_VAR VAR_INPUT CLK: BOOL; END_VAR
VAR_OUTPUT Q: BOOL; END_VAR VAR_OUTPUT Q: BOOL; END_VAR
VAR RETAIN M: BOOL; END_VAR VAR RETAIN M: BOOL; END_VAR
Q := NOT CLK AND NOT M; Q := NOT CLK AND M;
M := NOT CLK; M := CLK;
END_FUNCTION_BLOCK END_FUNCTION_BLOCK

2
webserver/scripts/start_openplc.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cd webserver cd webserver
python2 webserver.py python2.7 webserver.py