Skip to content

Commit

Permalink
Add a Reset to Timer FBs (#79)
Browse files Browse the repository at this point in the history 
* Update event comment from "RESET" to "Reset"

Changed event comment from "RESET" to "Reset" for clarity and consistency.

* Add reset event connections and adjust data connections for E_TOF.

- Added a new "Reset" event connection.
- Updated connection source and destination coordinates for the reset event.

* Add reset event connection in timers FB network

Added a new event connection for the reset event in the timers function block network. Adjusted existing connections accordingly.

* Update timer FBs to version 1.1 with reset functionality.

* Update timer function block name from "E_IMPULSE" to "E_PULSE". Add version info for the renaming. Include a remark for the initial implementation and subsequent renaming.
  • Loading branch information
@franz-hoepfinger-4diac
franz-hoepfinger-4diac committed May 17, 2024
1 parent 60ed6bf commit e691caa
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
8 changes: 6 additions & 2 deletions data/typelibrary/events-1.0.0/typelib/timers/E_PULSE.fbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
<FBType Name="E_PULSE" Comment="standard timer function block (pulse)">
<Identification Standard="61499-2" Description="This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0 &#10; &#10; &#10;E_TP -- Impulse forming FB &#10; &#10;Generate a Impulse with a given Time. &#10;This FB makes a Impulse of Duration TM on the Output QO." >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2023-08-21">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2023-08-21" Remarks="initial implementation as E_IMPULSE">
</VersionInfo>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2024-03-05" Remarks="renamed to E_PULSE">
</VersionInfo>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.1" Author="Franz Hoepfinger" Date="2024-04-23" Remarks="Add a Reset to Timer FBs">
</VersionInfo>
<InterfaceList>
<EventInputs>
<Event Name="REQ" Type="Event" Comment="Service Request">
<With Var="PT"/>
</Event>
<Event Name="R" Type="Event" Comment="RESET">
<Event Name="R" Type="Event" Comment="Reset">
</Event>
</EventInputs>
<EventOutputs>
Expand Down
12 changes: 9 additions & 3 deletions data/typelibrary/events-1.0.0/typelib/timers/E_TOF.fbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2024-03-04">
</VersionInfo>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.1" Author="Franz Hoepfinger" Date="2024-04-23" Remarks="Add a Reset to Timer FBs">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
Expand All @@ -12,6 +14,8 @@
<With Var="IN"/>
<With Var="PT"/>
</Event>
<Event Name="R" Type="Event" Comment="Reset">
</Event>
</EventInputs>
<EventOutputs>
<Event Name="CNF" Type="Event" Comment="Execution Confirmation">
Expand All @@ -34,16 +38,18 @@
<FB Name="E_RS" Type="E_RS" Comment="" x="1373.3333333333335" y="-986.6666666666667">
</FB>
<EventConnections>
<Connection Source="REQ" Destination="E_SWITCH.EI" Comment="" dx1="200.0"/>
<Connection Source="REQ" Destination="E_SWITCH.EI" Comment="" dx1="146.66666666666669"/>
<Connection Source="E_RS.EO" Destination="CNF" Comment="" dx1="1033.3333333333335"/>
<Connection Source="E_DELAY.EO" Destination="E_RS.R" Comment=""/>
<Connection Source="E_SWITCH.EO1" Destination="E_RS.S" Comment="" dx1="273.33333333333337" dx2="260.0" dy="380.0"/>
<Connection Source="E_SWITCH.EO0" Destination="E_DELAY.START" Comment=""/>
<Connection Source="E_SWITCH.EO1" Destination="E_DELAY.STOP" Comment=""/>
<Connection Source="R" Destination="E_RS.R" Comment="" dx1="180.0" dx2="253.33333333333334" dy="-213.33333333333334"/>
<Connection Source="R" Destination="E_DELAY.STOP" Comment="" dx1="180.0" dx2="193.33333333333334" dy="-213.33333333333334"/>
</EventConnections>
<DataConnections>
<Connection Source="IN" Destination="E_SWITCH.G" Comment="" dx1="166.66666666666669"/>
<Connection Source="PT" Destination="E_DELAY.DT" Comment="" dx1="133.33333333333334" dx2="266.6666666666667" dy="433.33333333333337"/>
<Connection Source="IN" Destination="E_SWITCH.G" Comment="" dx1="186.66666666666669"/>
<Connection Source="PT" Destination="E_DELAY.DT" Comment="" dx1="153.33333333333334" dx2="266.6666666666667" dy="333.33333333333337"/>
<Connection Source="E_RS.Q" Destination="Q" Comment="" dx1="1066.6666666666667"/>
</DataConnections>
</FBNetwork>
Expand Down
18 changes: 12 additions & 6 deletions data/typelibrary/events-1.0.0/typelib/timers/E_TONOF.fbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2024-03-04">
</VersionInfo>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.1" Author="Franz Hoepfinger" Date="2024-04-23" Remarks="Add a Reset to Timer FBs">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
Expand All @@ -13,6 +15,8 @@
<With Var="PT_ON"/>
<With Var="PT_OFF"/>
</Event>
<Event Name="R" Type="Event" Comment="Reset">
</Event>
</EventInputs>
<EventOutputs>
<Event Name="CNF" Type="Event" Comment="Execution Confirmation">
Expand All @@ -38,20 +42,22 @@
<FB Name="E_DELAY_OFF" Type="E_DELAY" Comment="" x="353.33333333333337" y="-986.6666666666667">
</FB>
<EventConnections>
<Connection Source="REQ" Destination="E_SWITCH.EI" Comment="" dx1="286.6666666666667"/>
<Connection Source="E_SWITCH.EO1" Destination="E_DELAY_ON.START" Comment="" dx1="360.0"/>
<Connection Source="E_SWITCH.EO0" Destination="E_DELAY_ON.STOP" Comment="" dx1="246.66666666666669"/>
<Connection Source="REQ" Destination="E_SWITCH.EI" Comment="" dx1="213.33333333333334"/>
<Connection Source="E_SWITCH.EO1" Destination="E_DELAY_ON.START" Comment="" dx1="273.33333333333337"/>
<Connection Source="E_SWITCH.EO0" Destination="E_DELAY_ON.STOP" Comment="" dx1="240.0"/>
<Connection Source="E_DELAY_ON.EO" Destination="E_RS.S" Comment="" dx1="253.33333333333334"/>
<Connection Source="E_RS.EO" Destination="CNF" Comment="" dx1="966.6666666666667"/>
<Connection Source="E_DELAY_OFF.EO" Destination="E_RS.R" Comment=""/>
<Connection Source="E_SWITCH.EO0" Destination="E_DELAY_OFF.START" Comment=""/>
<Connection Source="E_SWITCH.EO1" Destination="E_DELAY_OFF.STOP" Comment=""/>
<Connection Source="R" Destination="E_RS.R" Comment="" dx1="246.66666666666669" dx2="253.33333333333334" dy="-213.33333333333334"/>
<Connection Source="R" Destination="E_DELAY_OFF.STOP" Comment="" dx1="246.66666666666669" dx2="233.33333333333334" dy="-213.33333333333334"/>
</EventConnections>
<DataConnections>
<Connection Source="IN" Destination="E_SWITCH.G" Comment="" dx1="253.33333333333334"/>
<Connection Source="PT_ON" Destination="E_DELAY_ON.DT" Comment="" dx1="186.66666666666669"/>
<Connection Source="IN" Destination="E_SWITCH.G" Comment="" dx1="266.6666666666667"/>
<Connection Source="PT_ON" Destination="E_DELAY_ON.DT" Comment="" dx1="200.0"/>
<Connection Source="E_RS.Q" Destination="Q" Comment="" dx1="1000.0"/>
<Connection Source="PT_OFF" Destination="E_DELAY_OFF.DT" Comment="" dx1="220.0" dx2="480.0" dy="333.33333333333337"/>
<Connection Source="PT_OFF" Destination="E_DELAY_OFF.DT" Comment="" dx1="233.33333333333334" dx2="300.0" dy="233.33333333333334"/>
</DataConnections>
</FBNetwork>
</FBType>
2 changes: 2 additions & 0 deletions data/typelibrary/events-1.0.0/typelib/timers/E_TP.fbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Hoepfinger" Date="2024-03-04">
</VersionInfo>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.1" Author="Franz Hoepfinger" Date="2024-04-23" Remarks="Add a Reset to Timer FBs">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
Expand Down

0 comments on commit e691caa

Please sign in to comment.