From 0ffd68a57406ee7db5abe8edfc4f25899f05c7d6 Mon Sep 17 00:00:00 2001 From: Frank Suxdorf Date: Thu, 16 May 2019 13:33:12 +0200 Subject: [PATCH 1/6] Add nested strutures to tc_mca_std_lib --- solution/solution.tsproj | 10 +++++----- solution/tc_project_app/tc_project_app.plcproj | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/solution/solution.tsproj b/solution/solution.tsproj index 313b9a2..ee3987e 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,5 +1,5 @@ - + NCTOPLC_AXIS_REF_STATE @@ -931,28 +931,28 @@ External Setpoint Generation: PlcTask Inputs - GVL.axes[1].bLimitFwd + GVL.axes[1].inputs.bLimitFwd BOOL - GVL.axes[1].bLimitBwd + GVL.axes[1].inputs.bLimitBwd BOOL - GVL.axes[1].bHomeSensor + GVL.axes[1].inputs.bHomeSensor BOOL - GVL.axes[1].bEncLAtch + GVL.axes[1].inputs.bEncLAtch diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 325287e..66dc2e4 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -22,9 +22,21 @@ Code + + Code + + + Code + Code + + Code + + + Code + Code From d2e05e98cf4e122d4844897360a2e3f8ca1ff01f Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 17 Jun 2019 16:38:05 +0200 Subject: [PATCH 2/6] integration bracnh ponitng to integration branch in tc_mca_std_lib --- 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 936ed0e..5eb56db 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 936ed0e9d0f34f876c91cf857ee389ed8ea4eb61 +Subproject commit 5eb56db806fd52bae29f59bfb59f2a42328fb61d From a24a629546ed12495a1ef0cb0ba3497c37c746c8 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Mon, 24 Jun 2019 17:13:41 +0100 Subject: [PATCH 3/6] Removed testing axis --- solution/_Config/NC/Axes/Axis 1.xti | 1549 ----------------- solution/solution.tsproj | 13 +- solution/tc_project_app/GlobalTextList.TcGTLO | 259 --- .../tc_project_app/tc_project_app.plcproj | 3 - 4 files changed, 1 insertion(+), 1823 deletions(-) delete mode 100644 solution/_Config/NC/Axes/Axis 1.xti delete mode 100644 solution/tc_project_app/GlobalTextList.TcGTLO diff --git a/solution/_Config/NC/Axes/Axis 1.xti b/solution/_Config/NC/Axes/Axis 1.xti deleted file mode 100644 index 7ed44bb..0000000 --- a/solution/_Config/NC/Axes/Axis 1.xti +++ /dev/null @@ -1,1549 +0,0 @@ - - - - - UINTARR2 - 32 - UINT - - 0 - 2 - - - [%u, %u] - [0] - [1] - - - 0x%08x [%u, %u] - . - [0] - [1] - - - 0x%08x (%u) - . - . - - - - NCENCODERSTRUCT_IN2B - 320 - - nDataIn1 - UINTARR2 - 32 - 0 - - - nDataIn2 - UINTARR2 - 32 - 32 - - - nState1 - USINT - 8 - 64 - - - nState2 - USINT - 8 - 72 - - - nState3 - USINT - 8 - 80 - - - nState4 - USINT - - - - 8 - 88 - - - nDataIn3 - UINTARR2 - 32 - 96 - - - nDataIn4 - UINTARR2 - 32 - 128 - - - nDataIn5 - UINTARR2 - 32 - 160 - - - nDataIn6 - UINTARR2 - 32 - 192 - - - nState5 - USINT - 8 - 224 - - - nState6 - USINT - 8 - 232 - - - nState7 - USINT - 8 - 240 - - - nState8 - USINT - 8 - 248 - - - nDcInputTime - DINT - 32 - 256 - - - nDataIn7 - UINTARR2 - 32 - 288 - - - - NCENCODERSTRUCT_IN - - 96 - - - - - - NCENCODERSTRUCT_OUT2 - 320 - - nDataOut1 - UINTARR2 - 32 - 0 - - - nDataOut2 - UINTARR2 - 32 - 32 - - - nCtrl1 - USINT - 8 - 64 - - - nCtrl2 - USINT - 8 - 72 - - - nCtrl3 - USINT - 8 - 80 - - - nCtrl4 - USINT - 8 - 88 - - - nDataOut3 - UINTARR2 - 32 - 96 - - - nDataOut4 - UINTARR2 - 32 - 128 - - - nDataOut5 - UINTARR2 - 32 - 160 - - - nDataOut6 - UINTARR2 - 32 - 192 - - - nCtrl5 - USINT - 8 - 224 - - - nCtrl6 - USINT - 8 - 232 - - - nCtrl7 - USINT - 8 - 240 - - - nCtrl8 - USINT - 8 - 248 - - - - NCENCODERSTRUCT_OUT - - 96 - - - - - - NCDRIVESTRUCT_IN2 - 320 - - nDataIn1 - UINTARR2 - 32 - 0 - - - nDataIn2 - UINTARR2 - 32 - 32 - - - nState1 - USINT - 8 - 64 - - - nState2 - USINT - 8 - 72 - - - nState3 - USINT - 8 - 80 - - - nState4 - USINT - - - - 8 - 88 - - - nDataIn3 - UINTARR2 - 32 - 96 - - - nDataIn4 - UINTARR2 - 32 - 128 - - - nDataIn5 - UINTARR2 - 32 - 160 - - - nDataIn6 - UINTARR2 - 32 - 192 - - - nState5 - USINT - 8 - 224 - - - nState6 - USINT - 8 - 232 - - - nState7 - USINT - 8 - 240 - - - nState8 - USINT - 8 - 248 - - - nDcOutputTime - DINT - 32 - 256 - - - - NCDRIVESTRUCT_IN - - 96 - - - - - - NCDRIVESTRUCT_OUT2 - 320 - - nDataOut1 - UINTARR2 - 32 - 0 - - - nDataOut2 - UINTARR2 - 32 - 32 - - - nCtrl1 - USINT - 8 - 64 - - - nCtrl2 - USINT - 8 - 72 - - - nCtrl3 - USINT - 8 - 80 - - - nCtrl4 - USINT - 8 - 88 - - - nDataOut3 - UINTARR2 - 32 - 96 - - - nDataOut4 - UINTARR2 - 32 - 128 - - - nDataOut5 - UINTARR2 - 32 - 160 - - - nDataOut6 - UINTARR2 - 32 - 192 - - - nCtrl5 - USINT - 8 - 224 - - - nCtrl6 - USINT - 8 - 232 - - - nCtrl7 - USINT - 8 - 240 - - - nCtrl8 - USINT - 8 - 248 - - - - NCDRIVESTRUCT_OUT - - 96 - - - - - - PLCTONC_AXIS_REF_CTRL - 32 - - Enable - BIT - 1 - 0 - - - FeedEnablePlus - BIT - 1 - 1 - - - FeedEnableMinus - BIT - 1 - 2 - - - HomingSensor - BIT - 1 - 5 - - - AcceptBlockedDrive - BIT - 1 - 8 - - - PlcDebugFlag - BIT - 1 - 30 - - - NcDebugFlag - BIT - 1 - 31 - - - %08x - - - 0x%08x - - - 16#%08X - - - - PLCTONC_AXIS_REF - 1024 - - ControlDWord - PLCTONC_AXIS_REF_CTRL - 32 - 0 - - - Override - UDINT - 32 - 32 - - - AxisModeRequest - UDINT - 32 - 64 - - - AxisModeDWord - UDINT - 32 - 96 - - - AxisModeLReal - LREAL - 64 - 128 - - - PositionCorrection - LREAL - 64 - 192 - - - ExtSetPos - LREAL - 64 - 256 - - - ExtSetVelo - LREAL - 64 - 320 - - - ExtSetAcc - LREAL - 64 - 384 - - - ExtSetDirection - DINT - 32 - 448 - - - ExtControllerOutput - LREAL - 64 - 512 - - - GearRatio1 - LREAL - 64 - 576 - - - GearRatio2 - LREAL - 64 - 640 - - - GearRatio3 - LREAL - 64 - 704 - - - GearRatio4 - LREAL - 64 - 768 - - - MapState - BOOL - 8 - 832 - - - PlcCycleControl - BYTE - 8 - 840 - - - PlcCycleCount - BYTE - 8 - 848 - - - - NcStructType - 1 - - - - - NCAXLESTRUCT_FROMPLC3 - - - - - NCTOPLC_AXIS_REF_STATE - 32 - - Operational - BIT - 1 - 0 - - - Homed - BIT - 1 - 1 - - - NotMoving - BIT - 1 - 2 - - - InPositionArea - BIT - 1 - 3 - - - InTargetPosition - BIT - 1 - 4 - - - Protected - BIT - 1 - 5 - - - ErrorPropagationDelayed - BIT - 1 - 6 - - - HasBeenStopped - BIT - 1 - 7 - - - HasJob - BIT - 1 - 8 - - - PositiveDirection - BIT - 1 - 9 - - - NegativeDirection - BIT - 1 - 10 - - - HomingBusy - BIT - 1 - 11 - - - ConstantVelocity - BIT - 1 - 12 - - - Compensating - BIT - 1 - 13 - - - ExtSetPointGenEnabled - BIT - 1 - 14 - - - PhasingActive - BIT - 1 - 15 - - - ExternalLatchValid - BIT - 1 - 16 - - - NewTargetPos - BIT - 1 - 17 - - - ContinuousMotion - BIT - 1 - 19 - - - ControlLoopClosed - BIT - 1 - 20 - - - CamTableQueued - BIT - 1 - 21 - - - CamDataQueued - BIT - 1 - 22 - - - CamScalingPending - BIT - 1 - 23 - - - CmdBuffered - BIT - 1 - 24 - - - PTPmode - BIT - 1 - 25 - - - SoftLimitMinExceeded - BIT - 1 - 26 - - - SoftLimitMaxExceeded - BIT - 1 - 27 - - - DriveDeviceError - BIT - 1 - 28 - - - MotionCommandsLocked - BIT - 1 - 29 - - - IoDataInvalid - BIT - 1 - 30 - - - Error - BIT - 1 - 31 - - - %08x - - - 0x%08x - - - 16#%08X - - - - NCTOPLC_AXIS_REF_OPMODE - 32 - - OpModePosAreaMonitoring - BIT - 1 - 0 - - - OpModeTargetPosMonitoring - BIT - 1 - 1 - - - OpModeLoop - BIT - 1 - 2 - - - OpModeMotionMonitoring - BIT - 1 - 3 - - - OpModePEHTimeMonitoring - BIT - 1 - 4 - - - OpModeBacklashCompensation - BIT - 1 - 5 - - - OpModeDelayedErrorReaction - BIT - 1 - 6 - - - OpModeModulo - BIT - 1 - 7 - - - OpModeSimulationAxis - BIT - 1 - 8 - - - OpModePosLagMonitoring - BIT - 1 - 16 - - - OpModeVeloLagMonitoring - BIT - 1 - 17 - - - OpModeSoftLimitMinMonitoring - BIT - 1 - 18 - - - OpModeSoftLimitMaxMonitoring - BIT - 1 - 19 - - - OpModePosCorrection - BIT - 1 - 20 - - - OpModeAllowSlaveCommands - BIT - 1 - 21 - - - OpModeAllowExtSetAxisCommands - BIT - 1 - 22 - - - ApplicationRequest - BIT - 1 - 23 - - - - NCTOPLC_AXIS_REF_STATE2_FLAGS - 32 - - AvoidingCollision - BIT - 1 - 0 - - - %08x - - - 0x%08x - - - 16#%08X - - - - NCTOPLC_AXIS_REF_STATE2 - 32 - - Value - DWORD - 32 - 0 - - - Flags - NCTOPLC_AXIS_REF_STATE2_FLAGS - 32 - 0 - - - %08x - - - 0x%08x - - - 16#%08X - - - - NCTOPLC_AXIS_REF_CAMCOUPLINGSTATE - 8 - - CamActivationPending - BIT - 1 - 0 - - - CamDeactivationPending - BIT - 1 - 1 - - - CamActive - BIT - 1 - 2 - - - CamDataQueued - BIT - 1 - 6 - - - CamScalingPending - BIT - 1 - 7 - - - - UINTARR8 - 128 - UINT - - 0 - 8 - - - - NCTOPLC_AXIS_REF - 2048 - - StateDWord - NCTOPLC_AXIS_REF_STATE - 32 - 0 - - - ErrorCode - UDINT - 32 - 32 - - - AxisState - UDINT - - - - 32 - 64 - - - AxisModeConfirmation - UDINT - 32 - 96 - - - HomingState - UDINT - - - - 32 - 128 - - - CoupleState - UDINT - - - - 32 - 160 - - - SvbEntries - UDINT - 32 - 192 - - - SafEntries - UDINT - 32 - 224 - - - AxisId - UDINT - 32 - 256 - - - OpModeDWord - NCTOPLC_AXIS_REF_OPMODE - 32 - 288 - - - ActPos - LREAL - 64 - 320 - - - ModuloActPos - LREAL - 64 - 384 - - - ActiveControlLoopIndex - UINT - 16 - 448 - - - ControlLoopIndex - UINT - 16 - 464 - - - ModuloActTurns - DINT - 32 - 480 - - - ActVelo - LREAL - 64 - 512 - - - PosDiff - LREAL - 64 - 576 - - - SetPos - LREAL - 64 - 640 - - - SetVelo - LREAL - 64 - 704 - - - SetAcc - LREAL - 64 - 768 - - - TargetPos - LREAL - 64 - 832 - - - ModuloSetPos - LREAL - 64 - 896 - - - ModuloSetTurns - DINT - 32 - 960 - - - CmdNo - UINT - 16 - 992 - - - CmdState - UINT - 16 - 1008 - - - SetJerk - LREAL - 64 - 1024 - - - SetTorque - LREAL - 64 - 1088 - - - ActTorque - LREAL - 64 - 1152 - - - StateDWord2 - NCTOPLC_AXIS_REF_STATE2 - 32 - 1216 - - - StateDWord3 - DWORD - 32 - 1248 - - - TouchProbeState - DWORD - 32 - 1280 - - - TouchProbeCounter - DWORD - 32 - 1312 - - - CamCouplingState - NCTOPLC_AXIS_REF_CAMCOUPLINGSTATE - - 0 - 8 - - 64 - 1344 - - - CamCouplingTableID - UINTARR8 - 128 - 1408 - - - ActTorqueDerivative - LREAL - 64 - 1536 - - - SetTorqueDerivative - LREAL - 64 - 1600 - - - ActPosWithoutPosCorrection - LREAL - 64 - 1792 - - - ActAcc - LREAL - 64 - 1856 - - - DcTimeStamp - UDINT - 32 - 1920 - - - - NcStructType - 2 - - - - - NCAXLESTRUCT_TOPLC - - - NCAXLESTRUCT_TOPLC2 - - - NCAXLESTRUCT_TOPLC3 - - - NCAXLESTRUCT_TOPLC4 - - - - - - - - - - - - - - - __FILENAME__ - - - - - - Inputs - - In - NCENCODERSTRUCT_IN2B - 1024 - - nDataIn1 - - - nDataIn2 - - - nState4 - - - - - - nDataIn3 - - - nDataIn4 - - - nDataIn5 - - - nDataIn6 - - - nDataIn7 - - - - - Outputs - - Out - NCENCODERSTRUCT_OUT2 - 2048 - - nDataOut1 - - - nDataOut2 - - - nDataOut3 - - - nDataOut4 - - - nDataOut5 - - - nDataOut6 - - - - - - - - - - Inputs - - In - NCDRIVESTRUCT_IN2 - 1344 - - nDataIn1 - - - nDataIn2 - - - nState4 - - - - - - nDataIn3 - - - nDataIn4 - - - nDataIn5 - - - nDataIn6 - - - - - Outputs - - Out - NCDRIVESTRUCT_OUT2 - 2368 - - nDataOut1 - - - nDataOut2 - - - nCtrl2 - - - - - - nCtrl3 - - - - - - nDataOut3 - - - nDataOut4 - - - nDataOut5 - - - nDataOut6 - - - - - - - - - - - Inputs - - FromPlc - PLCTONC_AXIS_REF - - - - Outputs - - ToPlc - NCTOPLC_AXIS_REF - - AxisState - - - - - - HomingState - - - - - - CoupleState - - - - - - - - diff --git a/solution/solution.tsproj b/solution/solution.tsproj index bba7a7b..ee3987e 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,5 +1,5 @@ - + NCTOPLC_AXIS_REF_STATE @@ -912,7 +912,6 @@ External Setpoint Generation: NC-Task 1 SVB - @@ -1029,15 +1028,5 @@ External Setpoint Generation: - - - - - - - - - - diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO deleted file mode 100644 index 8587aeb..0000000 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - "377" - "%2.2f" - - - - "922" - "%d" - - - - "254" - "accel" - - - - "192" - "actPos" - - - - "403" - "actVel" - - - - "422" - "AXESMAX" - - - - "214" - "axisSel" - - - - "605" - "bBusy" - - - - "432" - "bBwEnabled" - - - - "687" - "bDone" - - - - "313" - "bEnabled" - - - - "3" - "bError" - - - - "572" - "bExecute" - - - - "606" - "bFWEnabled" - - - - "528" - "bFwEnabled" - - - - "42" - "bHomed" - - - - "647" - "bResetDone" - - - - "68" - "bWarning" - - - - "873" - "Change to Default Language" - - - - "757" - "Change to Test Language" - - - - "918" - "decel" - - - - "743" - "ENABLE" - - - - "768" - "ENABLE BW" - - - - "98" - "ENABLE FW" - - - - "779" - "English" - - - - "479" - "errID" - - - - "286" - "fAcceleration" - - - - "821" - "fAccleration" - - - - "306" - "fDeceleration" - - - - "618" - "fPosition" - - - - "766" - "fVelocity" - - - - "26" - "jog+/- reset stop home" - - - - "331" - "jogBw" - - - - "468" - "jogFw" - - - - "99" - "moveAbsolute" - - - - "935" - "moveModulo" - - - - "50" - "moveRelative" - - - - "453" - "moveVelocity" - - - - "830" - "PLC axes available: %d" - - - - "852" - "POSITION" - - - - "985" - "reset" - - - - "293" - "stop" - - - - "780" - "targetPosition" - - - - "633" - "Test Language" - - - - "239" - "toggle" - - - - "1" - "vel" - - - - "752" - "VELOCITY" - - - - - {d7005498-b4fa-4a56-8593-01efab31a22a} - {eb0543d6-24e5-4c0d-b12a-2b173f65a3e6} - {58c39072-3512-4d2d-9972-e2fb2a30b0d1} - - - - System.Collections.ArrayList - {63784cbb-9ba0-45e6-9d69-babf3f040511} - System.Guid - System.String - {53da1be7-ad25-47c3-b0e8-e26286dad2e0} - - - - \ No newline at end of file diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 4f997ed..373586a 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -16,9 +16,6 @@ true - - Code - Code From d04cf0ed4b58d50f7a886ede3be8f63f94b5262b Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 28 Jun 2019 14:46:57 +0200 Subject: [PATCH 4/6] Change the fbErrorList to the new fbErrorSystem in MAIN Update the FB's in ERROR() --- solution/tc_project_app/POUs/MAIN.TcPOU | 45 +++++++++---------- solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.plcproj | 12 +++-- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index ef9925b..ad52d92 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -1,5 +1,5 @@  - + , - nNoError=> , - nNoOverflow=> , + nSelectedError=> , pErrorSystem=> ); (*call all the necessary instance (input assistance F2 or right click) according to the terminals that you have in your hardware and add "TRUE" in the input En, the corresponding number of termianl to the iTerminal_ID and -the variable "fbErrorList.pErrorSystem" to the input ErrorSystem in each FB E. g. : +the variable "fbErrorSystem.pErrorSystem" to the input ErrorSystem in each FB E. g. : fbEL1808( En:= TRUE, - iTerminal_ID:= 1, + iTerminal_ID:= 01, ErrorSystem:= fbErrorList.pErrorSystem, EnO=> , - bDi_1=> , - bDi_2=> , - bDi_3=> , - bDi_4=> , - bDi_5=> , - bDi_6=> , - bDi_7=> , - bDi_8=> , bError=> ); *) // + ]]> @@ -110,11 +108,10 @@ fbEL1808( - + - - - + + diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 5eb56db..e52c5ad 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 5eb56db806fd52bae29f59bfb59f2a42328fb61d +Subproject commit e52c5ad7be5ffebbfa3ce4f16908e4597f0e71ac diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 373586a..627dc92 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -36,7 +36,8 @@ Code - + + Code @@ -57,16 +58,19 @@ Code - + Code - + + Code + + Code Code - + Code From ed7c121b3dcc0fc6c8461416818f0dc103cd9854 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 28 Jun 2019 15:11:29 +0200 Subject: [PATCH 5/6] Update the solution strucutre with all the new Hardware FB's and FB_axis if error statements Update the solution strucutre tree with the new FB's Modify the if statememts of the FB_Axis error handling for proper review --- solution/solution.tsproj | 2 +- solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.plcproj | 46 ++++++++++--------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/solution/solution.tsproj b/solution/solution.tsproj index ee3987e..3e07037 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,5 +1,5 @@ - + NCTOPLC_AXIS_REF_STATE diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index e52c5ad..dfe1a9e 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit e52c5ad7be5ffebbfa3ce4f16908e4597f0e71ac +Subproject commit dfe1a9ecb84671c586f3b859a4e9a152313442d6 diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 627dc92..2a644cd 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -64,9 +64,6 @@ Code - - Code - Code @@ -85,15 +82,15 @@ Code - - Code - Code Code + + Code + Code @@ -103,9 +100,6 @@ Code - - Code - Code @@ -124,22 +118,37 @@ Code - + Code - + Code - + Code - + Code - + Code - + + Code + + + Code + + + Code + + + Code + + + Code + + Code @@ -148,9 +157,6 @@ Code - - Code - Code @@ -210,10 +216,8 @@ - - + - From f3ed21416267991b14521a88c630014d69c93c6e Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 5 Jul 2019 11:32:36 +0200 Subject: [PATCH 6/6] Add folder FeedbackTerminals to the solution tree --- solution/tc_project_app/tc_project_app.plcproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 2a644cd..7dfd523 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -6,7 +6,7 @@ {fb261665-fd20-4bf2-97f8-2854c82b752d} True tc_project_app - 3.1.4022.2 + 3.1.4022.6 {047dee04-c246-47b2-8ccc-a15e36987c43} {ae4eb5ee-6030-47a6-bf35-5a6afd9efeeb} {5ef19bd0-aca2-493f-b2a1-89e363647697} @@ -217,6 +217,7 @@ +