From ad9a70f43293c580391be3ee58adfbdf5281e9ba Mon Sep 17 00:00:00 2001 From: Thiago Alves Date: Fri, 5 Jun 2020 15:21:52 -0400 Subject: [PATCH 1/4] Fix for Ubuntu 20.04 --- background_installer.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/background_installer.sh b/background_installer.sh index 3c3d682..03e0cf6 100755 --- a/background_installer.sh +++ b/background_installer.sh @@ -23,15 +23,17 @@ fi function linux_install_deps { $1 apt-get update $1 apt-get install -y build-essential pkg-config bison flex autoconf \ - automake libtool make git python2.7 python-pip \ - sqlite3 cmake git + automake libtool make git python2.7 \ + sqlite3 cmake git curl + curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py + $1 python2 get-pip.py } function install_py_deps { - $1 pip install flask - $1 pip install flask-login - $1 pip install pyserial - $1 pip install pymodbus + $1 pip2 install flask + $1 pip2 install flask-login + $1 pip2 install pyserial + $1 pip2 install pymodbus } function install_all_libs { From 7a9051fba3d4d888dfb97fcb5463bff23baae602 Mon Sep 17 00:00:00 2001 From: Thiago Alves Date: Wed, 29 Jul 2020 13:52:55 -0700 Subject: [PATCH 2/4] Fix systems that removed python2 symlink --- background_installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/background_installer.sh b/background_installer.sh index 03e0cf6..43d866a 100755 --- a/background_installer.sh +++ b/background_installer.sh @@ -26,7 +26,7 @@ function linux_install_deps { automake libtool make git python2.7 \ sqlite3 cmake git curl curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py - $1 python2 get-pip.py + $1 python2.7 get-pip.py } function install_py_deps { From 6a183dc78ef28a00e5420a06e88240765303c574 Mon Sep 17 00:00:00 2001 From: Thiago Alves Date: Wed, 29 Jul 2020 13:53:26 -0700 Subject: [PATCH 3/4] Fix systems that removed python2 symlink --- webserver/scripts/start_openplc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webserver/scripts/start_openplc.sh b/webserver/scripts/start_openplc.sh index 6952809..dd276ac 100755 --- a/webserver/scripts/start_openplc.sh +++ b/webserver/scripts/start_openplc.sh @@ -1,3 +1,3 @@ #!/bin/bash cd webserver -python2 webserver.py +python2.7 webserver.py From 8f3351d4e075875f4115545376af36c870a2a9a9 Mon Sep 17 00:00:00 2001 From: Yuki Atoh Date: Sat, 8 Aug 2020 07:19:47 +0900 Subject: [PATCH 4/4] Fix for F_TRIG --- utils/matiec_src/lib/C/iec_std_FB.h | 4 ++-- utils/matiec_src/lib/edge_detection.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/matiec_src/lib/C/iec_std_FB.h b/utils/matiec_src/lib/C/iec_std_FB.h index b4416d2..d6d9614 100644 --- a/utils/matiec_src/lib/C/iec_std_FB.h +++ b/utils/matiec_src/lib/C/iec_std_FB.h @@ -613,8 +613,8 @@ static void F_TRIG_body__(F_TRIG *data__) { } // Initialise TEMP variables - __SET_VAR(data__->,Q,,(!(__GET_VAR(data__->CLK,)) && !(__GET_VAR(data__->M,)))); - __SET_VAR(data__->,M,,!(__GET_VAR(data__->CLK,))); + __SET_VAR(data__->,Q,,(!(__GET_VAR(data__->CLK,)) && (__GET_VAR(data__->M,)))); + __SET_VAR(data__->,M,,__GET_VAR(data__->CLK,)); goto __end; diff --git a/utils/matiec_src/lib/edge_detection.txt b/utils/matiec_src/lib/edge_detection.txt index 69c0dfe..a7ad4d6 100755 --- a/utils/matiec_src/lib/edge_detection.txt +++ b/utils/matiec_src/lib/edge_detection.txt @@ -29,7 +29,7 @@ FUNCTION_BLOCK F_TRIG VAR_INPUT CLK: BOOL; END_VAR VAR_OUTPUT Q: BOOL; END_VAR VAR RETAIN M: BOOL; END_VAR -Q := NOT CLK AND NOT M; -M := NOT CLK; +Q := NOT CLK AND M; +M := CLK; END_FUNCTION_BLOCK