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

Added MinorServos CABINET GFR configuration

parent f9d46107
Branches
Tags
No related merge requests found
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
<MISTRAL> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL> <MISTRAL> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL>
<MISTRAL_ASACTIVE> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL_ASACTIVE> <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 --> <!-- 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> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB-->
<!--CCB_ASACTIVE> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB_ASACTIVE--> <!--CCB_ASACTIVE> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB_ASACTIVE-->
......
...@@ -79,11 +79,11 @@ namespace MinorServo ...@@ -79,11 +79,11 @@ namespace MinorServo
using DiscosConfigurationNameTableType = std::map<std::string, std::pair<SRTMinorServoFocalConfiguration, bool>>; using DiscosConfigurationNameTableType = std::map<std::string, std::pair<SRTMinorServoFocalConfiguration, bool>>;
const DiscosConfigurationNameTableType DiscosConfigurationNameTable = const DiscosConfigurationNameTableType DiscosConfigurationNameTable =
{ {
{"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, //{"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)}, //{"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, //{"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)}, //{"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)}, //{"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)},
{"CCG", std::make_pair(CONFIGURATION_GREGORIAN1, true )}, {"CCG", std::make_pair(CONFIGURATION_GREGORIAN1, true )},
{"KKG", std::make_pair(CONFIGURATION_GREGORIAN2, true )}, {"KKG", std::make_pair(CONFIGURATION_GREGORIAN2, true )},
{"WWG", std::make_pair(CONFIGURATION_GREGORIAN3, true )}, {"WWG", std::make_pair(CONFIGURATION_GREGORIAN3, true )},
...@@ -92,6 +92,7 @@ namespace MinorServo ...@@ -92,6 +92,7 @@ namespace MinorServo
{"MISTRAL", std::make_pair(CONFIGURATION_GREGORIAN6, true )}, {"MISTRAL", std::make_pair(CONFIGURATION_GREGORIAN6, true )},
{"CCB", std::make_pair(CONFIGURATION_BWG1, true )}, {"CCB", std::make_pair(CONFIGURATION_BWG1, true )},
{"XB", std::make_pair(CONFIGURATION_BWG3, true )}, {"XB", std::make_pair(CONFIGURATION_BWG3, true )},
{"CABINET", std::make_pair(CONFIGURATION_GREGORIAN7, false)},
}; };
/** /**
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<xs:element name="CCB_ASACTIVE" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" /> <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" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="XB_ASACTIVE" 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:sequence>
</xs:complexType> </xs:complexType>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment