Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/emc/usr_intf/pncconf/private_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,9 @@ def __init__(self,app,bin_dir,base_dir):
[_("X2 Maximum Limit"),S.MAX_X2 ], [_("Y2 Maximum Limit"),S.MAX_Y2 ], [_("Z2 Maximum Limit"),S.MAX_Z2 ], [_("A2 Maximum Limit"),S.MAX_A2 ],
[_("X2 Both Limit"),S.BOTH_X2 ], [_("Y2 Both Limit"),S.BOTH_Y2 ], [_("Z2 Both Limit"),S.BOTH_Z2 ], [_("A2 Both Limit"), S.BOTH_A2], ]

blimits = [["Main Axis",limit],["Tandem Axis",limit2]]
bhome = [["Main Axis",home],["Tandem Axis",home2]]
bshared = [["Main Axis",home_limits_shared],["Tandem Axis",home_limits_shared2]]
blimits = [[_("Main Axis"),limit],[_("Tandem Axis"),limit2]]
bhome = [[_("Main Axis"),home],[_("Tandem Axis"),home2]]
bshared = [[_("Main Axis"),home_limits_shared],[_("Tandem Axis"),home_limits_shared2]]
self.human_input_names = [ [_("Unused Input"),S.UNUSED_INPUT],[_("Limits"),blimits],
[_("Home"),bhome],[_("Limts/Home Shared"),bshared],
[_("Digital"),digital],[_("Axis Selection"),axis_select],[_("Overrides"),override],
Expand All @@ -457,7 +457,7 @@ def __init__(self,app,bin_dir,base_dir):
[_("Z2 Tandem PWM"), S.Z2_PWM_PULSE], [_("A2 Tandem PWM"), S.A2_PWM_PULSE]]
mpwm =[[_("X Axis PWM"), S.X_PWM_PULSE],[_("Y Axis PWM"), S.Y_PWM_PULSE],
[_("Z Axis PWM"), S.Z_PWM_PULSE],[_("A Axis PWM"), S.A_PWM_PULSE]]
tandem_pwm = [["Main Axis",mpwm],["Tandem Axis",tpwm]]
tandem_pwm = [[_("Main Axis"),mpwm],[_("Tandem Axis"),tpwm]]
self.human_pwm_output_names =[ [_("Unused PWM Gen"), S.UNUSED_PWM],[_("Axis PWM"),
tandem_pwm],[_("Spindle PWM"), S.SPINDLE_PWM_PULSE],
[_("Custom Signals"),[]] ]
Expand All @@ -467,9 +467,9 @@ def __init__(self,app,bin_dir,base_dir):
[_("A Axis StepGen"),S.A_STEPGEN_STEP] ]
tandem_step = [ [_("X2 Tandem StepGen"),S.X2_STEPGEN_STEP],[_("Y2 Tandem StepGen"),S.Y2_STEPGEN_STEP],
[_("Z2 Tandem StepGen"),S.Z2_STEPGEN_STEP]]
bstep = [["Main Axis",main_step],["Tandem Axis",tandem_step]]
bstep = [[_("Main Axis"),main_step],[_("Tandem Axis"),tandem_step]]
self.human_stepper_names = [ [_("Unused StepGen"),S.UNUSED_STEPGEN],
["Axis",bstep],
[_("Axis"),bstep],
[_("Charge Pump StepGen"), S.CHARGE_PUMP_STEP], [_("Spindle StepGen"), S.SPINDLE_STEPGEN_STEP],
[_("Custom Signals"),[]] ]
#
Expand All @@ -482,7 +482,7 @@ def __init__(self,app,bin_dir,base_dir):
[_("Z Hand Wheel"), S.Z_MPG_A], [_("A Hand Wheel"), S.A_MPG_A],
[_("Multi Hand Wheel"), S.SELECT_MPG_A]]
over = [[_("Feed Override"), S.FO_MPG_A], [_("spindle Override"), S.SO_MPG_A],[_("Max Vel Override"), S.MVO_MPG_A]]
tandem_enc = [["Main Axis",axis],["Tandem Axis",taxis]]
tandem_enc = [[_("Main Axis"),axis],[_("Tandem Axis"),taxis]]
self.human_encoder_input_names = [ [_("Unused Encoder"), S.UNUSED_ENCODER],[_("Axis Encoder"), tandem_enc],
[_("Spindle Encoder"), S.SPINDLE_ENCODER_A], [_("MPG Jog Controls"), mpg],[_("Override MPG control"), over],
[_("Custom Signals"),[]] ]
Expand Down