Commit b7fa0b1e authored by Jacques Ratel's avatar Jacques Ratel

New RDC encoder.

parent 2fda044d
......@@ -137,6 +137,7 @@ enum encoderSciSpecificationType {
SCI_INCREMENTAL_TYPE = 102,
SCI_ENDAT_TYPE = 103,
SCI_SSI_ENDAT_TYPE = 104,
SCI_RDC_TYPE = 105,
SCI_SIMULATION = 199
};
......
......@@ -41,6 +41,8 @@ macAxis.endatValue=103
macAxis.endatLabel=Endat
macAxis.ssiendatValue=104
macAxis.ssiendatLabel=SsiEndat
macAxis.ssirdcValue=105
macAxis.ssirdcLabel=SsiRdc
macAxis.transmagneticssingleValue=200
macAxis.transmagneticssingleLabel=Single
......
......@@ -67,7 +67,7 @@
switcher_key="encoderTypeSwitchKey">
<combo role="MacAxis1" property="encoderSpecification"
sortOnLabels="false"
valuesAndLabels="macAxis.scim58,macAxis.scim47,macAxis.incremental,macAxis.ssiendat"
valuesAndLabels="macAxis.scim58,macAxis.scim47,macAxis.incremental,macAxis.ssiendat,macAxis.ssirdc"
prefix="macAxis.encoderSpecificationPrefix" />
</switchable_composite>
<switchable_composite switch_values="3"
......@@ -88,7 +88,7 @@
<switchable_composite switch_values="1,2,3,4"
switcher_key="encoderTypeSwitchKey">
<switchable_composite
switch_values="0,1,2,3,4,5,100,101,102,103,104,200,201,202,203,300,301,302,303,304"
switch_values="0,1,2,3,4,5,100,101,102,103,104,105,200,201,202,203,300,301,302,303,304"
switcher_key="encoderSpecificationSwitchKey">
<text role="MacAxis1" property="encoderAddress" prefix="macAxis.encoderAddressPrefix"
suffix="macAxis.encoderAddressSuffix" />
......@@ -98,7 +98,7 @@
<switchable_composite switch_values="1,2,3,4"
switcher_key="encoderTypeSwitchKey">
<switchable_composite
switch_values="2,3,4,5,101,102,103,104,200,201,202,203,300,301,302,303,304"
switch_values="2,3,4,5,101,102,103,104,105,200,201,202,203,300,301,302,303,304"
switcher_key="encoderSpecificationSwitchKey">
<text role="MacAxis1" property="encoderChannel"
prefix="macAxis.encoderChannelSacadosPrefix" />
......@@ -108,7 +108,7 @@
<switchable_composite switch_values="2"
switcher_key="encoderTypeSwitchKey">
<switchable_composite switch_values="104"
<switchable_composite switch_values="104,105"
switcher_key="encoderSpecificationSwitchKey">
<group title="macAxis.baud.group">
<radio role="MacAxis1" property="encoderBaudRate"
......@@ -151,7 +151,7 @@
<switchable_composite switch_values="2"
switcher_key="encoderTypeSwitchKey">
<switchable_composite switch_values="104"
<switchable_composite switch_values="104,105"
switcher_key="encoderSpecificationSwitchKey">
<group title="macAxis.code.group">
<radio role="MacAxis1" property="encoderCode"
......@@ -176,13 +176,13 @@
<switchable_composite switch_values="1,2,3,4"
switcher_key="encoderTypeSwitchKey">
<switchable_composite
switch_values="2,3,4,5,101,102,103,104,200,201,202,203,300,301,302,303,304"
switch_values="2,3,4,5,101,102,103,104,105,200,201,202,203,300,301,302,303,304"
switcher_key="encoderSpecificationSwitchKey">
<text role="MacAxis1" property="encoderBitsNumber"
prefix="macAxis.encoderBitsNumberPrefix" />
</switchable_composite>
<switchable_composite switch_values="103,104"
<switchable_composite switch_values="103,104,105"
switcher_key="encoderSpecificationSwitchKey">
<combo role="MacAxis1" property="encoderShift" prefix="macAxis.encoderShiftPrefix"
valuesAndLabels="macAxis.Shift0,macAxis.Shift1,macAxis.Shift2,macAxis.Shift3,macAxis.Shift4,macAxis.Shift5" />
......@@ -247,7 +247,7 @@
<switchable_composite switch_values="2"
switcher_key="encoderTypeSwitchKey">
<switchable_composite switch_values="100,101,102,103,104"
<switchable_composite switch_values="100,101,102,103,104,105"
switcher_key="encoderSpecificationSwitchKey">
<text role="MacAxis1" property="encoderOffset" prefix="macAxis.encoderOffsetPrefix" />
<switchable_composite switch_values="1"
......
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