Commit 1660f293 authored by Jacques Ratel's avatar Jacques Ratel

New TOR REGULATIONS.

d6030 and D6060
parent b31c4063
......@@ -198,7 +198,8 @@ enum PositionRegulationType {
PIEZZO_REGULATION = 2,
TRAPEZE_PIEZZO_REGULATION = 3,
TRAPEZE_PP_ONETOFOR_REGULATION = 4,
TOR_REGULATION = 5,
TOR_D6030_REGULATION = 5,
TOR_D6060_REGULATION = 6,
};
// Oscillation
......
......@@ -217,8 +217,10 @@ macAxis.controlTypeTRAPEZEPIEZZOPositionValue=3
macAxis.controlTypeTRAPEZEPIEZZOPositionLabel=TRAPEZE
macAxis.controlTypeTrapeze1To4PositionValue=4
macAxis.controlTypeTrapeze1To4PositionLabel=TRAPEZE 1 to 4
macAxis.controlTypeTORPositionValue=5
macAxis.controlTypeTORPositionLabel=TOR
macAxis.controlTypeTORD6030PositionValue=5
macAxis.controlTypeTORD6030PositionLabel=TOR D6030
macAxis.controlTypeTORD6060PositionValue=6
macAxis.controlTypeTORD6060PositionLabel=TOR D6060
macAxis.useBrakeAcknowledgePrefix=Brake Acknowledge
macAxis.useBrakeAcknowledgeCheckedValue=1
......
......@@ -356,7 +356,7 @@
<switchable_composite switch_values="3"
switcher_key="motorTypeSwitchKey">
<combo role="MacAxis1" property="controlType"
valuesAndLabels="macAxis.controlTypeTORPosition" prefix="macAxis.controlTypePrefix"
valuesAndLabels="macAxis.controlTypeTORD6030Position,macAxis.controlTypeTORD6060Position" prefix="macAxis.controlTypePrefix"
spaceBefore="false" />
</switchable_composite>
......
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