Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 30 additions & 31 deletions src/io/app/SystemConstants/plc_line_HwIdentifiers.st
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
CONFIGURATION HardwareIDs
VAR_GLOBAL CONSTANT
bni00l3_2_HwID : UINT := UINT#258;
bni00l3_2_16_DI_HwID : UINT := UINT#263;
bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_HwID : UINT := UINT#264;
bni00l3_2_Rack_HwID : UINT := UINT#261;
bni00l3_2_X01_HwID : UINT := UINT#265;
bni00l3_2_X02_HwID : UINT := UINT#266;
bni00l3_2_X03_HwID : UINT := UINT#267;
bni00l3_2_X04_HwID : UINT := UINT#268;
bni00l3_2_X05_HwID : UINT := UINT#269;
bni00l3_2_X06_HwID : UINT := UINT#270;
bni00l3_2_X07_HwID : UINT := UINT#271;
bni00l3_2_X08_HwID : UINT := UINT#272;
bni00l3_2_bni00l3_2_HwID : UINT := UINT#262;
bni00l3_2_bni00l3_2_BNI_XG3_508_0B5_R067_HwID : UINT := UINT#273;
bni00l3_2_bni00l3_2_PN_IO_HwID : UINT := UINT#257;
bni00l3_2_bni00l3_2_PN_IO_Port_1_HwID : UINT := UINT#259;
bni00l3_2_bni00l3_2_PN_IO_Port_2_HwID : UINT := UINT#260;
et200sp_HwID : UINT := UINT#276;
et200sp_A100_Server_module_V1_1_0_bytes_HwID : UINT := UINT#281;
et200sp_A10_DI_16x24VDC_ST_V1_1_HwID : UINT := UINT#284;
et200sp_A20_DQ_16x24VDC_0_5A_ST_V1_1_HwID : UINT := UINT#283;
et200sp_A30_CM_4xIO_Link_V2_2_32I_32O_HwID : UINT := UINT#282;
et200sp_Rack_HwID : UINT := UINT#279;
et200sp_et200sp_HwID : UINT := UINT#280;
et200sp_et200sp_IM_155_6_PN_ST_V4_2_HwID : UINT := UINT#285;
et200sp_et200sp_PN_IO_HwID : UINT := UINT#275;
et200sp_et200sp_Port_1_HwID : UINT := UINT#277;
et200sp_et200sp_Port_2_HwID : UINT := UINT#278;
bni00l3_HwID : UINT := UINT#258;
bni00l3_BALLUFF_Link_module_HwID : UINT := UINT#263;
bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_HwID : UINT := UINT#264;
bni00l3_Rack_HwID : UINT := UINT#261;
bni00l3_X01_HwID : UINT := UINT#271;
bni00l3_X02_HwID : UINT := UINT#272;
bni00l3_X03_HwID : UINT := UINT#265;
bni00l3_X04_HwID : UINT := UINT#266;
bni00l3_X05_HwID : UINT := UINT#267;
bni00l3_X06_HwID : UINT := UINT#268;
bni00l3_X07_HwID : UINT := UINT#269;
bni00l3_X08_HwID : UINT := UINT#270;
bni00l3_bni00l3_HwID : UINT := UINT#262;
bni00l3_bni00l3_BNI_XG3_508_0B5_R067_HwID : UINT := UINT#273;
bni00l3_bni00l3_PN_IO_HwID : UINT := UINT#257;
bni00l3_bni00l3_PN_IO_Port_1_HwID : UINT := UINT#259;
bni00l3_bni00l3_PN_IO_Port_2_HwID : UINT := UINT#260;
et200sp_HwID : UINT := UINT#275;
et200sp_A100_Server_module_V1_1_0_bytes_HwID : UINT := UINT#280;
et200sp_A10_DI_16x24VDC_ST_V1_1_HwID : UINT := UINT#283;
et200sp_A20_DQ_16x24VDC_0_5A_ST_V1_1_HwID : UINT := UINT#282;
et200sp_A30_CM_4xIO_Link_V2_2_32I_32O_HwID : UINT := UINT#281;
et200sp_Rack_HwID : UINT := UINT#278;
et200sp_et200sp_HwID : UINT := UINT#279;
et200sp_et200sp_IM_155_6_PN_ST_V4_2_HwID : UINT := UINT#284;
et200sp_et200sp_PN_IO_HwID : UINT := UINT#274;
et200sp_et200sp_Port_1_HwID : UINT := UINT#276;
et200sp_et200sp_Port_2_HwID : UINT := UINT#277;
plc_line_HwID : UINT := UINT#32;
plc_line_Rail_0_HwID : UINT := UINT#286;
plc_line_Rail_0_HwID : UINT := UINT#285;
plc_line_plc_line_HwID : UINT := UINT#48;
plc_line_plc_line_CPU_display_1_HwID : UINT := UINT#54;
plc_line_plc_line_Card_reader_writer_1_HwID : UINT := UINT#51;
Expand All @@ -41,8 +41,7 @@ CONFIGURATION HardwareIDs
plc_line_plc_line_PROFINET_interface_2_HwID : UINT := UINT#72;
plc_line_plc_line_PROFINET_interface_2_Port_3_HwID : UINT := UINT#73;
plc_line_plc_line_Virtual_communication_interface_HwID : UINT := UINT#135;
profinet2_plc_line_HwID : UINT := UINT#256;
profinet_plc_line_HwID : UINT := UINT#274;
profinet_plc_line_HwID : UINT := UINT#256;

