Skip to content

Commit 1783710

Browse files
authored
Merge pull request #637 from Inxton/636-cognex-update
cognex update
2 parents 0e95177 + c84a3c4 commit 1783710

File tree

166 files changed

+537
-7822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+537
-7822
lines changed

.github/workflows/nightly.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,20 @@ jobs:
5151
env:
5252
GH_TOKEN : ${{ secrets.GH_TOKEN }}
5353

54-
- name: Compare Commit SHAs
54+
- name: Fetch Stored APP_RUN_RESULT from Repository Variable
5555
if: github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch'
5656
shell: pwsh
5757
run: |
58-
if ($env:CURRENT_SHA -eq $env:STORED_SHA) {
58+
$appRunResult = gh variable get APP_RUN_RESULT --json value | ConvertFrom-Json | Select-Object -ExpandProperty value
59+
"APP_RUN_RESULT=$appRunResult" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
60+
env:
61+
GH_TOKEN : ${{ secrets.GH_TOKEN }}
62+
63+
- name: Compare Commit SHAs and previous result
64+
if: github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch'
65+
shell: pwsh
66+
run: |
67+
if ($env:CURRENT_SHA -eq $env:STORED_SHA && $env:APP_RUN_RESULT -eq "0") {
5968
echo "SHA Match: Skipping Steps"
6069
"SKIP_STEPS=true" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
6170
}

src/abstractions/app/apax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010
# Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
1111
PLC_NAME: "plc_line"
1212
DEFAULT_NAMESPACE: "AXOpen.Abstractions"
13-
AXTARGET: 10.10.10.120
13+
AXTARGET: 192.168.100.120
1414
AXTARGETPLATFORMINPUT: .\bin\1500\
1515
AX_USERNAME: "adm"
1616
AX_TARGET_PWD: "123ABCDabcd$#!"

src/abstractions/app/hwc/plc_line.hwl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Devices:
55
TemplateName: 6ES7516-3AP03-0AB0_v3_1
66
Arguments:
77
PLCName: plc_line
8-
IpAddress_X1: 10.10.10.120/24
8+
IpAddress_X1: 192.168.100.120/24
99
ProfinetDeviceName_X1: plc_line_x1
1010
IoSystems:
1111
- Name: profinet_plc_line

src/abstractions/app/ix/Entry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class ConnectionConfig
2323
public class TwinConnectorSelector
2424
{
2525
// Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
26-
public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
26+
public static string TargetIp { get; } = "192.168.100.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
2727
private static string Pass => @"123ABCDabcd$#!"; //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
2828
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
2929
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.

src/components.abb.robotics/app/apax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010
# Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
1111
PLC_NAME: "plc_line"
1212
DEFAULT_NAMESPACE: "AXOpen.Components.Abb.Robotics"
13-
AXTARGET: 10.10.10.120
13+
AXTARGET: 192.168.100.120
1414
AXTARGETPLATFORMINPUT: .\bin\1500\
1515
AX_USERNAME: "adm"
1616
AX_TARGET_PWD: "123ABCDabcd$#!"

src/components.abb.robotics/app/hwc/plc_line.hwl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Devices:
55
TemplateName: 6ES7516-3AP03-0AB0_v3_1
66
Arguments:
77
PLCName: plc_line
8-
IpAddress_X1: 10.10.10.120/24
8+
IpAddress_X1: 192.168.100.120/24
99
ProfinetDeviceName_X1: plc_line_x1
1010
IoSystems:
1111
- Name: profinet_plc_line

src/components.abb.robotics/app/ix/Entry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class ConnectionConfig
2424
public class TwinConnectorSelector
2525
{
2626
// Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. =>
27-
public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
27+
public static string TargetIp { get; } = "192.168.100.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
2828
private static string Pass => @"123ABCDabcd$#!"; //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
2929
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
3030
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.

src/components.abb.robotics/ctrl/assets/OmniCore.hwl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Devices:
1111
Label: X1
1212
Addresses:
1313
Configured:
14-
- IPv4: 10.10.10.2/24
14+
- IPv4: 192.168.100.2/24
1515
- ProfinetDeviceName: OmniCore
1616
- Name: DI_64_bytes
1717
TypeIdentifier:

src/components.abb.robotics/ctrl/assets/RobotBasicIO.hwl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Devices:
1111
Label: X1
1212
Addresses:
1313
Configured:
14-
- IPv4: 10.10.10.1/24
14+
- IPv4: 192.168.100.1/24
1515
- ProfinetDeviceName: RobotBasicIO
1616
- Name: DI_64_bytes
1717
TypeIdentifier:

0 commit comments

Comments
 (0)