Skip to content

Commit 9058e7e

Browse files
committed
Revert "cognex"
This reverts commit 5ab7a7b.
1 parent 5ab7a7b commit 9058e7e

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

src/components.cognex.vision/app/apax.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "xapp_axopen.components.cognex.vision"
1+
name: "app_axopen.components.cognex.vision"
22
version: '0.0.0-dev.0'
33
type: app
44
targets:
@@ -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.Cognex.Vision"
13-
AXTARGET: 192.168.100.121
13+
AXTARGET: 192.168.100.120
1414
AXTARGETPLATFORMINPUT: .\bin\1500\
1515
AX_USERNAME: "adm"
1616
AX_TARGET_PWD: "123ABCDabcd$#!"
@@ -173,3 +173,7 @@ scripts:
173173
echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s"
174174
mm: |
175175
apax mon --targetIP $AXTARGET --file monitor.mon --username $AX_USERNAME --password $AX_TARGET_PWD --certificate .\\certs\\$PLC_NAME\\$PLC_NAME.cer --continuously
176+
177+
178+
179+

src/components.cognex.vision/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: 192.168.100.121/24
8+
IpAddress_X1: 192.168.100.120/24
99
ProfinetDeviceName_X1: plc_line_x1
1010
IoSystems:
1111
- Name: profinet_plc_line

src/components.cognex.vision/app/ix/Entry.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ 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; } = "192.168.100.121";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
28-
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.
29-
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
30-
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
31-
private static string CertificatePath = "..\\certs\\plc_line\\plc_line.cer";
27+
//public static string TargetIp { get; } = "192.168.100.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
28+
//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.
29+
//private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
30+
//private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
31+
//private static string CertificatePath = "..\\certs\\plc_line\\plc_line.cer";
3232
// <= Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build.
33+
public static string TargetIp { get; } = "10.1.100.90";
34+
private static string Pass => @"MTSservis1234+";
35+
private static string UserName = "admin";
36+
private const bool IgnoreSslErrors = true;
37+
private static string CertificatePath = "..\\certs\\plc_main\\plc_main.cer";
3338

3439
static readonly X509Certificate2 Certificate = new X509Certificate2(CertificatePath);
3540

src/core/app/ix-blazor/axopencore.blazor/Pages/AxoCore/AxoComponentExample.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RenderableContentControl Context="@Entry.Plc.myComponentExample.ActivateManualControl" Presentation="Control" />
1414
</div>
1515
<div class="col">
16-
<RenderableContentControl Context="@Entry.Plc.myComponentExample.MyComponent._isManuallyControllable" Presentation="Control" />
16+
<RenderableContentControl Context="@Entry.Plc.myComponentExample.MyComponent._isManuallyControllable" Presentation="Display" />
1717
</div>
1818
</div>
1919
<div class="col">

0 commit comments

Comments
 (0)