Skip to content

Commit

Permalink
Resolving merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaushikMalapati
KaushikMalapati committed Dec 4, 2024
1 parent 91a3b79 commit 9367f89
Show file tree
Hide file tree
Showing 3 changed files with 107,925 additions and 20 deletions.
32 changes: 16 additions & 16 deletions plc-kfe-motion.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@ Global
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 4 additions & 4 deletions plc-kfe-motion/_Config/IO/Device 1 (EtherCAT).xti
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.30" ClassName="CDevEtherCATDef" SubType="111">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="172.21.92.58.2.1" RemoteName="Device 1 (EtherCAT)">
<Name>Device 1 (EtherCAT)</Name>
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.35" ClassName="CDevEtherCATDef" SubType="111">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="172.21.92.58.2.1" RemoteName="Device 1 (EtherCAT)" InfoImageId="2">
<Name>__FILENAME__</Name>
<AddressInfo>
<Ccat>
<Address>-268435456</Address>
Expand Down
Loading

0 comments on commit 9367f89

Please sign in to comment.