Merge pull request #469 from ix-ax/468-Update_all_apax_yamlS_in_all_appS_to_use_hwc_in_yaml_to_use_secure_comm_and_latest_scripts

Update  all apax.yamlS in all appS to use hwc in yaml, to use secure comm and latest scripts

Author: PTKu

.config/dotnet-tools.json

@@ -31,7 +31,7 @@
       "rollForward": false
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "10.3.4",
+      "version": "12.0.3",
       "commands": [
         "slngen"
       ],

.gitignore

@@ -423,6 +423,9 @@ import-cache
 #AX HWC compiled
 hwc.gen/
 
+#AX HWC templates copied from library
+library_templates
+
 #DCP export 
 dcp_export/
 

cake/BuildContext.cs

@@ -174,7 +174,7 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)
         ("components.mitsubishi.robotics", "axopen.components.mitsubishi.robotics", true),
         ("components.ur.robotics", "axopen.components.ur.robotics", true),
         ("components.kuka.robotics", "axopen.components.kuka.robotics", true),
-        ("components.siemens.identification", "axopen.components.siemens.identification", true),
+        ("components.siem.identification", "axopen.components.siem.identification", true),
         ("components.balluff.identification", "axopen.components.balluff.identification", true),
         ("integrations", "ix.integrations", false),
         ("template.axolibrary", "template.axolibrary", false)

src/components.siemens.identification/components.siemens.identification.code-workspace renamed to src/abstractions/abstractions.code-workspace

@@ -0,0 +1,19 @@
+CONFIGURATION HardwareIDs
+    VAR_GLOBAL CONSTANT
+        plc_line_HwID : UINT := UINT#32;
+        plc_line_Rail_0_HwID : UINT := UINT#257;
+        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;
+        plc_line_plc_line_DP_interface_1_HwID : UINT := UINT#60;
+        plc_line_plc_line_OPC_UA_1_HwID : UINT := UINT#117;
+        plc_line_plc_line_profinet_x1_HwID : UINT := UINT#64;
+        plc_line_plc_line_profinet_x1_Port_1_HwID : UINT := UINT#65;
+        plc_line_plc_line_profinet_x1_Port_2_HwID : UINT := UINT#66;
+        plc_line_plc_line_profinet_x2_HwID : UINT := UINT#72;
+        plc_line_plc_line_profinet_x2_Port_3_HwID : UINT := UINT#73;
+        plc_line_plc_line_virtual_communication_interface_HwID : UINT := UINT#135;
+        profinet_plc_line_HwID : UINT := UINT#256;
+
+    END_VAR
+END_CONFIGURATION

src/abstractions/abstractions.sln

@@ -0,0 +1,5 @@
+CONFIGURATION IoAddresses
+    VAR_GLOBAL
+
+    END_VAR
+END_CONFIGURATION

src/abstractions/app/SystemConstants/plc_line_HwIdentifiers.st

@@ -9,23 +9,34 @@ variables:
     - "--debug" # Generate debug information for target "1500"
   PLC_NAME: "plc_line"
   DEFAULT_NAMESPACE: "AXOpen.Abstractions"
+  AXTARGET: 10.10.10.120
+  AXTARGETPLATFORMINPUT: .\bin\1500\
+  AX_USERNAME: "adm"
+  AX_TARGET_PWD: "123ABCDabcd$#!"
+  USE_PLC_SIM_ADVANCED: "true"
 devDependencies:
   "@ix-ax/ax-sdk": '0.0.0-dev.0'
 dependencies:
   "@ix-ax/axopen.core": '0.0.0-dev.0'
-installStrategy: strict
+  "@ix-ax/ax.axopen.app": '0.0.0-dev.0'
+  "@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
+  # this is just temporary to be able create hardware configuration using latest hwc version
+  # upto the moment of releasing new catalog 
+  # installStrategy: strict
+  "@ix-ax/ax.latest.packages": '0.0.0-dev.0'
+installStrategy: overridable
 apaxVersion: 3.3.1
 scripts:
   # 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.
+  # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'AX_TARGET_PWD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # DEFAULT_NAMESPACE: Namespace used for HwId and IO addresses
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
   # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
-  # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AX_TARGET_PWD: Password for 'AX_USERNAME'
   # USE_PLC_SIM_ADVANCED with value of "true" will automatically trigger PlcSimAdvanced when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\plcsimadvanced.sh $APAX_YML_NAME $PLC_NAME $AXTARGET
@@ -59,7 +70,7 @@ scripts:
     ..\\..\\scripts\\clean_plc.sh $AXTARGET
 
   ssc: | # setup secure communication, create and import certificates, setup password for AX_USERNAME 
