Commit f7313f52 authored by Holger Brand's avatar Holger Brand
Browse files

FPGA Bugfix: analog dipole current interlock goes to indicator. Interlock...

FPGA Bugfix: analog dipole current interlock goes to indicator. Interlock enable is checked in SCTL.
Build application 1.2.0.9; take UTCS.ini from KCPC080.
parent 9cecb07c
......@@ -418,10 +418,10 @@ UTCS_BMIL:UTCS_BCIL.Max-DRMP-Limit=5000
UTCS_BMIL:UTCS_BCIL.Charge-State=8
UTCS_BMIL:UTCS_BCIL.MaxFileSize=1000000
UTCS_BMIL:UTCS_BCIL.MaxFileTime=3600
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Gain=0.49373
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Offset=5.521
UTCS_BMIL:UTCS_BCIL.Dipole-F2I-Gain=2.0186
UTCS_BMIL:UTCS_BCIL.Dipole-F2I_Offset=-10.128
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Gain=0.4559
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Offset=9.441
UTCS_BMIL:UTCS_BCIL.Dipole-F2I-Gain=2.1746
UTCS_BMIL:UTCS_BCIL.Dipole-F2I_Offset=-15.128
UTCS_BMIL:UTCS_BCIL.Dipole-IMax=0
UTCS_BMIL:UTCS_BCIL.Dipole-IMin=0
UTCS_BMIL:UTCS_BCIL.Dipole-I2V-Calibration="0.0,0.013333"
......@@ -1179,7 +1179,8 @@ UX8QD11_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current"
UX8QD11_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current_setpoint"
UX8QD12_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current"
UX8QD12_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current_setpoint"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
#UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/DipoleCurrent-V"
UX8MU1_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current_setpoint"
ChargeState="ni.var.psp://kcpc080/UTCS_AE/ChargeState"
InterlockStatus="ni.var.psp://kcpc080/UTCS_AE/InterlockStatus"
......@@ -1201,6 +1202,8 @@ InterlockReason="ni.var.psp://kcpc080/UTCS_AE/InterlockReason"
InterlockStatus="ni.var.psp://kcpc080/UTCS_AE/InterlockStatus"
Dipole-IL="ni.var.psp://kcpc080/UTCS_AE/Dipole-IL"
Dipole-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Dipole-IL-Enabled"
Dipole-V-IL="ni.var.psp://kcpc080/UTCS_AE/Dipole-V-IL"
Dipole-V-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Dipole-V-IL-Enabled"
Magnet-IL="ni.var.psp://kcpc080/UTCS_AE/Magnet-IL"
Magnet-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Magnet-IL-Enabled"
Targetwheel-IL="ni.var.psp://kcpc080/UTCS_AE/Targetwheel-IL"
......@@ -1225,6 +1228,7 @@ Enable-Charge-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Charge-IL"
Enable-Det-Rate-Limit-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Det-Rate-Limit-IL"
Enable-MP-Length-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-MP-Length-IL"
Enable-Dipole-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Dipole-IL"
Enable-Dipole-V-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Dipole-V-IL"
Set-Max-QMP-Limit="ni.var.psp://kcpc080/UTCS_AE/Set-Max-QMP-Limit"
Set-Max-DetEvents-Limit="ni.var.psp://kcpc080/UTCS_AE/Set-Max-DetEvents-Limit"
Set-MP-Length-IL-Min="ni.var.psp://kcpc080/UTCS_AE/Set-MP-Length-IL-Min"
......@@ -1322,6 +1326,7 @@ CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.NoAppRoot=False
#CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager"
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
[StartActor.URLs]
#PollingCounter="ni.var.psp://localhost/UTCS_AE/StartActor_PollingCounter"
......@@ -1331,11 +1336,10 @@ CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
#PollingMode="ni.var.psp://localhost/UTCS_AE/StartActor_PollingMode"
#PollingTime="ni.var.psp://localhost/UTCS_AE/StartActor_PollingTime"
ActorList="ni.var.psp://localhost/UTCS_AE/ActorList"
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
#First actor in this list, ascending order, is Main-Actor. Stopping this actor triggers stopping the entire application if CSPP_StartActor:CSPP_StartActor.Open_ActorCore=False.
#ObjectManager=False
UTCS_MainGUI=False
IGA140=False
RTCGC=True
......
......@@ -418,10 +418,10 @@ UTCS_BMIL:UTCS_BCIL.Max-DRMP-Limit=5000
UTCS_BMIL:UTCS_BCIL.Charge-State=8
UTCS_BMIL:UTCS_BCIL.MaxFileSize=1000000
UTCS_BMIL:UTCS_BCIL.MaxFileTime=3600
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Gain=0.49373
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Offset=5.521
UTCS_BMIL:UTCS_BCIL.Dipole-F2I-Gain=2.0186
UTCS_BMIL:UTCS_BCIL.Dipole-F2I_Offset=-10.128
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Gain=0.4559
UTCS_BMIL:UTCS_BCIL.Dipole-I2F-Offset=9.441
UTCS_BMIL:UTCS_BCIL.Dipole-F2I-Gain=2.1746
UTCS_BMIL:UTCS_BCIL.Dipole-F2I_Offset=-15.128
UTCS_BMIL:UTCS_BCIL.Dipole-IMax=0
UTCS_BMIL:UTCS_BCIL.Dipole-IMin=0
UTCS_BMIL:UTCS_BCIL.Dipole-I2V-Calibration="0.0,0.013333"
......@@ -1179,7 +1179,8 @@ UX8QD11_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current"
UX8QD11_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current_setpoint"
UX8QD12_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current"
UX8QD12_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current_setpoint"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
#UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/DipoleCurrent-V"
UX8MU1_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current_setpoint"
ChargeState="ni.var.psp://kcpc080/UTCS_AE/ChargeState"
InterlockStatus="ni.var.psp://kcpc080/UTCS_AE/InterlockStatus"
......@@ -1201,6 +1202,8 @@ InterlockReason="ni.var.psp://kcpc080/UTCS_AE/InterlockReason"
InterlockStatus="ni.var.psp://kcpc080/UTCS_AE/InterlockStatus"
Dipole-IL="ni.var.psp://kcpc080/UTCS_AE/Dipole-IL"
Dipole-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Dipole-IL-Enabled"
Dipole-V-IL="ni.var.psp://kcpc080/UTCS_AE/Dipole-V-IL"
Dipole-V-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Dipole-V-IL-Enabled"
Magnet-IL="ni.var.psp://kcpc080/UTCS_AE/Magnet-IL"
Magnet-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Magnet-IL-Enabled"
Targetwheel-IL="ni.var.psp://kcpc080/UTCS_AE/Targetwheel-IL"
......@@ -1225,6 +1228,7 @@ Enable-Charge-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Charge-IL"
Enable-Det-Rate-Limit-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Det-Rate-Limit-IL"
Enable-MP-Length-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-MP-Length-IL"
Enable-Dipole-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Dipole-IL"
Enable-Dipole-V-IL="ni.var.psp://kcpc080/UTCS_AE/Enable-Dipole-V-IL"
Set-Max-QMP-Limit="ni.var.psp://kcpc080/UTCS_AE/Set-Max-QMP-Limit"
Set-Max-DetEvents-Limit="ni.var.psp://kcpc080/UTCS_AE/Set-Max-DetEvents-Limit"
Set-MP-Length-IL-Min="ni.var.psp://kcpc080/UTCS_AE/Set-MP-Length-IL-Min"
......@@ -1322,6 +1326,7 @@ CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.NoAppRoot=False
#CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager"
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
[StartActor.URLs]
#PollingCounter="ni.var.psp://localhost/UTCS_AE/StartActor_PollingCounter"
......@@ -1331,11 +1336,10 @@ CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
#PollingMode="ni.var.psp://localhost/UTCS_AE/StartActor_PollingMode"
#PollingTime="ni.var.psp://localhost/UTCS_AE/StartActor_PollingTime"
ActorList="ni.var.psp://localhost/UTCS_AE/ActorList"
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
#First actor in this list, ascending order, is Main-Actor. Stopping this actor triggers stopping the entire application if CSPP_StartActor:CSPP_StartActor.Open_ActorCore=False.
#ObjectManager=False
UTCS_MainGUI=False
IGA140=False
RTCGC=True
......
......@@ -2651,7 +2651,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Comp.CustomXilinxParameters" Type="Str"></Property>
<Property Name="Comp.MaxFanout" Type="Int">-1</Property>
<Property Name="Comp.RandomSeed" Type="Bool">false</Property>
<Property Name="Comp.Version.Build" Type="Int">6</Property>
<Property Name="Comp.Version.Build" Type="Int">7</Property>
<Property Name="Comp.Version.Fix" Type="Int">0</Property>
<Property Name="Comp.Version.Major" Type="Int">1</Property>
<Property Name="Comp.Version.Minor" Type="Int">1</Property>
......@@ -3215,7 +3215,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/UTCS_HB/UTCS App/UTCS_UTCS App_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">9</Property>
<Property Name="Bld_version.build" Type="Int">10</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.minor" Type="Int">2</Property>
<Property Name="Destination[0].destName" Type="Str">UTCS.exe</Property>
......@@ -3433,7 +3433,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="INST_defaultDir" Type="Str">{6731952F-B602-455B-8E56-32A207402888}</Property>
<Property Name="INST_installerName" Type="Str">setup.exe</Property>
<Property Name="INST_productName" Type="Str">UTCS</Property>
<Property Name="INST_productVersion" Type="Str">1.2.8</Property>
<Property Name="INST_productVersion" Type="Str">1.2.9</Property>
<Property Name="InstSpecBitness" Type="Str">32-bit</Property>
<Property Name="InstSpecVersion" Type="Str">19008009</Property>
<Property Name="MSI_arpCompany" Type="Str">GSI Helmholtzzentrum für Schwerionenforschung GmbH</Property>
......@@ -3451,6 +3451,9 @@ Copyright 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH
H.Brand@gsi.de, 2123, EEL, Planckstr. 1, 64291 Darmstadt, Germany
</Property>
<Property Name="MSI_windowTitle" Type="Str">UTCS Installer</Property>
<Property Name="MSI_winsec.certificate" Type="Str">Brand Holger (Brand)</Property>
<Property Name="MSI_winsec.description" Type="Str">http://timestamp.digicert.com</Property>
<Property Name="MSI_winsec.timestamp" Type="Str">http://timestamp.digicert.com</Property>
<Property Name="RegDest[0].dirName" Type="Str">Software</Property>
<Property Name="RegDest[0].dirTag" Type="Str">{DDFAFC8B-E728-4AC8-96DE-B920EBB97A86}</Property>
<Property Name="RegDest[0].parentTag" Type="Str">2</Property>
......
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