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 #135 from yukia10/ftrig 

Fix for F_TRIG
This commit is contained in:
Thiago Alves 2020-08-07 17:18:47 -07:00 committed by GitHub
parent 6a183dc78e 8f3351d4e0
commit eca999ad8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
__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;

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_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