Commit bd88e9e2 authored by Jacques Ratel's avatar Jacques Ratel

new encoder: single and double rdc

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