From 864f5afad6896c5e54dea0e75bbfdb24d6bdb386 Mon Sep 17 00:00:00 2001
From: Giuseppe Carboni <giuseppecarboni89@live.com>
Date: Fri, 10 Jan 2025 10:12:12 +0000
Subject: [PATCH] Added MinorServos CABINET GFR configuration
---
.../MinorServo/GFR/LookupTables/LookupTables.xml | 2 ++
.../include/SRTMinorServoContainers.h | 11 ++++++-----
.../config/CDB/schemas/SRTMinorServoLookupTable.xsd | 1 +
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml
index 9481f7890..c8cb3564c 100644
--- a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml
+++ b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml
@@ -23,6 +23,8 @@
<MISTRAL> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL>
<MISTRAL_ASACTIVE> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL_ASACTIVE>
+ <CABINET> <axis>ROTATION</axis> <coefficients>40 </coefficients></CABINET>
+
<!-- BWG - GFR open - configurations commented out since the SETUP command takes care of positioning the GFR to 0 -->
<!--CCB> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB-->
<!--CCB_ASACTIVE> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB_ASACTIVE-->
diff --git a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h
index 3c5446638..cae77edb3 100644
--- a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h
+++ b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h
@@ -79,11 +79,11 @@ namespace MinorServo
using DiscosConfigurationNameTableType = std::map<std::string, std::pair<SRTMinorServoFocalConfiguration, bool>>;
const DiscosConfigurationNameTableType DiscosConfigurationNameTable =
{
- {"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
- {"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)},
- {"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
- {"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)},
- {"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)},
+ //{"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
+ //{"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)},
+ //{"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
+ //{"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)},
+ //{"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"CCG", std::make_pair(CONFIGURATION_GREGORIAN1, true )},
{"KKG", std::make_pair(CONFIGURATION_GREGORIAN2, true )},
{"WWG", std::make_pair(CONFIGURATION_GREGORIAN3, true )},
@@ -92,6 +92,7 @@ namespace MinorServo
{"MISTRAL", std::make_pair(CONFIGURATION_GREGORIAN6, true )},
{"CCB", std::make_pair(CONFIGURATION_BWG1, true )},
{"XB", std::make_pair(CONFIGURATION_BWG3, true )},
+ {"CABINET", std::make_pair(CONFIGURATION_GREGORIAN7, false)},
};
/**
diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd
index 858936df2..4470ec709 100644
--- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd
+++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd
@@ -44,6 +44,7 @@
<xs:element name="CCB_ASACTIVE" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="XB" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="XB_ASACTIVE" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="CABINET" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
--
GitLab