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

Fix for F_TRIG

This commit is contained in:
Yuki Atoh 2020-08-08 07:19:47 +09:00
parent 6a183dc78e
commit 8f3351d4e0
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