Skip to content

Commit 335d2ad

Browse files
committed
AXIS: use separate comp for pyvcp panel
Currently if a .axisrc or USER_COMMAND_FILE is configured to add hal pins via user_hal_pins, then the pins are not accessible if a pyvcp panel is also configured.
1 parent 1ebfa4a commit 335d2ad

File tree

1 file changed

+6
-5
lines changed
  • src/emc/usr_intf/axis/scripts

1 file changed

+6
-5
lines changed

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def tkerror(self, arg):
7777
else:
7878
hal_present = 1;
7979

80-
if hal_present == 1 :
80+
if hal_present == 1:
8181
import hal
8282

8383
import configparser
@@ -856,7 +856,7 @@ def update(self):
856856
vupdate(vars.exec_state, self.stat.exec_state)
857857
vupdate(vars.interp_state, self.stat.interp_state)
858858
vupdate(vars.queued_mdi_commands, self.stat.queued_mdi_commands)
859-
if hal_present == 1 :
859+
if hal_present == 1:
860860
notifications_clear = comp["notifications-clear"]
861861
if self.notifications_clear != notifications_clear:
862862
self.notifications_clear = notifications_clear
@@ -3890,14 +3890,15 @@ def select_run_from(e):
38903890

38913891
if vcp:
38923892
import vcpparse
3893-
comp.setprefix("pyvcp")
38943893
f = Tkinter.Frame(root_window)
38953894
if inifile.find("DISPLAY", "PYVCP_POSITION") == "BOTTOM":
38963895
f.grid(row=4, column=0, columnspan=6, sticky="nw", padx=4, pady=4)
38973896
else:
38983897
f.grid(row=0, column=4, rowspan=6, sticky="nw", padx=4, pady=4)
38993898
vcpparse.filename = vcp
3900-
vcpparse.create_vcp(f, comp)
3899+
vcpcomp = hal.component("pyvcp")
3900+
vcpparse.create_vcp(f, vcpcomp)
3901+
vcpcomp.ready()
39013902
vcp_frame = f
39023903
root_window.bind("<Control-e>", commands.toggle_show_pyvcppanel)
39033904
help2 += [("Ctrl-E", _("toggle PYVCP panel visibility"))]
@@ -4115,7 +4116,7 @@ def balance_ja():
41154116

41164117
def forget(widget, *pins):
41174118
if "AXIS_NO_AUTOCONFIGURE" in os.environ: return
4118-
if hal_present == 1 :
4119+
if hal_present == 1:
41194120
for p in pins:
41204121
if hal.pin_has_writer(p): return
41214122
m = widget.winfo_manager()

0 commit comments

Comments
 (0)