Skip to content

Commit

Permalink
Merge pull request #67 from jyotiphy/tm1k2_im4k2
Browse files Browse the repository at this point in the history 
TM1K2 PLC limits and IM4K2 ppm 24-bit readout fix
  • Loading branch information
@jyotiphy
jyotiphy authored Jul 9, 2024
2 parents 24c8ec7 + 26c90de commit 4534d47
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 76 deletions.
6 changes: 3 additions & 3 deletions plc-kfe-rix-motion/_Config/NC/Axes/Axis 9 TM1K2-MMS-Y.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ External Setpoint Generation:
</DataType>
</DataTypes>
<Axis Id="9" CreateSymbols="true" AxisType="1" AxisFolder="TM1K2-K2A">
<Name>Axis 9 TM1K2-MMS-Y</Name>
<Name>__FILENAME__</Name>
<AxisPara>
<Dynamic AccelerationMaximum="200" DecelerationMaximum="200" Acceleration="10" Deceleration="10" Jerk="500" DelayTime="0.004"/>
<Velo Maximum="20"/>
Expand All @@ -1331,8 +1331,8 @@ External Setpoint Generation:
</AxisPara>
<Encoder Name="Enc" EncType="29">
<EncPara ScaleFactorNumerator="5e-05" Offset="-214702" MaxCount="#xffffffff" ReferenceSystem="1">
<SoftEndMinControl Enable="true" Range="-100"/>
<SoftEndMaxControl Enable="true" Range="-16"/>
<SoftEndMinControl Range="-100"/>
<SoftEndMaxControl Range="-16"/>
<Inc RefSoftSyncMask="#x0000ffff"/>
</EncPara>
<Vars VarGrpType="1">
Expand Down
2 changes: 1 addition & 1 deletion plc-kfe-rix-motion/kfe_rix_motion/POUs/IM4K2/FB_PPM_PowerMeter_IM4K2.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ fbGetPMVoltage(
iRaw := iVoltageDINT,
iTermBits := 23,
fTermMax := 10000,
fTermMin := -10000,
fTermMin := 0, //For 24-bit to spread 10,000mV across 23 bits
fReal => fVoltage);
// Power meter calibration
Expand Down
144 changes: 72 additions & 72 deletions plc-kfe-rix-motion/kfe_rix_motion/kfe_rix_motion.tmc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{5D9BEA48-F87F-C349-A110-60CC7785F335}" GeneratedBy="TwinCAT XAE Plc">
<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{95A18949-018A-BE35-90AD-DF14DCA7C27E}" GeneratedBy="TwinCAT XAE Plc">
<DataTypes>
<DataType>
<Name Namespace="LCLS_General">ST_System</Name>
Expand Down Expand Up @@ -51615,44 +51615,6 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
</Property>
</Properties>
</DataType>
<DataType>
<Name GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">LCLSGeneralEventClass</Name>
<DisplayName TxtId="">Log event</DisplayName>
<EventId>
<Name Id="0">Critical</Name>
<DisplayName TxtId="">Critical</DisplayName>
<Severity>Critical</Severity>
</EventId>
<EventId>
<Name Id="1">Error</Name>
<DisplayName TxtId="">Error</DisplayName>
<Severity>Error</Severity>
</EventId>
<EventId>
<Name Id="2">Warning</Name>
<DisplayName TxtId="">Warning</DisplayName>
<Severity>Warning</Severity>
</EventId>
<EventId>
<Name Id="3">Info</Name>
<DisplayName TxtId="">Info</DisplayName>
<Severity>Info</Severity>
</EventId>
<EventId>
<Name Id="4">Verbose</Name>
<DisplayName TxtId="">Verbose</DisplayName>
<Severity>Verbose</Severity>
</EventId>
<Hides>
<Hide GUID="{E50B8F82-4C54-4F5A-855E-90970D01354A}"/>
<Hide GUID="{772B0B6F-412E-46FD-9006-6E00BFFE1C3D}"/>
<Hide GUID="{8FAD87A4-C885-4A4F-85AF-8AB324945AE2}"/>
<Hide GUID="{16BEE339-E307-4BC2-8E77-D5FB1794DF5A}"/>
<Hide GUID="{B7E60A74-CB5C-4A02-B59C-74B86A888DE9}"/>
<Hide GUID="{6B58EF80-AB34-4F6C-81D0-B0589F4FC534}"/>
<Hide GUID="{9E76D1D7-D744-4E3D-B111-F6F94B60E6AB}"/>
</Hides>
</DataType>
<DataType>
<Name GUID="{11F7FC20-DBF4-4DAF-96C7-1FD6B6156B31}" TcBaseType="true" CName="TcSystemEventClass">TcSystemEventClass</Name>
<DisplayName TxtId="">TcSystemEventClass</DisplayName>
Expand Down Expand Up @@ -52459,6 +52421,44 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Hide GUID="{3FEAA938-D042-4B1E-8ADD-BB2F7BE872B0}"/>
</Hides>
</DataType>
<DataType>
<Name GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">LCLSGeneralEventClass</Name>
<DisplayName TxtId="">Log event</DisplayName>
<EventId>
<Name Id="0">Critical</Name>
<DisplayName TxtId="">Critical</DisplayName>
<Severity>Critical</Severity>
</EventId>
<EventId>
<Name Id="1">Error</Name>
<DisplayName TxtId="">Error</DisplayName>
<Severity>Error</Severity>
</EventId>
<EventId>
<Name Id="2">Warning</Name>
<DisplayName TxtId="">Warning</DisplayName>
<Severity>Warning</Severity>
</EventId>
<EventId>
<Name Id="3">Info</Name>
<DisplayName TxtId="">Info</DisplayName>
<Severity>Info</Severity>
</EventId>
<EventId>
<Name Id="4">Verbose</Name>
<DisplayName TxtId="">Verbose</DisplayName>
<Severity>Verbose</Severity>
</EventId>
<Hides>
<Hide GUID="{E50B8F82-4C54-4F5A-855E-90970D01354A}"/>
<Hide GUID="{772B0B6F-412E-46FD-9006-6E00BFFE1C3D}"/>
<Hide GUID="{8FAD87A4-C885-4A4F-85AF-8AB324945AE2}"/>
<Hide GUID="{16BEE339-E307-4BC2-8E77-D5FB1794DF5A}"/>
<Hide GUID="{B7E60A74-CB5C-4A02-B59C-74B86A888DE9}"/>
<Hide GUID="{6B58EF80-AB34-4F6C-81D0-B0589F4FC534}"/>
<Hide GUID="{9E76D1D7-D744-4E3D-B111-F6F94B60E6AB}"/>
</Hides>
</DataType>
</DataTypes>
<Modules>
<Module GUID="{A93B91DF-8B4A-4A20-AA82-223E0B9E6979}" TcSmClass="TComPlcObjDef">
Expand Down Expand Up @@ -90292,29 +90292,6 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
</Properties>
<BitOffs>680166016</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENTS.LCLSGeneralEventClass</Name>
<Comment> ST_LCLSGeneralEventClass</Comment>
<BitSize>960</BitSize>
<BaseType GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">ST_LCLSGeneralEventClass</BaseType>
<Properties>
<Property>
<Name>tc_no_symbol</Name>
<Value>unused</Value>
</Property>
<Property>
<Name>const_non_replaced</Name>
</Property>
<Property>
<Name>suppress_warning_0</Name>
<Value>C0228</Value>
</Property>
<Property>
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680197696</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.TcSystemEventClass</Name>
<Comment> 11F7FC20-DBF4-4DAF-96C7-1FD6B6156B31</Comment>
Expand Down Expand Up @@ -90382,7 +90359,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211328</BitOffs>
<BitOffs>680182208</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.TcGeneralAdsEventClass</Name>
Expand Down Expand Up @@ -90451,7 +90428,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211456</BitOffs>
<BitOffs>680182336</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.TcRouterEventClass</Name>
Expand Down Expand Up @@ -90520,7 +90497,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211584</BitOffs>
<BitOffs>680182464</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.TcRTimeEventClass</Name>
Expand Down Expand Up @@ -90589,7 +90566,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211712</BitOffs>
<BitOffs>680182592</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.Win32EventClass</Name>
Expand Down Expand Up @@ -90658,7 +90635,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211840</BitOffs>
<BitOffs>680182720</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENT_CLASSES.LCLSGeneralEventClass</Name>
Expand Down Expand Up @@ -90727,7 +90704,30 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680211968</BitOffs>
<BitOffs>680182848</BitOffs>
</Symbol>
<Symbol>
<Name>TC_EVENTS.LCLSGeneralEventClass</Name>
<Comment> ST_LCLSGeneralEventClass</Comment>
<BitSize>960</BitSize>
<BaseType GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">ST_LCLSGeneralEventClass</BaseType>
<Properties>
<Property>
<Name>tc_no_symbol</Name>
<Value>unused</Value>
</Property>
<Property>
<Name>const_non_replaced</Name>
</Property>
<Property>
<Name>suppress_warning_0</Name>
<Value>C0228</Value>
</Property>
<Property>
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>680213312</BitOffs>
</Symbol>
</DataArea>
<DataArea>
Expand Down Expand Up @@ -90788,9 +90788,6 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
</DataAreas>
<Deployment/>
<EventClasses>
<EventClass>
<Type GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">LCLSGeneralEventClass</Type>
</EventClass>
<EventClass>
<Type GUID="{11F7FC20-DBF4-4DAF-96C7-1FD6B6156B31}">TcSystemEventClass</Type>
</EventClass>
Expand All @@ -90806,6 +90803,9 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
<EventClass>
<Type GUID="{1D0C4BAC-ECF3-4F33-8F20-A12E77AB6387}">Win32EventClass</Type>
</EventClass>
<EventClass>
<Type GUID="{97CF8247-B59C-4E2C-B4B0-7350D0471457}">LCLSGeneralEventClass</Type>
</EventClass>
</EventClasses>
<Properties>
<Property>
Expand All @@ -90814,7 +90814,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
</Property>
<Property>
<Name>ChangeDate</Name>
<Value>2024-06-11T14:08:45</Value>
<Value>2024-07-02T10:04:19</Value>
</Property>
<Property>
<Name>GeneratedCodeSize</Name>
Expand Down

0 comments on commit 4534d47

Please sign in to comment.