END_VAR
END_CONFIGURATION
142 changes: 41 additions & 101 deletions src/io/app/SystemConstants/plc_line_IoAddresses.st
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
CONFIGURATION IoAddresses
VAR_GLOBAL

// Module bni00l3_2/16_DI
bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Input AT %IB0 : bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Input_Layout;
bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Output AT %QB0 : bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Output_Layout;
bni00l3_2_16_DI_X01_Input AT %IB1 : bni00l3_2_16_DI_X01_Input_Layout;
bni00l3_2_16_DI_X02_Input AT %IB2 : bni00l3_2_16_DI_X02_Input_Layout;
bni00l3_2_16_DI_X03_Input AT %IB3 : bni00l3_2_16_DI_X03_Input_Layout;
bni00l3_2_16_DI_X04_Input AT %IB4 : bni00l3_2_16_DI_X04_Input_Layout;
bni00l3_2_16_DI_X05_Input AT %IB5 : bni00l3_2_16_DI_X05_Input_Layout;
bni00l3_2_16_DI_X06_Input AT %IB6 : bni00l3_2_16_DI_X06_Input_Layout;
bni00l3_2_16_DI_X07_Input AT %IB7 : bni00l3_2_16_DI_X07_Input_Layout;
bni00l3_2_16_DI_X08_Input AT %IB8 : bni00l3_2_16_DI_X08_Input_Layout;
// Module bni00l3/BALLUFF_Link_module
bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Input AT %IB0 : bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Input_Layout;
bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Output AT %QB0 : bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Output_Layout;
bni00l3_BALLUFF_Link_module_X01_Input AT %IB1 : bni00l3_BALLUFF_Link_module_X01_Input_Layout;
bni00l3_BALLUFF_Link_module_X02_Input AT %IB6 : bni00l3_BALLUFF_Link_module_X02_Input_Layout;
bni00l3_BALLUFF_Link_module_X03_Input AT %IB43 : bni00l3_BALLUFF_Link_module_X03_Input_Layout;
bni00l3_BALLUFF_Link_module_X04_Input AT %IB46 : bni00l3_BALLUFF_Link_module_X04_Input_Layout;

// Module et200sp/A10
et200sp_A10_Input AT %IB41 : et200sp_A10_Input_Layout;
Expand All @@ -26,7 +22,7 @@ CONFIGURATION IoAddresses
END_CONFIGURATION

TYPE
bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Input_Layout : STRUCT
bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Input_Layout : STRUCT
Signals_0 AT %X0.0 : BOOL;
Signals_1 AT %X0.1 : BOOL;
Signals_2 AT %X0.2 : BOOL;
Expand All @@ -39,7 +35,7 @@ TYPE
END_TYPE