-    ..\\..\\scripts\\setup_secure_communication.sh $PLC_NAME $AX_USERNAME $MY_VERY_STRONG_PASSWORD
+    ..\\..\\scripts\\setup_secure_communication.sh $PLC_NAME $AX_USERNAME $AX_TARGET_PWD
 
   gsd: | # copy and install all gsdml files from library
     ..\\..\\scripts\\copy_and_install_gsd.sh 
@@ -77,7 +88,7 @@ scripts:
     ..\\..\\scripts\\copy_io_addresses.sh $DEFAULT_NAMESPACE $PLC_NAME
 
   hwfd: | # copy and install gsd, copy templates,compile, copy the HwIds, copy the IoAddresses, first download HW using password and upload certificate
-    ..\\..\\scripts\\hw_first_download.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $MY_VERY_STRONG_PASSWORD
+    ..\\..\\scripts\\hw_first_download.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AX_TARGET_PWD
 
   hwu: | # copy and install gsd, copy templates, compile, copy the HwIds, copy the IoAddresses, download HW using certificate
     ..\\..\\scripts\\hw_update.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET
@@ -90,10 +101,10 @@ scripts:
 
   alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw
     START=$(date +%s)
-    ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD $USE_PLC_SIM_ADVANCED
+    ..\\..\\scripts\\all_first.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) " - Finished in :" $(expr $(date +%s) - $START) "s"    
 
   all: | #build and download hardware and software
     START=$(date +%s)
-    ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD $USE_PLC_SIM_ADVANCED
+    ..\\..\\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) " - Finished in :" $(expr $(date +%s) - $START) "s"    

src/abstractions/app/SystemConstants/plc_line_IoAddresses.st

@@ -0,0 +1,13 @@
+Devices:
+- Name: plc_line
+  Modules:
+  - Apply:
+      TemplateName: 6ES7516-3AP03-0AB0_v3_1
+      Arguments:
+        PLCName: plc_line
+        IpAddress_X1: 10.10.10.120/24
+        ProfinetDeviceName_X1: plc_line_x1
+IoSystems:
+- Name: profinet_plc_line
+  ControllerInterfaces:
+  - Ref: plc_line/plc_line/profinet_x1

src/abstractions/app/apax.yml

@@ -1,4 +1,5 @@
 @page "/Documentation"
+@using abstractions_app
 
 <PageTitle>Documentation</PageTitle>
 

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

@@ -1,5 +1,5 @@
 @page "/testing"
-@using librarytemplate
+@using abstractions_app
 
 <PageTitle>Testing</PageTitle>
 

src/abstractions/app/ix-blazor/librarytemplate.blazor/Pages/Documentation.razor

@@ -13,7 +13,7 @@
 using Serilog;
 using AXOpen;
 using AXOpen.Logging;
-using librarytemplate;
+using abstractions_app;
 
 var builder = WebApplication.CreateBuilder(args);
 

src/abstractions/app/ix-blazor/librarytemplate.blazor/Pages/Testing.razor

@@ -5,18 +5,44 @@
 using System.Text;
 using System.Threading.Tasks;
 using AXSharp.Connector.S71500.WebApi;
