lpcmanager

Forgotten commit of some fixes in POU library for GOT.
revamp
2018-10-04, Edouard Tisserant
760f5eec27fd
Parents 5a5c481839d0
Children 82d35015f5db
Forgotten commit of some fixes in POU library for GOT.
1 files changed, 19 insertions(+), 20 deletions(-)
  • +19 -20
    Pous/pousGOT.xml
    • --- a/Pous/pousGOT.xml Thu Oct 04 13:58:37 2018 +0200
    +++ b/Pous/pousGOT.xml Thu Oct 04 13:59:31 2018 +0200
    @@ -27,7 +27,7 @@
    </variable>
    <variable name="PERCENT">
    <type>
    - <INT/>
    + <UINT/>
    </type>
    </variable>
    </inputVars>
    @@ -49,13 +49,13 @@
    <body>
    <ST>
    <xhtml:p><![CDATA[(* Set dimmer value *)
    -INPUT_VALUE_CODE:=eval(
    +eval(
    TRIG := TRIG,
    CODE := CONCAT(
    'SetDimmerValue(',
    - INT_TO_STRING(PERCENT);
    + UINT_TO_STRING(PERCENT),
    ')'
    - );
    + ),
    ACK => ACK
    );]]></xhtml:p>
    </ST>
    @@ -74,12 +74,12 @@
    </variable>
    <variable name="PERCENT">
    <type>
    - <INT/>
    + <UINT/>
    </type>
    </variable>
    <variable name="TIME_MS">
    <type>
    - <INT/>
    + <UINT/>
    </type>
    </variable>
    </inputVars>
    @@ -101,15 +101,15 @@
    <body>
    <ST>
    <xhtml:p><![CDATA[(* Fade dimmer value *)
    -INPUT_VALUE_CODE:=eval(
    +eval(
    TRIG := TRIG,
    CODE := CONCAT(
    'SetDimmerValue(',
    - INT_TO_STRING(PERCENT);
    + UINT_TO_STRING(PERCENT),
    ',',
    - INT_TO_STRING(TIME_MS);
    + UINT_TO_STRING(TIME_MS),
    ')'
    - );
    + ),
    ACK => ACK
    );]]></xhtml:p>
    </ST>
    @@ -173,16 +173,15 @@
    <body>
    <ST>
    <xhtml:p><![CDATA[(* Turn buzzer on or off *)
    -(* test if not already waiting for ack *)
    -IF NOT(TRIG & NOT(ACK)) THEN
    - IF APPLIED_VAL <> INPUT_VALUE THEN
    - TRIG := TRUE;
    - ORDERED_VAL := INPUT_VALUE;
    - CODE:=CONCAT(
    - 'SetBuzzerValue(',
    - INT_TO_STRING(BOOL_TO_INT(INPUT_VALUE)),
    - ')'
    - );
    +(* test if not already waiting for ack, and there is change to apply *)
    +IF NOT(TRIG & NOT(ACK)) & (APPLIED_VAL <> INPUT_VALUE) THEN
    + TRIG := TRUE;
    + ORDERED_VAL := INPUT_VALUE;
    + CODE:=CONCAT(
    + 'SetBuzzerValue(',
    + INT_TO_STRING(BOOL_TO_INT(INPUT_VALUE)),
    + ')'
    + );
    END_IF;
    eval(
    TRIG := TRIG,