TYPE
bni00l3_2_16_DI_BALLUFF_8_Port_IO_Link_Master_Output_Layout : STRUCT
bni00l3_BALLUFF_Link_module_BALLUFF_8_Port_IO_Link_Master_Output_Layout : STRUCT
Signals_8 AT %X0.0 : BOOL;
Signals_9 AT %X0.1 : BOOL;
Signals_10 AT %X0.2 : BOOL;
Expand All @@ -52,106 +48,50 @@ TYPE
END_TYPE

TYPE
bni00l3_2_16_DI_X01_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
bni00l3_BALLUFF_Link_module_X01_Input_Layout : STRUCT
Signals_0 AT %B0 : ARRAY[0..3] OF BYTE;
Signals_1 AT %X4.2 : BOOL;
Signals_2 AT %X4.3 : BOOL;
Signals_3 AT %X4.4 : BOOL;
Signals_4 AT %X4.5 : BOOL;
Signals_5 AT %X4.6 : BOOL;
Signals_6 AT %X4.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X02_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
bni00l3_BALLUFF_Link_module_X02_Input_Layout : STRUCT
Signals_0 AT %B0 : ARRAY[0..1] OF BYTE;
Signals_1 AT %X2.2 : BOOL;
Signals_2 AT %X2.3 : BOOL;
Signals_3 AT %X2.4 : BOOL;
Signals_4 AT %X2.5 : BOOL;
Signals_5 AT %X2.6 : BOOL;
Signals_6 AT %X2.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X03_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
bni00l3_BALLUFF_Link_module_X03_Input_Layout : STRUCT
Signals_0 AT %B0 : ARRAY[0..1] OF BYTE;
Signals_1 AT %X2.2 : BOOL;
Signals_2 AT %X2.3 : BOOL;
Signals_3 AT %X2.4 : BOOL;
Signals_4 AT %X2.5 : BOOL;
Signals_5 AT %X2.6 : BOOL;
Signals_6 AT %X2.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X04_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X05_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X06_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X07_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
END_STRUCT;
END_TYPE

TYPE
bni00l3_2_16_DI_X08_Input_Layout : STRUCT
Signals_0_0 AT %X0.0 : BOOL;
Signals_0_1 AT %X0.1 : BOOL;
Signals_0_2 AT %X0.2 : BOOL;
Signals_0_3 AT %X0.3 : BOOL;
Signals_0_4 AT %X0.4 : BOOL;
Signals_0_5 AT %X0.5 : BOOL;
Signals_0_6 AT %X0.6 : BOOL;
Signals_0_7 AT %X0.7 : BOOL;
bni00l3_BALLUFF_Link_module_X04_Input_Layout : STRUCT
Signals_0 AT %B0 : ARRAY[0..0] OF BYTE;
Signals_1 AT %X1.2 : BOOL;
Signals_2 AT %X1.3 : BOOL;
Signals_3 AT %X1.4 : BOOL;
Signals_4 AT %X1.5 : BOOL;
Signals_5 AT %X1.6 : BOOL;
Signals_6 AT %X1.7 : BOOL;
END_STRUCT;
END_TYPE

Expand Down
17 changes: 12 additions & 5 deletions src/io/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ variables:
AXTARGETPLATFORMINPUT: .\bin\1500\
AX_USERNAME: "admin"
AX_TARGET_PWD: "Qwerty123456+"
# USE_PLC_SIM_ADVANCED: "true"
USE_PLC_SIM_ADVANCED: "true"
USE_PLC_SIM_ADVANCED: "false"
# <= Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build.
registries:
"@inxton": "https://npm.pkg.github.com/"
Expand Down Expand Up @@ -137,12 +136,20 @@ scripts:
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s"
alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd)
START=$(date +%s)
..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED
if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then
..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true
else
..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false
fi
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s"
all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd)
START=$(date +%s)
..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s"
if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then
..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true
else
..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false
fi
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s"
ib: |
START=$(date +%s)
apax install
Expand Down
Loading
Loading