Skip to content

Commit 1ef7bae

Browse files
franz-ms-mucfranz-ms-muc
authored
Merge pull request #93 from Meisterschulen-am-Ostbahnhof-Munchen/fix_naming
fix: rename function block instances for clarity
2 parents acf0b4b + 47d5700 commit 1ef7bae

25 files changed

Lines changed: 125 additions & 125 deletions

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a10a_AX.SUB‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<Parameter Name="Input" Value="Input_I1"/>
2222
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
2323
</FB>
24-
<FB Name="AX_T_FF" Type="adapter::events::unidirectional::AX_T_FF_INIT" x="-5600" y="-100">
24+
<FB Name="AX_T_FF_INIT" Type="adapter::events::unidirectional::AX_T_FF_INIT" x="-5600" y="-100">
2525
<Parameter Name="QI" Value="TRUE"/>
2626
<Parameter Name="Q_INIT" Value="FALSE"/>
2727
</FB>
2828
<EventConnections>
29-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF.CLK" dx1="300"/>
29+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_INIT.CLK" dx1="300"/>
3030
</EventConnections>
3131
<AdapterConnections>
32-
<Connection Source="AX_T_FF.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
32+
<Connection Source="AX_T_FF_INIT.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
3333
</AdapterConnections>
3434
</SubAppNetwork>
3535
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a10b_AX.SUB‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
<Parameter Name="Input" Value="Input_I1"/>
2222
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
2323
</FB>
24-
<FB Name="AX_T_FF" Type="adapter::events::unidirectional::AX_T_FF_INIT" x="-5600" y="-100">
24+
<FB Name="AX_T_FF_INIT" Type="adapter::events::unidirectional::AX_T_FF_INIT" x="-5600" y="-100">
2525
<Parameter Name="QI" Value="TRUE"/>
2626
<Parameter Name="Q_INIT" Value="TRUE"/>
2727
</FB>
2828
<Comment Comment="am Anfang gleich mal AN ! " x="-6000" y="900" width="1000" height="500"/>
2929
<EventConnections>
30-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF.CLK" dx1="300"/>
30+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_INIT.CLK" dx1="300"/>
3131
</EventConnections>
3232
<AdapterConnections>
33-
<Connection Source="AX_T_FF.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
33+
<Connection Source="AX_T_FF_INIT.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
3434
</AdapterConnections>
3535
</SubAppNetwork>
3636
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a11a_AX.SUB‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Parameter Name="Input" Value="Input_I1"/>
2222
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
2323
</FB>
24-
<FB Name="AX_T_FF" Type="adapter::events::unidirectional::AX_T_FF_SR_SYM_STORE" x="-5600" y="-100">
24+
<FB Name="AX_T_FF_SR_SYM_STORE" Type="adapter::events::unidirectional::AX_T_FF_SR_SYM_STORE" x="-5600" y="-100">
2525
</FB>
2626
<Comment Comment="am Anfang letzten Zustand laden!" x="-2400" y="1700" width="1000" height="500"/>
2727
<FB Name="INI_AX2" Type="eclipse4diac::storage::INI_AX2" x="-2500" y="700">
@@ -31,11 +31,11 @@
3131
<Parameter Name="DEFAULT_VALUE" Value="FALSE"/>
3232
</FB>
3333
<EventConnections>
34-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF.CLK"/>
34+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_SR_SYM_STORE.CLK"/>
3535
</EventConnections>
3636
<AdapterConnections>
37-
<Connection Source="AX_T_FF.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
38-
<Connection Source="AX_T_FF.Q_INIT" Destination="INI_AX2.VAL" dx1="540"/>
37+
<Connection Source="AX_T_FF_SR_SYM_STORE.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
38+
<Connection Source="AX_T_FF_SR_SYM_STORE.Q_INIT" Destination="INI_AX2.VAL" dx1="540"/>
3939
</AdapterConnections>
4040
</SubAppNetwork>
4141
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a11b_AX.SUB‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Parameter Name="Input" Value="Input_I1"/>
2222
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
2323
</FB>
24-
<FB Name="AX_T_FF" Type="adapter::events::unidirectional::AX_T_FF_SR_SYM_STORE" x="-5600" y="-100">
24+
<FB Name="AX_T_FF_SR_SYM_STORE" Type="adapter::events::unidirectional::AX_T_FF_SR_SYM_STORE" x="-5600" y="-100">
2525
</FB>
2626
<Comment Comment="am Anfang letzten Zustand laden!" x="-6000" y="1100" width="1000" height="500"/>
2727
<FB Name="INI_AX2" Type="logiBUS::storage::esp32_nvs::NVS_AX2" x="-2800" y="700">
@@ -30,11 +30,11 @@
3030
<Parameter Name="DEFAULT_VALUE" Value="FALSE"/>
3131
</FB>
3232
<EventConnections>
33-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF.CLK"/>
33+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_SR_SYM_STORE.CLK"/>
3434
</EventConnections>
3535
<AdapterConnections>
36-
<Connection Source="AX_T_FF.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
37-
<Connection Source="AX_T_FF.Q_INIT" Destination="INI_AX2.VAL" dx1="540"/>
36+
<Connection Source="AX_T_FF_SR_SYM_STORE.Q" Destination="DigitalOutput_Q1.OUT" dx1="373.33"/>
37+
<Connection Source="AX_T_FF_SR_SYM_STORE.Q_INIT" Destination="INI_AX2.VAL" dx1="540"/>
3838
</AdapterConnections>
3939
</SubAppNetwork>
4040
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a4_AX.SUB‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<Parameter Name="Input" Value="Input_I1"/>
3333
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
3434
</FB>
35-
<FB Name="E_T_FF_Q1" Type="adapter::events::unidirectional::AX_T_FF" x="-5500" y="-100">
35+
<FB Name="AX_T_FF_Q1" Type="adapter::events::unidirectional::AX_T_FF" x="-5500" y="-100">
3636
</FB>
37-
<FB Name="E_T_FF_Q2" Type="adapter::events::unidirectional::AX_T_FF" x="-5500" y="900">
37+
<FB Name="AX_T_FF_Q2" Type="adapter::events::unidirectional::AX_T_FF" x="-5500" y="900">
3838
</FB>
3939
<FB Name="DigitalOutput_Q2" Type="logiBUS::io::DQ::logiBUS_QXA" x="-3700" y="600">
4040
<Parameter Name="QI" Value="TRUE">
@@ -49,13 +49,13 @@
4949
</FB>
5050
<Comment Comment="hier 2x T_FF zu verwenden ist sinnlos, das soll nur zeigen wie man E_SPLIT verwenden kann. " x="-7800" y="1200" width="1700" height="500"/>
5151
<EventConnections>
52-
<Connection Source="E_SPLIT.EO1" Destination="E_T_FF_Q1.CLK" dx1="493.33"/>
53-
<Connection Source="E_SPLIT.EO2" Destination="E_T_FF_Q2.CLK" dx1="493.33"/>
52+
<Connection Source="E_SPLIT.EO1" Destination="AX_T_FF_Q1.CLK" dx1="493.33"/>
53+
<Connection Source="E_SPLIT.EO2" Destination="AX_T_FF_Q2.CLK" dx1="493.33"/>
5454
<Connection Source="DigitalInput_CLK_I1.IND" Destination="E_SPLIT.EI" dx1="166.67"/>
5555
</EventConnections>
5656
<AdapterConnections>
57-
<Connection Source="E_T_FF_Q2.Q" Destination="DigitalOutput_Q2.OUT" dx1="620"/>
58-
<Connection Source="E_T_FF_Q1.Q" Destination="DigitalOutput_Q1.OUT" dx1="600"/>
57+
<Connection Source="AX_T_FF_Q2.Q" Destination="DigitalOutput_Q2.OUT" dx1="620"/>
58+
<Connection Source="AX_T_FF_Q1.Q" Destination="DigitalOutput_Q1.OUT" dx1="600"/>
5959
</AdapterConnections>
6060
</SubAppNetwork>
6161
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004a5_AX.SUB‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<Parameter Name="Input" Value="Input_I1"/>
3333
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
3434
</FB>
35-
<FB Name="E_T_FF_Q1" Type="adapter::events::unidirectional::AX_T_FF" x="-5600" y="200">
35+
<FB Name="AX_T_FF_Q1" Type="adapter::events::unidirectional::AX_T_FF" x="-5600" y="200">
3636
</FB>
37-
<FB Name="E_T_FF_Q2" Type="adapter::events::unidirectional::AX_T_FF" x="-5600" y="1100">
37+
<FB Name="AX_T_FF_Q2" Type="adapter::events::unidirectional::AX_T_FF" x="-5600" y="1100">
3838
</FB>
3939
<FB Name="DigitalOutput_Q2" Type="logiBUS::io::DQ::logiBUS_QXA" x="-3700" y="800">
4040
<Parameter Name="QI" Value="TRUE">
@@ -47,12 +47,12 @@
4747
</FB>
4848
<Comment Comment="hier 2x T_FF zu verwenden ist sinnlos, das soll nur zeigen wie man E_SPLIT verwenden kann. " x="-7600" y="1400" width="1700" height="500"/>
4949
<EventConnections>
50-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="E_T_FF_Q1.CLK" dx1="1173.33"/>
51-
<Connection Source="DigitalInput_CLK_I1.IND" Destination="E_T_FF_Q2.CLK" dx1="1173.33"/>
50+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_Q1.CLK" dx1="1173.33"/>
51+
<Connection Source="DigitalInput_CLK_I1.IND" Destination="AX_T_FF_Q2.CLK" dx1="1173.33"/>
5252
</EventConnections>
5353
<AdapterConnections>
54-
<Connection Source="E_T_FF_Q2.Q" Destination="DigitalOutput_Q2.OUT" dx1="666.67"/>
55-
<Connection Source="E_T_FF_Q1.Q" Destination="DigitalOutput_Q1.OUT" dx1="666.67"/>
54+
<Connection Source="AX_T_FF_Q2.Q" Destination="DigitalOutput_Q2.OUT" dx1="666.67"/>
55+
<Connection Source="AX_T_FF_Q1.Q" Destination="DigitalOutput_Q1.OUT" dx1="666.67"/>
5656
</AdapterConnections>
5757
</SubAppNetwork>
5858
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_004b_AX_ASR.SUB‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<Parameter Name="Input" Value="Input_I1"/>
2222
<Parameter Name="InputEvent" Value="BUTTON_SINGLE_CLICK"/>
2323
</FB>
24-
<FB Name="AX_SR" Type="adapter::events::unidirectional::ASR_AX_SR" x="-1900" y="-600">
24+
<FB Name="ASR_AX_SR" Type="adapter::events::unidirectional::ASR_AX_SR" x="-1900" y="-600">
2525
</FB>
26-
<FB Name="AX_SWITCH" Type="adapter::events::unidirectional::AX_ASR_SWITCH" x="-3200" y="-600">
26+
<FB Name="AX_ASR_SWITCH" Type="adapter::events::unidirectional::AX_ASR_SWITCH" x="-3200" y="-600">
2727
</FB>
2828
<FB Name="AX_SPLIT_2" Type="adapter::events::unidirectional::AX_SPLIT_2" x="-900" y="-600">
2929
</FB>
@@ -39,11 +39,11 @@
3939
<Connection Source="AX_X_TO_BOOL.IN" Destination="AX_BOOL_TO_X.OUT"/>
4040
</DataConnections>
4141
<AdapterConnections>
42-
<Connection Source="AX_SR.Q" Destination="AX_SPLIT_2.IN"/>
42+
<Connection Source="ASR_AX_SR.Q" Destination="AX_SPLIT_2.IN"/>
4343
<Connection Source="AX_SPLIT_2.OUT1" Destination="DigitalOutput_Q1.OUT" dx1="273.33"/>
44-
<Connection Source="AX_BOOL_TO_X.AX_OUT" Destination="AX_SWITCH.G" dx1="173.33"/>
44+
<Connection Source="AX_BOOL_TO_X.AX_OUT" Destination="AX_ASR_SWITCH.G" dx1="173.33"/>
4545
<Connection Source="AX_SPLIT_2.OUT2" Destination="AX_X_TO_BOOL.AX_IN" dx1="80" dx2="80" dy="500"/>
46-
<Connection Source="AX_SWITCH.Q" Destination="AX_SR.S_R"/>
46+
<Connection Source="AX_ASR_SWITCH.Q" Destination="ASR_AX_SR.S_R"/>
4747
</AdapterConnections>
4848
</SubAppNetwork>
4949
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_011b1_AUDI.SUB‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
</FB>
2525
<FB Name="AD_TO_AUDI_2" Type="adapter::conversion::unidirectional::AD_TO_AUDI" x="-5100" y="2200">
2626
</FB>
27-
<FB Name="AX_ADD_2" Type="adapter::iec61131::arithmetic::AUDI_ADD_2" x="-3100" y="1600">
27+
<FB Name="AUDI_ADD_2" Type="adapter::iec61131::arithmetic::AUDI_ADD_2" x="-3100" y="1600">
2828
</FB>
2929
<FB Name="Q_NumericValue_AUDI" Type="isobus::UT::Q::Q_NumericValue_AUDI" x="-500" y="1200">
3030
<Parameter Name="u16ObjId" Value="OutputNumber_N1"/>
3131
</FB>
3232
<AdapterConnections>
3333
<Connection Source="InputNumber_I1.IN" Destination="AD_TO_AUDI_1.AD_IN" dx1="380"/>
3434
<Connection Source="InputNumber_I2.IN" Destination="AD_TO_AUDI_2.AD_IN" dx1="380"/>
35-
<Connection Source="AD_TO_AUDI_1.AUDI_OUT" Destination="AX_ADD_2.IN1" dx1="593.33"/>
36-
<Connection Source="AD_TO_AUDI_2.AUDI_OUT" Destination="AX_ADD_2.IN2" dx1="593.33"/>
37-
<Connection Source="AX_ADD_2.OUT" Destination="Q_NumericValue_AUDI.u32NewValue" dx1="920"/>
35+
<Connection Source="AD_TO_AUDI_1.AUDI_OUT" Destination="AUDI_ADD_2.IN1" dx1="593.33"/>
36+
<Connection Source="AD_TO_AUDI_2.AUDI_OUT" Destination="AUDI_ADD_2.IN2" dx1="593.33"/>
37+
<Connection Source="AUDI_ADD_2.OUT" Destination="Q_NumericValue_AUDI.u32NewValue" dx1="920"/>
3838
</AdapterConnections>
3939
</SubAppNetwork>
4040
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_011e_MIXA.SUB‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Parameter Name="QI" Value="TRUE"/>
1616
<Parameter Name="u16ObjId" Value="InputNumber_I1"/>
1717
</FB>
18-
<FB Name="F_DWORD_TO_UDINT" Type="adapter::conversion::unidirectional::AD_TO_AR" x="-4500" y="900">
18+
<FB Name="AD_TO_AR" Type="adapter::conversion::unidirectional::AD_TO_AR" x="-4500" y="900">
1919
</FB>
2020
<FB Name="Q_NumericValue_PHYS" Type="isobus::UT::Q::Q_NumericValue_PHYSA" x="-1600" y="366.67">
2121
<Parameter Name="stObj" Value="OutputNumber_N3"/>
@@ -24,8 +24,8 @@
2424
<Comment Comment="Uebungen::const::UT::DefaultPool_Numeric::OutputNumber_N3" x="-2400" y="1500" width="3200" height="200"/>
2525
<Comment Comment="Uebungen::const::UT::DefaultPool::InputNumber_I1" x="-7200" y="1500" width="2400" height="200"/>
2626
<AdapterConnections>
27-
<Connection Source="F_DWORD_TO_UDINT.AR_OUT" Destination="Q_NumericValue_PHYS.rPhys" dx1="1833.33"/>
28-
<Connection Source="InputNumber_I1.IN" Destination="F_DWORD_TO_UDINT.AD_IN"/>
27+
<Connection Source="AD_TO_AR.AR_OUT" Destination="Q_NumericValue_PHYS.rPhys" dx1="1833.33"/>
28+
<Connection Source="InputNumber_I1.IN" Destination="AD_TO_AR.AD_IN"/>
2929
</AdapterConnections>
3030
</SubAppNetwork>
3131
</SubAppType>

‎Ventilsteuerung/4diacIDE-workspace/test_AX/Uebungen/Uebung_012e2_AR.SUB‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Parameter Name="QI" Value="TRUE"/>
2424
<Parameter Name="Output" Value="Output_Q1"/>
2525
</FB>
26-
<FB Name="AX_TON" Type="adapter::events::unidirectional::timers::ATM_AX_TON" x="-300" y="3100">
26+
<FB Name="ATM_AX_TON" Type="adapter::events::unidirectional::timers::ATM_AX_TON" x="-300" y="3100">
2727
</FB>
2828
<FB Name="DigitalInput_I1" Type="logiBUS::io::DI::logiBUS_IXA" x="-2000" y="2700">
2929
<Parameter Name="QI" Value="TRUE"/>
@@ -34,10 +34,10 @@
3434
</FB>
3535
<Comment Comment="Einstellbarer Timer " x="-400" y="3800" width="1200" height="200"/>
3636
<AdapterConnections>
37-
<Connection Source="DigitalInput_I1.IN" Destination="AX_TON.IN" dx1="246.67"/>
38-
<Connection Source="AX_TON.Q" Destination="DigitalOutput_Q1.OUT" dx1="320"/>
37+
<Connection Source="DigitalInput_I1.IN" Destination="ATM_AX_TON.IN" dx1="246.67"/>
38+
<Connection Source="ATM_AX_TON.Q" Destination="DigitalOutput_Q1.OUT" dx1="320"/>
3939
<Connection Source="Uebung_012e_sub_AR.VALUEO" Destination="AR_MULTIME.IN2" dx1="246.67"/>
40-
<Connection Source="AR_MULTIME.OUT" Destination="AX_TON.PT" dx1="273.33"/>
40+
<Connection Source="AR_MULTIME.OUT" Destination="ATM_AX_TON.PT" dx1="273.33"/>
4141
</AdapterConnections>
4242
</SubAppNetwork>
4343
</SubAppType>

0 commit comments

Comments
 (0)