+using System.Net.Security;
+using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 
-namespace librarytemplate
+namespace abstractions_app
 {
-    public static class Entry
+    public class ConnectionConfig
+    {
+        public string TargetIp { get; set; } = string.Empty;
+        public string UserName { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool>? CertificateValidationCallback { get; set; }
+        public bool IgnoreSslErrors { get; set; } = true;
+    }
+
+    public class TwinConnectorSelector
     {
-        private static readonly string TargetIp = Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP 
-        private const string UserName = "Everybody"; //<- replace by user name you have set up in your WebAPI settings
-        private const string Pass = ""; // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
+        public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP 
+        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.
+        private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings        
         private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
+         private static string CertificatePath = "..\\certs\\plc_line\\plc_line.cer";
+
+        static readonly X509Certificate2 Certificate = new X509Certificate2(CertificatePath);
+
 
-        public static abstractions_appTwinController Plc { get; }
+        private static bool CertificateValidation(HttpRequestMessage requestMessage, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        {
+            return certificate.Thumbprint == Certificate.Thumbprint;
+        }
+
+        public static abstractions_appTwinController SecurePlc { get; }
             = new(ConnectorAdapterBuilder.Build()
-                .CreateWebApi(TargetIp, UserName, Pass, IgnoreSslErrors));
+            .CreateWebApi(TargetIp, UserName, Pass, CertificateValidation, IgnoreSslErrors));
+    }
+
+    public static class Entry
+    {
+        public static abstractions_appTwinController Plc { get; } = TwinConnectorSelector.SecurePlc;
     }
 }

src/abstractions/app/ix-blazor/librarytemplate.blazor/Program.cs

@@ -20,9 +20,17 @@
     <Content Include=".meta\**" />
   </ItemGroup>
 
-	<ItemGroup>
+  <!-- <ItemGroup> -->
+    <!-- <None Include="..\certs\plc_line\plc_line.cer" Link="certs\plc_line\plc_line.cer"> -->
+      <!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
+    <!-- </None> -->
+  <!-- </ItemGroup> -->
+
+
+  <ItemGroup>
 	  <ProjectReference Include="..\..\..\core\src\AXOpen.Core\ix_ax_axopen_core.csproj" />
 	  <ProjectReference Include="..\..\src\AXOpen.Abstractions\ix_ax_axopen_abstractions.csproj" />
 	  <ProjectReference Include="..\..\..\timers\src\AXOpen.Timers\ix_ax_axopen_timers.csproj" />
+	  <ProjectReference Include="..\..\..\simatic1500\ctrl\ix\ix_ax_axopen_simatic1500.csproj" />
 	</ItemGroup>
 </Project>

src/abstractions/app/ix/Entry.cs

@@ -0,0 +1,23 @@
+NAMESPACE AXOpen.Abstractions
+    TYPE
+        HwIdentifiers : WORD
+        (
+            plc_line_HwID :=	WORD#32,
+            plc_line_Rail_0_HwID :=	WORD#257,
+            plc_line_plc_line_HwID :=	WORD#48,
+            plc_line_plc_line_CPU_display_1_HwID :=	WORD#54,
+            plc_line_plc_line_Card_reader_writer_1_HwID :=	WORD#51,
+            plc_line_plc_line_DP_interface_1_HwID :=	WORD#60,
+            plc_line_plc_line_OPC_UA_1_HwID :=	WORD#117,
+            plc_line_plc_line_profinet_x1_HwID :=	WORD#64,
+            plc_line_plc_line_profinet_x1_Port_1_HwID :=	WORD#65,
+            plc_line_plc_line_profinet_x1_Port_2_HwID :=	WORD#66,
+            plc_line_plc_line_profinet_x2_HwID :=	WORD#72,
+            plc_line_plc_line_profinet_x2_Port_3_HwID :=	WORD#73,
+            plc_line_plc_line_virtual_communication_interface_HwID :=	WORD#135,
+            profinet_plc_line_HwID :=	WORD#256,
+    
+            NONE := WORD#0
+        );
+    END_TYPE
+END_NAMESPACE

src/abstractions/app/ix/abstractions_app.csproj

@@ -0,0 +1,9 @@
+NAMESPACE AXOpen.Abstractions
+    TYPE
+        {S7.extern=ReadWrite}
+        {#ix-attr:[Container(Layout.Wrap)]}
+        Inputs : STRUCT
+            noInputsFoundInTheHwConfig AT %B0: BYTE;
+        END_STRUCT;
+    END_TYPE
+END_NAMESPACE

src/abstractions/app/src/IO/HwIdentifiers.st

@@ -0,0 +1,9 @@
+NAMESPACE AXOpen.Abstractions
+    TYPE
+        {S7.extern=ReadWrite}
+        {#ix-attr:[Container(Layout.Wrap)]}
+        Outputs : STRUCT
+            noOutputsFoundInTheHwConfig AT %B0: BYTE;
+        END_STRUCT;
+    END_TYPE
+END_NAMESPACE

src/abstractions/app/src/IO/Inputs.st

@@ -6,12 +6,12 @@ PROGRAM MyProgram
         _rtm : AXOpen.S71500.Rtm;
     END_VAR
 
-    sandbox.Run();    
     sandbox.InjectRtc(_rtc);
     sandbox.InjectRtm(_rtm);
+    sandbox.Run();    
 
 
-    documentation.Run();
     documentation.InjectRtc(_rtc);
     documentation.InjectRtm(_rtm);
+    documentation.Run();
 END_PROGRAM

src/abstractions/app/src/IO/Outputs.st

@@ -1 +1,8 @@
-dotnet slngen this.proj -o this.sln --folders true --launch false
+dotnet slngen this.proj -o this.sln --folders true --launch false
+
+$currentDirectory = Split-Path -Leaf (Get-Location).Path
+$sourceFile = Join-Path (Get-Location).Path "this.sln"
+$destinationFile = Join-Path (Get-Location).Path ("$currentDirectory.sln")
+if (Test-Path $sourceFile) {
+    Copy-Item -Path $sourceFile -Destination $destinationFile -Force
+}