Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit e3fa2eb

Browse files
github-actions[bot]peterbarancek
github-actions[bot]
and
peterbarancek
authored
[BUG] Fix Byte Conversion : TcoBytesToReal and TcoRealToBytes (#584)
* Create draft PR for #583 * +conversion moved to TcoUtilities * fix conversion --------- Co-authored-by: peterbarancek <peterbarancek@users.noreply.github.com> Co-authored-by: Peter Barancek <peter.barancek@mts.sk>
1 parent 7be9a58 commit e3fa2eb

17 files changed

Lines changed: 313 additions & 280 deletions

File tree

‎src/TcoCognexVision/src/TcoCognexVisionConnector/TcoCognexVisionConnector.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<ProjectReference Include="..\..\..\TcoAbstractions\src\TcoAbstractionsConnector\TcoAbstractionsConnector.csproj" />
3434
<ProjectReference Include="..\..\..\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj" />
3535
<ProjectReference Include="..\..\..\TcoIo\src\TcoIoConnector\TcoIoConnector.csproj" />
36+
<ProjectReference Include="..\..\..\TcoUtilities\src\TcoUtilitiesConnector\TcoUtilitiesConnector.csproj" />
3637
</ItemGroup>
3738

3839
<ItemGroup>

‎src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/Conversion/FromBytes/TcoBytesToReal.TcPOU‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/Conversion/ToBytes/TcoRealToBytes.TcPOU‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/Structs/TcoDatamanConfig_v_5_x_x.TcDUT‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
2+
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.10">
33
<DUT Name="TcoDatamanConfig_v_5_x_x" Id="{511d8c94-eb01-0087-0253-264e18e831b8}">
4-
<Declaration><![CDATA[TYPE TcoDatamanConfig_v_5_x_x :
5-
STRUCT
6-
ResultDataSize : eDatamanResultDataSize_v_5_x_x := eDatamanResultDataSize_v_5_x_x.RESULT_DATA_64B;
7-
UserDataSize : eDatamanUserDataSize_v_5_x_x := eDatamanUserDataSize_v_5_x_x.USER_DATA_64B;
8-
DataFormat : eTcoDataFormat := eTcoDataFormat .BigEndian;
9-
ContinuousReading : BOOL := FALSE;
10-
InfoTime : TIME := T#2S;
11-
ErrorTime : TIME := T#5S;
12-
END_STRUCT
4+
<Declaration><![CDATA[TYPE
5+
TcoDatamanConfig_v_5_x_x :
6+
STRUCT
7+
ResultDataSize : eDatamanResultDataSize_v_5_x_x := eDatamanResultDataSize_v_5_x_x.RESULT_DATA_64B;
8+
UserDataSize : eDatamanUserDataSize_v_5_x_x := eDatamanUserDataSize_v_5_x_x.USER_DATA_64B;
9+
DataFormat : eTcoDataFormat := TcoUtilities.eTcoDataFormat.BigEndian;
10+
ContinuousReading : BOOL := FALSE;
11+
InfoTime : TIME := T#2S;
12+
ErrorTime : TIME := T#5S;
13+
END_STRUCT
1314
END_TYPE
1415
]]></Declaration>
1516
</DUT>

‎src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
2+
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.10">
33
<POU Name="TcoDataman_v_5_x_x" Id="{acfa500c-75b0-406d-8872-dce797f24ef6}" SpecialFunc="None">
44
<Declaration><![CDATA[FUNCTION_BLOCK TcoDataman_v_5_x_x EXTENDS TcoIo.TcoPnIoComponent IMPLEMENTS TcoAbstractions.ITcoCodeReader
55
VAR_IN_OUT
@@ -223,7 +223,7 @@ IF (inPosition +_size) > TcoVisionParams.MAX_BYTE_ARRAY THEN
223223
RETURN;
224224
END_IF
225225
226-
GetResultAsDint := TcoBytesToDint(THIS^._config.DataFormat, THIS^._results.Data[inPosition],
226+
GetResultAsDint := TcoUtilities.TcoBytesToDint(THIS^._config.DataFormat, THIS^._results.Data[inPosition],
227227
THIS^._results.Data[inPosition+1],
228228
THIS^._results.Data[inPosition+2],
229229
THIS^._results.Data[inPosition+3]);
@@ -258,7 +258,7 @@ IF (inPosition +_size) > TcoVisionParams.MAX_BYTE_ARRAY THEN
258258
RETURN;
259259
END_IF
260260
261-
GetResultAsReal := TcoBytesToReal(THIS^._config.DataFormat, THIS^._results.Data[inPosition],
261+
GetResultAsReal := TcoUtilities.TcoBytesToReal(THIS^._config.DataFormat, THIS^._results.Data[inPosition],
262262
THIS^._results.Data[inPosition+1],
263263
THIS^._results.Data[inPosition+2],
264264
THIS^._results.Data[inPosition+3]);

‎src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoInsight/v_5_x_x/Structs/TcoInsightConfig_v_5_x_x.TcDUT‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
2+
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.10">
33
<DUT Name="TcoInsightConfig_v_5_x_x" Id="{4f2c0f1b-fa0b-09ae-14c5-7f6db18badfb}">
4-
<Declaration><![CDATA[TYPE TcoInsightConfig_v_5_x_x :
5-
STRUCT
6-
ResultDataSize : eTcoInsightResultDataSize_v_5_x_x := eTcoInsightResultDataSize_v_5_x_x.RESULT_DATA_64B;
7-
UserDataSize : eTcoInsightUserDataSize_v_5_x_x := eTcoInsightUserDataSize_v_5_x_x.USER_DATA_64B;
8-
DataFormat : eTcoDataFormat := eTcoDataFormat .BigEndian;
9-
MaxJobNumber : UINT := 999;
10-
InfoTime : TIME := T#2S;
11-
ErrorTime : TIME := T#5S;
12-
// ServiceJobNumber : UINT;
13-
// ServiceJobName : STRING;
14-
// ServiceSoftEventNumber : UINT;
15-
END_STRUCT
4+
<Declaration><![CDATA[TYPE
5+
TcoInsightConfig_v_5_x_x :
6+
STRUCT
7+
ResultDataSize : eTcoInsightResultDataSize_v_5_x_x := eTcoInsightResultDataSize_v_5_x_x.RESULT_DATA_64B;
8+
UserDataSize : eTcoInsightUserDataSize_v_5_x_x := eTcoInsightUserDataSize_v_5_x_x.USER_DATA_64B;
9+
DataFormat : eTcoDataFormat := TcoUtilities.eTcoDataFormat.BigEndian;
10+
MaxJobNumber : UINT := 999;
11+
InfoTime : TIME := T#2S;
12+
ErrorTime : TIME := T#5S;
13+
// ServiceJobNumber : UINT;
14+
// ServiceJobName : STRING;
15+
// ServiceSoftEventNumber : UINT;
16+
END_STRUCT
1617
END_TYPE
1718
]]></Declaration>
1819
</DUT>

0 commit comments

Comments
 (0)