Skip to content

Commit

Permalink
Components using only hwc (#413)
Browse files Browse the repository at this point in the history
* Create draft PR for #412

* Components Abb robotics changed to HWC only

* docu

* wip

* wip

* update components toc.yml

* allign all yamls to call centralized bash scripts with the same number of parameters for all_first.sh

* restore point before generating the documentaion

* readme for components.rexroth.drives updated

* balluf changed to hwc only

* docu abb

* docu

* cognex added namespasec in app

* desoutter hwc

* components.drives using certificates

* components.elements using certs

* components elements added namespace

* festodrives hwc+certs

* kuka

* mitsubishi

* pneu

* press

* robotics

* siemens ident

* ur robotics

* docu

---------

Co-authored-by: TK <61820360+TomKovac@users.noreply.github.com>
  • Loading branch information
IX-BOT and TomKovac authored Jun 28, 2024
1 parent f54c685 commit 0be60af
Show file tree
Hide file tree
Showing 324 changed files with 52,511 additions and 17,772 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ FodyWeavers.xsd
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/
Expand Down
28 changes: 24 additions & 4 deletions docfx/components/toc.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,35 @@
items:
- name: Abb Robotics
href: ../components.abb.robotics/docs/index.html
- name: Abstractions
href: ../components.abstractions/docs/index.html
- name: Balluff Identification
href: ../components.balluff.identification/docs/index.html
- name: Cognex Vision
href: ../components.cognex.vision/docs/index.html
- name: Desoutter Tightening
href: ../components.desoutter.tightening/docs/index.html
- name: Drives
href: ../components.drives/docs/index.html
- name: Elements
href: ../components.elements/docs/index.html
- name: Festo Drives
href: ../components.festo.drives/docs/index.html
- name: Kuka Robotics
href: ../components.kuka.robotics/docs/index.html
- name: Mitsubishi Robotics
href: ../components.mitsubishi.robotics/docs/index.html
- name: Pneumatics
href: ../components.pneumatics/docs/index.html
- name: Cognex Vision
href: ../components.cognex.vision/docs/index.html
- name: Rexroth Drives
href: ../components.rexroth.drives/docs/index.html
- name: Festo Drives
href: ../components.rexroth.drives/docs/index.html
- name: Rexroth Press
href: ../components.rexroth.press/docs/index.html
- name: Robotics
href: ../components.robotics/docs/index.html
- name: Siemens Identification
href: ../components.siemens.identification/docs/index.html
- name: Ur Robotics
href: ../components.ur.robotics/docs/index.html
- name: Library template
href: ../template.axolibrary/docs/index.html
2 changes: 1 addition & 1 deletion scripts/check_requisites.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ try {
$command = "axcode --version"

# Define the expected version
$expectedVersion = "1.83.0"
$expectedVersion = "1.88.1"

# Execute the command and capture the output
try {
Expand Down
2 changes: 1 addition & 1 deletion src/abstractions/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ scripts:
all: | #build and download hardware and software
START=$(date +%s)
..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT
..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
installStrategy: strict
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
CONFIGURATION HardwareIDs
VAR_GLOBAL CONSTANT
OmniCore_HwID : UINT := UINT#259;
OmniCore_DI_64_bytes_DI_64_bytes_HwID : UINT := UINT#263;
OmniCore_DO_64_bytes_DO_64_bytes_HwID : UINT := UINT#262;
OmniCore_OmniCore_HwID : UINT := UINT#261;
OmniCore_OmniCore_OmniCore_Standard_PROFINET_Device_HwID : UINT := UINT#264;
OmniCore_OmniCore_profinet_HwID : UINT := UINT#257;
OmniCore_OmniCore_profinet_Network_Port_1_HwID : UINT := UINT#258;
OmniCore_Rack_HwID : UINT := UINT#260;
PROFINET_IO_System_HwID : UINT := UINT#256;
RobotBasicIO_HwID : UINT := UINT#267;
RobotBasicIO_DI_64_bytes_DI_64_bytes_HwID : UINT := UINT#271;
RobotBasicIO_DO_64_bytes_DO_64_bytes_HwID : UINT := UINT#270;
RobotBasicIO_Rack_HwID : UINT := UINT#268;
RobotBasicIO_RobotBasicIO_HwID : UINT := UINT#269;
RobotBasicIO_RobotBasicIO_Robot_Basic_Device_HwID : UINT := UINT#272;
RobotBasicIO_RobotBasicIO_profinet_HwID : UINT := UINT#265;
RobotBasicIO_RobotBasicIO_profinet_Network_Port_HwID : UINT := UINT#266;
plc_line_HwID : UINT := UINT#32;
plc_line_Rail_0_HwID : UINT := UINT#273;
plc_line_plc_line_HwID : UINT := UINT#48;
plc_line_plc_line__plc_line_HwID : UINT := UINT#49;
plc_line_plc_line_CPU_display_1_HwID : UINT := UINT#54;
plc_line_plc_line_CPU_exec_unit_1_HwID : UINT := UINT#52;
plc_line_plc_line_Card_reader_writer_1_HwID : UINT := UINT#51;
plc_line_plc_line_DP_interface_1_HwID : UINT := UINT#60;
plc_line_plc_line_LicenseManager_1_HwID : UINT := UINT#42;
plc_line_plc_line_OPC_UA_1_HwID : UINT := UINT#117;
plc_line_plc_line_PROFINET_interface_2_HwID : UINT := UINT#72;
plc_line_plc_line_PROFINET_interface_2_Port_1_HwID : UINT := UINT#73;
plc_line_plc_line_Virtual_communication_interface_HwID : UINT := UINT#135;
plc_line_plc_line_plc_line_HwID : UINT := UINT#50;
plc_line_plc_line_profinet_x1_HwID : UINT := UINT#64;
plc_line_plc_line_profinet_x1_Port1_HwID : UINT := UINT#65;
plc_line_plc_line_profinet_x1_Port2_HwID : UINT := UINT#66;

END_VAR
END_CONFIGURATION
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
CONFIGURATION IoAddresses
VAR_GLOBAL
OmniCore_DI_64_bytes_InputAddress_0 AT %IL0: LWORD;
OmniCore_DI_64_bytes_InputAddress_1 AT %IL8: LWORD;
OmniCore_DI_64_bytes_InputAddress_2 AT %IL16: LWORD;
OmniCore_DI_64_bytes_InputAddress_3 AT %IL24: LWORD;
OmniCore_DI_64_bytes_InputAddress_4 AT %IL32: LWORD;
OmniCore_DI_64_bytes_InputAddress_5 AT %IL40: LWORD;
OmniCore_DI_64_bytes_InputAddress_6 AT %IL48: LWORD;
OmniCore_DI_64_bytes_InputAddress_7 AT %IL56: LWORD;
OmniCore_DO_64_bytes_OutputAddress_0 AT %QL0: LWORD;
OmniCore_DO_64_bytes_OutputAddress_1 AT %QL8: LWORD;
OmniCore_DO_64_bytes_OutputAddress_2 AT %QL16: LWORD;
OmniCore_DO_64_bytes_OutputAddress_3 AT %QL24: LWORD;
OmniCore_DO_64_bytes_OutputAddress_4 AT %QL32: LWORD;
OmniCore_DO_64_bytes_OutputAddress_5 AT %QL40: LWORD;
OmniCore_DO_64_bytes_OutputAddress_6 AT %QL48: LWORD;
OmniCore_DO_64_bytes_OutputAddress_7 AT %QL56: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_0 AT %IL64: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_1 AT %IL72: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_2 AT %IL80: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_3 AT %IL88: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_4 AT %IL96: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_5 AT %IL104: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_6 AT %IL112: LWORD;
RobotBasicIO_DI_64_bytes_InputAddress_7 AT %IL120: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_0 AT %QL64: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_1 AT %QL72: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_2 AT %QL80: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_3 AT %QL88: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_4 AT %QL96: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_5 AT %QL104: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_6 AT %QL112: LWORD;
RobotBasicIO_DO_64_bytes_OutputAddress_7 AT %QL120: LWORD;

END_VAR
END_CONFIGURATION
22 changes: 8 additions & 14 deletions src/components.abb.robotics/app/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@ scripts:
delta:
- START=$(date +%s)
- apax build --ignore-scripts
- apax sld load --accept-security-disclaimer -t $AXTARGET -i
$AXTARGETPLATFORMINPUT --mode delta
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
:" $(expr $(date +%s) - $START) "s"
- apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT --mode delta
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
download:
- START=$(date +%s)
- apax build --ignore-scripts
- dotnet ixc
- apax download_only
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
:" $(expr $(date +%s) - $START) "s"
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
download_only:
- apax sld load --accept-security-disclaimer -t $AXTARGET -i
$AXTARGETPLATFORMINPUT -r
- apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r
check+download: |
if [ $AXTARGET ]; then
if [ $AXTARGETPLATFORMINPUT ]; then
Expand All @@ -51,8 +47,7 @@ scripts:
echo "Environment variable AXTARGET not defined!!!"
fi
watch:
- dotnet watch --project
..\\app\\ix-blazor\\AXOpen.Components.Abb.Robotics.blazorapp.csproj
- dotnet watch --project ..\\app\\ix-blazor\\AXOpen.Components.Abb.Robotics.blazorapp.csproj
fr:
- ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
- apax rr
Expand All @@ -64,8 +59,7 @@ scripts:
- apax clean
- apax install
- apax download
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
:" $(expr $(date +%s) - $START) "s"
- echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
rrw:
- apax rr
- apax watch
Expand All @@ -76,7 +70,7 @@ scripts:
dd:
- apax delta
# <==== Obsolete scripts, could be removed at some point

# For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
# Local variables can override environment variables.
# It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
Expand Down Expand Up @@ -148,7 +142,7 @@ scripts:
all: | #build and download hardware and software
START=$(date +%s)
..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT
..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
installStrategy: strict
Expand Down
Loading

0 comments on commit 0be60af

Please sign in to comment.