Skip to content
Snippets Groups Projects
Commit d8759752 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Various updates, see changelog below 

Fix #861, increased SRP virtual ranges
Fix #860, added setupMISTRAL procedure
Fix #859, increased fields length for minor servo boss TUI
Fix #858, modified SRT telescopePark procedure
parent 3272ed2f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 131 additions and 31 deletions
Common/Clients/MinorServoBossTextClient/src/MinorServoBossTextClient.cpp
+ 1
− 1
View file @ d8759752
......@@ -279,7 +279,7 @@ int main(int argc, char *argv[]) {
userInput=new TW::CInputCommand();
/** setting up the properties of the components of the frame controls */
_TW_SET_COMPONENT(actualSetup_field,18,0,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
_TW_SET_COMPONENT(actualSetup_field,18,0,20,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
tracking_display->setPosition(CPoint(18,1));
tracking_display->setOrientation(TW::CPropertyLedDisplay<TEMPLATE_4_ROTBOOLEAN>::HORIZONTAL);
tracking_display->setFormatFunction(boolFormat,NULL);
......
SRT/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml
+ 9
− 9
View file @ d8759752
......@@ -80,18 +80,18 @@
<TRI_ASACTIVE> <axis>RY</axis><coefficients>0 </coefficients></TRI_ASACTIVE>
<TRI_ASACTIVE> <axis>RZ</axis><coefficients>0 </coefficients></TRI_ASACTIVE>
<MISTRAL> <axis>TX</axis><coefficients>38 </coefficients></MISTRAL>
<MISTRAL> <axis>TY</axis><coefficients>31 </coefficients></MISTRAL>
<MISTRAL> <axis>TZ</axis><coefficients>-12.788622422210521 </coefficients></MISTRAL>
<MISTRAL> <axis>RX</axis><coefficients>-0.005254963341757046 </coefficients></MISTRAL>
<MISTRAL> <axis>TX</axis><coefficients>-1.5 </coefficients></MISTRAL>
<MISTRAL> <axis>TY</axis><coefficients>28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958 </coefficients></MISTRAL>
<MISTRAL> <axis>TZ</axis><coefficients>9.530113849340003,-0.169826241752,0.000419997047,0.000003985237 </coefficients></MISTRAL>
<MISTRAL> <axis>RX</axis><coefficients>-0.011392527142374848,-0.0001426193499425,0.000039508844799,-0.000000131010010 </coefficients></MISTRAL>
<MISTRAL> <axis>RY</axis><coefficients>-0.03611111111111111 </coefficients></MISTRAL>
<MISTRAL> <axis>RZ</axis><coefficients>0 </coefficients></MISTRAL>
<MISTRAL_ASACTIVE> <axis>TX</axis><coefficients>38 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TY</axis><coefficients>31 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TZ</axis><coefficients>-12.788622422210521 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RX</axis><coefficients>-0.005254963341757046 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RY</axis><coefficients>-0.03611111111111111 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TX</axis><coefficients>-1.5 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TY</axis><coefficients>29.556666666666498,0.263472663139432,-0.018206701940039,0.000072373113855 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TZ</axis><coefficients>-15.6669651675,1.9293068324,-0.0628990613,0.0007771141,-0.0000032940 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RX</axis><coefficients>-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RY</axis><coefficients>-0.036111111111111108 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RZ</axis><coefficients>0 </coefficients></MISTRAL_ASACTIVE>
<CCB> <axis>TX</axis><coefficients>-1.5 </coefficients></CCB>
......
SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml
+ 35
− 0
View file @ d8759752
......@@ -174,4 +174,39 @@
<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>
</Receiver>
<Receiver>
<receiverCode>MISTRAL</receiverCode>
<phi>90.0</phi>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2956719398 </coefficientVal00>
<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0056679383 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0074789114 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0008009398 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015651340 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0572288483 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.1136546656 </coefficientVal07>
<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>
<coefficientNum10> 1 </coefficientNum10> <coefficientVal10> -0.0004978125 </coefficientVal10>
<coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>
<coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0002358370 </coefficientVal12>
<coefficientNum13> 1 </coefficientNum13> <coefficientVal13> 0.0000537828 </coefficientVal13>
<coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>
<coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>
<coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>
<coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>
<coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>
<coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>
<coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>
<coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>
<coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>
<coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>
<coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>
<coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>
<coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>
<coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>
<coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>
<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>
</Receiver>
</PointingModel>
SRT/CDB/alma/MINORSERVO/SRP/SRP.xml
+ 2
− 2
View file @ d8759752
......@@ -11,8 +11,8 @@
virtual_axes="6"
max_speed="4, 4, 4, 0.38, 0.38, 0.38"
acceleration="8, 8, 8, 0.76, 0.76, 0.76"
min_range="-50, -110, -50, -0.25, -0.25, -0.25"
max_range="50, 110, 50, 0.25, 0.25, 0.25"
min_range="-125, -125, -125, -0.25, -0.25, -0.25"
max_range="125, 125, 125, 0.25, 0.25, 0.25"
tracking_delta="1, 1, 1, 1, 1, 1">
<enabled description="All physical axes enabled" />
......
SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 19
− 4
View file @ d8759752
......@@ -119,16 +119,31 @@
</body>
</Procedure>
<Procedure name="setupMISTRAL" args="0">
<body>
antennaSetup=MISTRAL
servoSetup=MISTRAL
receiversSetup=KKG
receiversMode=SINGLEDISH
chooseBackend=TotalPower
initialize=CCG
device=0
calOff
restFrequency=0
azelOffsets=0d,0d
</body>
</Procedure>
<Procedure name="telescopePark" args="0">
<body>
goTo=180d,89.8d
goTo=*,89.8d
receiversPark
servoPark
asPark
waitOnSource
antennaStop
wait=1
antennaPark
receiversPark
servoPark
asPark
logMessage=Telescope is now parked
</body>
</Procedure>
......
SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml
+ 9
− 9
View file @ d8759752
......@@ -80,18 +80,18 @@
<TRI_ASACTIVE> <axis>RY</axis><coefficients>0 </coefficients></TRI_ASACTIVE>
<TRI_ASACTIVE> <axis>RZ</axis><coefficients>0 </coefficients></TRI_ASACTIVE>
<MISTRAL> <axis>TX</axis><coefficients>38 </coefficients></MISTRAL>
<MISTRAL> <axis>TY</axis><coefficients>31 </coefficients></MISTRAL>
<MISTRAL> <axis>TZ</axis><coefficients>-12.788622422210521 </coefficients></MISTRAL>
<MISTRAL> <axis>RX</axis><coefficients>-0.005254963341757046 </coefficients></MISTRAL>
<MISTRAL> <axis>TX</axis><coefficients>-1.5 </coefficients></MISTRAL>
<MISTRAL> <axis>TY</axis><coefficients>28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958 </coefficients></MISTRAL>
<MISTRAL> <axis>TZ</axis><coefficients>9.530113849340003,-0.169826241752,0.000419997047,0.000003985237 </coefficients></MISTRAL>
<MISTRAL> <axis>RX</axis><coefficients>-0.011392527142374848,-0.0001426193499425,0.000039508844799,-0.000000131010010 </coefficients></MISTRAL>
<MISTRAL> <axis>RY</axis><coefficients>-0.03611111111111111 </coefficients></MISTRAL>
<MISTRAL> <axis>RZ</axis><coefficients>0 </coefficients></MISTRAL>
<MISTRAL_ASACTIVE> <axis>TX</axis><coefficients>38 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TY</axis><coefficients>31 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TZ</axis><coefficients>-12.788622422210521 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RX</axis><coefficients>-0.005254963341757046 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RY</axis><coefficients>-0.03611111111111111 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TX</axis><coefficients>-1.5 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TY</axis><coefficients>29.556666666666498,0.263472663139432,-0.018206701940039,0.000072373113855 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>TZ</axis><coefficients>-15.6669651675,1.9293068324,-0.0628990613,0.0007771141,-0.0000032940 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RX</axis><coefficients>-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RY</axis><coefficients>-0.036111111111111108 </coefficients></MISTRAL_ASACTIVE>
<MISTRAL_ASACTIVE> <axis>RZ</axis><coefficients>0 </coefficients></MISTRAL_ASACTIVE>
<CCB> <axis>TX</axis><coefficients>-1.5 </coefficients></CCB>
......
SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml
+ 35
− 0
View file @ d8759752
......@@ -174,4 +174,39 @@
<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>
</Receiver>
<Receiver>
<receiverCode>MISTRAL</receiverCode>
<phi>90.0</phi>
<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2956719398 </coefficientVal00>
<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>
<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0056679383 </coefficientVal02>
<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0074789114 </coefficientVal03>
<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0008009398 </coefficientVal04>
<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015651340 </coefficientVal05>
<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0572288483 </coefficientVal06>
<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.1136546656 </coefficientVal07>
<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>
<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>
<coefficientNum10> 1 </coefficientNum10> <coefficientVal10> -0.0004978125 </coefficientVal10>
<coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>
<coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0002358370 </coefficientVal12>
<coefficientNum13> 1 </coefficientNum13> <coefficientVal13> 0.0000537828 </coefficientVal13>
<coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>
<coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>
<coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>
<coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>
<coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>
<coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>
<coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>
<coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>
<coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>
<coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>
<coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>
<coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>
<coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>
<coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>
<coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>
<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>
</Receiver>
</PointingModel>
SRT/Configuration/CDB/alma/MINORSERVO/SRP/SRP.xml
+ 2
− 2
View file @ d8759752
......@@ -11,8 +11,8 @@
virtual_axes="6"
max_speed="4, 4, 4, 0.38, 0.38, 0.38"
acceleration="8, 8, 8, 0.76, 0.76, 0.76"
min_range="-50, -110, -50, -0.25, -0.25, -0.25"
max_range="50, 110, 50, 0.25, 0.25, 0.25"
min_range="-125, -125, -125, -0.25, -0.25, -0.25"
max_range="125, 125, 125, 0.25, 0.25, 0.25"
tracking_delta="1, 1, 1, 1, 1, 1">
<enabled description="All physical axes enabled" />
......
SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 19
− 4
View file @ d8759752
......@@ -119,16 +119,31 @@
</body>
</Procedure>
<Procedure name="setupMISTRAL" args="0">
<body>
antennaSetup=MISTRAL
servoSetup=MISTRAL
receiversSetup=KKG
receiversMode=SINGLEDISH
chooseBackend=TotalPower
initialize=CCG
device=0
calOff
restFrequency=0
azelOffsets=0d,0d
</body>
</Procedure>
<Procedure name="telescopePark" args="0">
<body>
goTo=180d,89.8d
goTo=*,89.8d
receiversPark
servoPark
asPark
waitOnSource
antennaStop
wait=1
antennaPark
receiversPark
servoPark
asPark
logMessage=Telescope is now parked
</body>
</Procedure>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment