Skip to content

GitLab

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

project changes

parent a1a129bb
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ e1fd8d56
......@@ -10,3 +10,4 @@ token.txt
/dewarpressure
/XY Scope Project1
/YT Temperature
/YT Scope Project1
BMK10k/BMK10k.tsproj
View file @ e1fd8d56
......@@ -1914,11 +1914,6 @@ External Setpoint Generation:
<TargetPosControl Range="1"/>
<OtherSettings AllowMotionCmdToSlave="true"/>
<Discrete BreakDistancePos="1" BreakDistanceNeg="1" BreakDelayPos="0.5" BreakDelayNeg="0.5"/>
<ParameterChanged>8</ParameterChanged>
<ParameterChanged>39</ParameterChanged>
<ParameterChanged>7</ParameterChanged>
<ParameterChanged>9</ParameterChanged>
<ParameterChanged>6</ParameterChanged>
</AxisPara>
<Encoder Name="Enc" EncType="4">
<EncPara ScaleFactorNumerator="360" ScaleFactorDenominator="13050" ToleranceWndModuloStart="0.5" MaxCount="#x0000ffff">
......@@ -2437,6 +2432,38 @@ External Setpoint Generation:
<Name>GVL_ThermoControl.Temperature_raw3</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_MainControl.FrequencyGuardWarning</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.FrequencyGuardError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardWarningL1</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardErrorL1</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardWarningL2</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardErrorL2</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardWarningL3</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_MainControl.VoltageGuardErrorL3</Name>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
......@@ -7692,9 +7719,17 @@ Bit1: Value bigger/equal Limit2]]></Comment>
<Link VarA="PlcTask Inputs^GVL_Environment.rawPressure2" VarB="AI Standard Channel 1^Value"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^Term 37 (EK1200)^Term 8 (EL3483-0060)">
<Link VarA="PlcTask Inputs^GVL_MainControl.FrequencyGuardError" VarB="Total Status^Frequency Guard Error"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.FrequencyGuardWarning" VarB="Total Status^Frequency Guard Warning"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.MainVoltageL1" VarB="L1 Basic^Voltage"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.MainVoltageL2" VarB="L2 Basic^Voltage"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.MainVoltageL3" VarB="L3 Basic^Voltage"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardErrorL1" VarB="L1 Status^Voltage Guard Error"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardErrorL2" VarB="L2 Status^Voltage Guard Error"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardErrorL3" VarB="L3 Status^Voltage Guard Error"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardWarningL1" VarB="L1 Status^Voltage Guard Warning"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardWarningL2" VarB="L2 Status^Voltage Guard Warning"/>
<Link VarA="PlcTask Inputs^GVL_MainControl.VoltageGuardWarningL3" VarB="L3 Status^Voltage Guard Warning"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^Term 41 (EK1100)^Term 42 (EL1008)">
<Link VarA="PlcTask Inputs^GVL_Telescope.Key1" VarB="Channel 3^Input"/>
......
BMK10k/BMK10kRuntime/BMK10kRuntime.tmc
View file @ e1fd8d56
This source diff could not be displayed because it is too large. You can view the blob instead.
BMK10k/BMK10kRuntime/BMK10kRuntime.tmcRefac deleted 100644 → 0
View file @ a1a129bb
<?xml version="1.0" encoding="utf-8"?>
<Refactors>
<Renames>
<RenamedType>
<Type guid="03869fa8-1755-402e-a7ee-189c483e0438">CONVERTENVIRONMENT</Type>
<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
BMK10k/BMK10kRuntime/POUs/MainControls.TcPOU
View file @ e1fd8d56
......@@ -17,7 +17,12 @@ VAR
MainVoltageL1,
MainVoltageL2,
MainVoltageL3: REAL;
BatteryDischarge,
BatteryFailing,
FrequencyGuardWarning,
FrequencyGuardError,
VoltageGuardWarning,
VoltageGuardError: BOOL;
END_VAR
]]></Declaration>
<Implementation>
......@@ -59,11 +64,27 @@ DomeLightEvent( Trigger := GVL_MainControl.LightDome,
MainVoltageL1 := GVL_MainControl.MainVoltageL1;
MainVoltageL2 := GVL_MainControl.MainVoltageL2;
MainVoltageL3 := GVL_MainControl.MainVoltageL3;
]]></ST>
BatteryDischarge := GVL_MainControl.BatteryDischarge;
BatteryFailing := GVL_MainControl.BatteryFailing;
FrequencyGuardWarning := GVL_MainControl.FrequencyGuardWarning;
FrequencyGuardError := GVL_MainControl.FrequencyGuardError;
VoltageGuardWarning := GVL_MainControl.VoltageGuardWarningL1 OR
GVL_MainControl.VoltageGuardWarningL2 OR
GVL_MainControl.VoltageGuardWarningL3;
VoltageGuardError := GVL_MainControl.VoltageGuardErrorL1 OR
GVL_MainControl.VoltageGuardErrorL2 OR
GVL_MainControl.VoltageGuardErrorL3;]]></ST>
</Implementation>
<LineIds Name="MainControls">
<LineId Id="183" Count="37" />
<LineId Id="124" Count="0" />
<LineId Id="241" Count="0" />
<LineId Id="249" Count="1" />
<LineId Id="248" Count="0" />
<LineId Id="251" Count="0" />
<LineId Id="255" Count="1" />
<LineId Id="254" Count="0" />
<LineId Id="257" 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