From a7123c28a0f1aa4b8c06ccef754310fb5b50a800 Mon Sep 17 00:00:00 2001 From: Ruben Martinez Date: Tue, 16 Jul 2024 14:20:03 +0200 Subject: [PATCH 1/5] New CoE data structures added New CoE Enum --- .../tc_project_app/tc_project_app.plcproj | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 4820150..f204a65 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -46,6 +46,9 @@ Code + + Code + Code @@ -82,6 +85,9 @@ Code + + Code + Code @@ -157,6 +163,9 @@ Code + + Code + Code @@ -448,8 +457,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -519,16 +528,16 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From 32de84bf26e3e6c15db28918567d9c8384785852 Mon Sep 17 00:00:00 2001 From: Ruben Martinez Date: Thu, 12 Sep 2024 13:35:56 +0200 Subject: [PATCH 2/5] CoE state Enum added --- solution/tc_project_app/tc_project_app.plcproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index f204a65..e1dd82c 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -88,6 +88,9 @@ Code + + Code + Code From 851c64c99df87091f997ea64839702313a183818 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 25 Nov 2024 15:42:52 +0100 Subject: [PATCH 3/5] update tc_mca_Std_lib pointer and build solution --- solution/_Config/PLC/tc_project_app.xti | 4 ++++ solution/tc_project_app/tc_mca_std_lib | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index dee3b3f..4d9f5b7 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,7 +1,11 @@ +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index a44a596..856f9f0 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit a44a59664c0a8f855c0909b8e758e71c676d3c56 +Subproject commit 856f9f0b223c9f73e9972edb552c15c12e62d708 From 76c03241655c1fa64a8c2e73d52439999215450d Mon Sep 17 00:00:00 2001 From: federicorojas Date: Tue, 26 Nov 2024 09:46:04 +0100 Subject: [PATCH 4/5] Update the tc_mca_std_lib pointer and build solution --- solution/tc_project_app/GlobalTextList.TcGTLO | 20 +++++++++++++++++++ solution/tc_project_app/tc_mca_std_lib | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO index 8b5dec5..661dfb0 100644 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ b/solution/tc_project_app/GlobalTextList.TcGTLO @@ -340,6 +340,11 @@ "English" + + "720" + "eReadCoEParameter" + + "1004" "eReadParameter" @@ -350,6 +355,11 @@ "errID" + + "432" + "eWriteCoEParameter" + + "768" "eWriteParameter" @@ -420,6 +430,11 @@ "fReadAxisParameter" + + "457" + "fReadCoEParam" + + "954" "fVelocity" @@ -435,6 +450,11 @@ "fWriteAxisParameter" + + "1221" + "fWriteCoEParam" + + "299" "gearIn" diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 856f9f0..e3b4a3c 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 856f9f0b223c9f73e9972edb552c15c12e62d708 +Subproject commit e3b4a3ce2c7c4c09f24891af45aca22741d50989 From d83c16395de287706b46c77ef7d8ccf4a5fd2db3 Mon Sep 17 00:00:00 2001 From: federicorojas Date: Tue, 14 Jan 2025 13:28:24 +0100 Subject: [PATCH 5/5] Update pointer for tc_mca_std_lib to commit 1abc0e1 --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index e3b4a3c..1abc0e1 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit e3b4a3ce2c7c4c09f24891af45aca22741d50989 +Subproject commit 1abc0e13bc6d66b4cfe6e6ecc5a615be7123ef9d