Commit 8d11efaa authored by Jörg Weingrill's avatar Jörg Weingrill
Browse files

restructure project in directories

parent 934a1a1f
......@@ -51,28 +51,16 @@
<Compile Include="PlcTask.TcTTO">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\ATAN2.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Environment.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\CO_ABERRATION.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\CO_REFRACT.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\CO_REFRACT_FORWARD.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\CT2LST.TcPOU">
<Compile Include="POUs\DomeControl.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\DateTime2JD.TcPOU">
<Compile Include="POUs\FunctionBlocks\CO_ABERRATION.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\DomeControl.TcPOU">
<Compile Include="POUs\FunctionBlocks\CO_REFRACT.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\FunctionBlocks\FB_Axis.TcPOU">
......@@ -129,43 +117,55 @@
<Compile Include="POUs\FunctionBlocks\FB_TimeAverage.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_AbsoluteDecoder.TcPOU">
<Compile Include="POUs\Functions\ATAN2.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_Decoder.TcPOU">
<Compile Include="POUs\Functions\CO_REFRACT_FORWARD.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_HourangleLimit.TcPOU">
<Compile Include="POUs\Functions\CT2LST.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_MeanDirection.TcPOU">
<Compile Include="POUs\Functions\DateTime2JD.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_Y.TcPOU">
<Compile Include="POUs\Functions\F_AbsoluteDecoder.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_YREAL.TcPOU">
<Compile Include="POUs\Functions\F_DeclinationLimit.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\LREAL_TO_FMTESTR.TcPOU">
<Compile Include="POUs\Functions\F_Decoder.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\MAIN.TcPOU">
<Compile Include="POUs\Functions\F_HourangleLimit.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\MainControls.TcPOU">
<Compile Include="POUs\Functions\F_MeanDirection.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\POLY.TcPOU">
<Compile Include="POUs\Functions\F_Y.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\F_DeclinationLimit.TcPOU">
<Compile Include="POUs\Functions\F_YREAL.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\TelescopeControl.TcPOU">
<Compile Include="POUs\Functions\LREAL_TO_FMTESTR.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Functions\TEN.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\TEN.TcPOU">
<Compile Include="POUs\MAIN.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\MainControls.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\POLY.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\TelescopeControl.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\ThermoControl.TcPOU">
......@@ -176,6 +176,7 @@
<Folder Include="DUTs" />
<Folder Include="GVLs" />
<Folder Include="POUs\FunctionBlocks" />
<Folder Include="POUs\Functions" />
<Folder Include="VISUs" />
<Folder Include="POUs" />
</ItemGroup>
......
......@@ -6,5 +6,25 @@
<From>ConvertEnvironment</From>
<To>Environment</To>
</RenamedType>
<RenamedSymbol>
<Type guid="1f9d7f6a-1997-4aa3-a06e-f5ddd853de00">ThermoControl</Type>
<From>dewar_temperature1</From>
<To>cold_head_temperature</To>
</RenamedSymbol>
<RenamedSymbol>
<Type guid="1f9d7f6a-1997-4aa3-a06e-f5ddd853de00">ThermoControl</Type>
<From>dewar_temperature2</From>
<To>ccd_temperature1</To>
</RenamedSymbol>
<RenamedSymbol>
<Type guid="1f9d7f6a-1997-4aa3-a06e-f5ddd853de00">ThermoControl</Type>
<From>dewar_temperature3</From>
<To>ccd_temperature2</To>
</RenamedSymbol>
<RenamedSymbol>
<Type guid="1f9d7f6a-1997-4aa3-a06e-f5ddd853de00">ThermoControl</Type>
<From>avg_temperature</From>
<To>ccd_temperature</To>
</RenamedSymbol>
</Renames>
</Refactors>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="CO_ABERRATION" Id="{78e5ea52-4364-45d1-8d65-73fef4dd6397}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION_BLOCK CO_ABERRATION
VAR_INPUT
......@@ -106,5 +106,9 @@ d_ra := -k * term1 + e*k * term2;
d_dec := -k * term3 + e*k * term4;
]]></ST>
</Implementation>
<LineIds Name="CO_ABERRATION">
<LineId Id="3" Count="80" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="CO_REFRACT" Id="{3da273e0-5aa9-4438-ae19-b4f0ec632a24}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION_BLOCK CO_REFRACT
VAR_INPUT
......@@ -54,5 +54,9 @@ END_IF
new_alt := aout;
]]></ST>
</Implementation>
<LineIds Name="CO_REFRACT">
<LineId Id="3" Count="31" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="ATAN2" Id="{dba69bd6-0eda-4092-a354-7cdf0084c954}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION ATAN2 : LREAL
VAR_INPUT
......@@ -25,5 +25,9 @@ ELSIF x = 0 AND y < 0 THEN
ATAN2 := -PI/2.0;
END_IF]]></ST>
</Implementation>
<LineIds Name="ATAN2">
<LineId Id="3" Count="13" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="CO_REFRACT_FORWARD" Id="{9e2a6c66-b60a-451a-a6f4-0d24b94a8b52}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION CO_REFRACT_FORWARD : LREAL
VAR_INPUT
......@@ -39,5 +39,9 @@ tpcor := P/1010.0 * 283/T;
CO_REFRACT_FORWARD := tpcor * Ref;
]]></ST>
</Implementation>
<LineIds Name="CO_REFRACT_FORWARD">
<LineId Id="3" Count="21" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="CT2LST" Id="{69d1807b-966a-4b2d-9801-b72992fcc729}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION CT2LST : LREAL
VAR_INPUT
......@@ -97,5 +97,9 @@ CT2LST := ( theta + lng)/15.0;
CT2LST := MODABS(CT2LST, 24.0);
]]></ST>
</Implementation>
<LineIds Name="CT2LST">
<LineId Id="3" Count="80" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="DateTime2JD" Id="{99729b85-ef51-43f9-be01-c7ed25524dd9}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION DateTime2JD : LREAL
VAR_INPUT
......@@ -45,5 +45,9 @@ DateTime2JD := jdn + (epoch.wHour-12.0)/24.0 + (epoch.wMinute/1440.0) + (epoch.w
]]></ST>
</Implementation>
<LineIds Name="DateTime2JD">
<LineId Id="3" Count="32" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="F_AbsoluteDecoder" Id="{06331f59-fb8f-4087-b1da-febbf7154476}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION F_AbsoluteDecoder : LREAL
VAR_INPUT
......
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="F_Decoder" Id="{a3e69684-e86d-4114-aa13-116115eded0c}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION F_Decoder : LREAL
VAR_INPUT
......
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.12">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="F_HourangleLimit" Id="{554b9597-c408-4ecf-87ac-bb54cc0c61e6}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION F_HourangleLimit : LREAL
VAR_INPUT
......
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4020.3">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="F_Y" Id="{afff79a1-5502-41d7-aa35-a4d2761c9eb4}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION F_Y : LREAL
VAR_INPUT
......@@ -48,5 +48,9 @@ IF (fXmax - fXmin) <> 0 THEN
END_IF
]]></ST>
</Implementation>
<LineIds Name="F_Y">
<LineId Id="3" Count="32" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="F_YREAL" Id="{de87cd9e-9e50-4d38-82bb-04f167b6bbb8}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION F_YREAL : REAL
VAR_INPUT
......
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4018.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<POU Name="TEN" Id="{48a4167d-326b-4179-a49a-d85a103bff69}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION TEN : LREAL
VAR_INPUT
......@@ -12,5 +12,9 @@ END_VAR
<ST><![CDATA[TEN := dd + (mm/60.0) + (ss/3600.0);
]]></ST>
</Implementation>
<LineIds Name="TEN">
<LineId Id="3" Count="0" />
<LineId Id="2" Count="0" />
</LineIds>
</POU>
</TcPlcObject>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment