diff options
author | Dewey Garrett <dgarrett@panix.com> | 2013-12-05 13:35:45 -0700 |
---|---|---|
committer | Chris Radek <chris@timeguy.com> | 2013-12-07 10:50:30 -0600 |
commit | a67063adf7e77c55699b93f023a867e347de2669 (patch) | |
tree | 49755295293da912dbcec7c7dffbb7d8eb141c20 | |
parent | b02b05822baf43d74f441044cac97c3c6b160247 (diff) | |
download | linuxcnc-a67063adf7e77c55699b93f023a867e347de2669.tar.gz linuxcnc-a67063adf7e77c55699b93f023a867e347de2669.zip |
rearrange: relocate subdirs to parents
mv ngcgui files using axis to the axis subdir
mv ngcgui files using touchy to the touchy subdir
-rw-r--r-- | configs/sim/axis/ngcgui/README (renamed from configs/sim/ngcgui/README) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/axis_manualtoolchange.hal (renamed from configs/sim/ngcgui/axis_manualtoolchange.hal) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/core_sim.hal (renamed from configs/sim/ngcgui/core_sim.hal) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/fullscreen.tcl (renamed from configs/sim/ngcgui/fullscreen.tcl) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/gremlin_view.ui | 1 | ||||
l--------- | configs/sim/axis/ngcgui/lathe.hal (renamed from configs/sim/ngcgui/lathe.hal) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/lathe.tbl (renamed from configs/sim/ngcgui/lathe.tbl) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui.ini (renamed from configs/sim/ngcgui/ngcgui.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui.txt (renamed from configs/sim/ngcgui/ngcgui.txt) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui_lathe.ini (renamed from configs/sim/ngcgui/ngcgui_lathe.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui_lathe.txt (renamed from configs/sim/ngcgui/ngcgui_lathe.txt) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui_simple.ini (renamed from configs/sim/ngcgui/ngcgui_simple.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/ngcgui_simple.txt (renamed from configs/sim/ngcgui/ngcgui_simple.txt) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui.ui (renamed from configs/sim/ngcgui/pyngcgui.ui) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_axis.ini (renamed from configs/sim/ngcgui/pyngcgui_axis.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_axis.txt (renamed from configs/sim/ngcgui/pyngcgui_axis.txt) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_axis.ui (renamed from configs/sim/ngcgui/pyngcgui_axis.ui) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_gscreen.ini (renamed from configs/sim/ngcgui/pyngcgui_gscreen.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_gscreen.txt (renamed from configs/sim/ngcgui/pyngcgui_gscreen.txt) | 0 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.ini (renamed from configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.ini) | 6 | ||||
-rw-r--r-- | configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.txt (renamed from configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.txt) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/pyngcgui_popupkeyboard.ui | 1 | ||||
l--------- | configs/sim/axis/ngcgui/sim.tbl (renamed from configs/sim/ngcgui/sim.tbl) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/sim_spindle_encoder.hal (renamed from configs/sim/ngcgui/sim_spindle_encoder.hal) | 0 | ||||
l--------- | configs/sim/axis/ngcgui/simulated_home.hal (renamed from configs/sim/ngcgui/simulated_home.hal) | 0 | ||||
-rw-r--r-- | configs/sim/gremlin_view.ui (renamed from configs/sim/ngcgui/gremlin_view.ui) | 0 | ||||
-rw-r--r-- | configs/sim/pyngcgui_popupkeyboard.ui (renamed from configs/sim/ngcgui/pyngcgui_popupkeyboard.ui) | 0 | ||||
l--------- | configs/sim/touchy/ngcgui/axis_manualtoolchange.hal | 1 | ||||
l--------- | configs/sim/touchy/ngcgui/core_sim.hal | 1 | ||||
l--------- | configs/sim/touchy/ngcgui/gremlin_view.ui | 1 | ||||
l--------- | configs/sim/touchy/ngcgui/lathe.hal | 1 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/pyngcgui_touchy.ini (renamed from configs/sim/ngcgui/pyngcgui_touchy.ini) | 6 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/pyngcgui_touchy.txt (renamed from configs/sim/ngcgui/pyngcgui_touchy.txt) | 0 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.ini (renamed from configs/sim/ngcgui/pyngcgui_touchy_lathe.ini) | 6 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.txt (renamed from configs/sim/ngcgui/pyngcgui_touchy_lathe.txt) | 0 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/pyngcgui_touchy_popupkeyboard.ui (renamed from configs/sim/ngcgui/pyngcgui_touchy_popupkeyboard.ui) | 0 | ||||
l--------- | configs/sim/touchy/ngcgui/simulated_home.hal | 1 | ||||
-rw-r--r-- | configs/sim/touchy/ngcgui/touchy.hal (renamed from configs/sim/ngcgui/touchy.hal) | 0 | ||||
-rwxr-xr-x | configs/sim/touchy/ngcgui/touchy_sim.tcl (renamed from configs/sim/ngcgui/touchy_sim.tcl) | 0 |
39 files changed, 31 insertions, 24 deletions
diff --git a/configs/sim/ngcgui/README b/configs/sim/axis/ngcgui/README index c330106e9..c330106e9 100644 --- a/configs/sim/ngcgui/README +++ b/configs/sim/axis/ngcgui/README diff --git a/configs/sim/ngcgui/axis_manualtoolchange.hal b/configs/sim/axis/ngcgui/axis_manualtoolchange.hal index b7c30109b..b7c30109b 120000 --- a/configs/sim/ngcgui/axis_manualtoolchange.hal +++ b/configs/sim/axis/ngcgui/axis_manualtoolchange.hal diff --git a/configs/sim/ngcgui/core_sim.hal b/configs/sim/axis/ngcgui/core_sim.hal index ead328270..ead328270 120000 --- a/configs/sim/ngcgui/core_sim.hal +++ b/configs/sim/axis/ngcgui/core_sim.hal diff --git a/configs/sim/ngcgui/fullscreen.tcl b/configs/sim/axis/ngcgui/fullscreen.tcl index 30fedf618..30fedf618 100644 --- a/configs/sim/ngcgui/fullscreen.tcl +++ b/configs/sim/axis/ngcgui/fullscreen.tcl diff --git a/configs/sim/axis/ngcgui/gremlin_view.ui b/configs/sim/axis/ngcgui/gremlin_view.ui new file mode 120000 index 000000000..4c3bbf00a --- /dev/null +++ b/configs/sim/axis/ngcgui/gremlin_view.ui @@ -0,0 +1 @@ +../../gremlin_view.ui
\ No newline at end of file diff --git a/configs/sim/ngcgui/lathe.hal b/configs/sim/axis/ngcgui/lathe.hal index 4d8ae3e5f..4d8ae3e5f 120000 --- a/configs/sim/ngcgui/lathe.hal +++ b/configs/sim/axis/ngcgui/lathe.hal diff --git a/configs/sim/ngcgui/lathe.tbl b/configs/sim/axis/ngcgui/lathe.tbl index 800e8958e..800e8958e 120000 --- a/configs/sim/ngcgui/lathe.tbl +++ b/configs/sim/axis/ngcgui/lathe.tbl diff --git a/configs/sim/ngcgui/ngcgui.ini b/configs/sim/axis/ngcgui/ngcgui.ini index c283a12d1..fceb48052 100644 --- a/configs/sim/ngcgui/ngcgui.ini +++ b/configs/sim/axis/ngcgui/ngcgui.ini @@ -7,11 +7,11 @@ DEBUG = 0 [RS274NGC] PARAMETER_FILE = sim.var -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles [DISPLAY] -PROGRAM_PREFIX = ../../../nc_files +PROGRAM_PREFIX = ../../../../nc_files TKPKG = Ngcgui 1.0 TKPKG = Ngcguittt 1.0 # Ngcgui must precede Ngcguittt diff --git a/configs/sim/ngcgui/ngcgui.txt b/configs/sim/axis/ngcgui/ngcgui.txt index 9b8695d63..9b8695d63 100644 --- a/configs/sim/ngcgui/ngcgui.txt +++ b/configs/sim/axis/ngcgui/ngcgui.txt diff --git a/configs/sim/ngcgui/ngcgui_lathe.ini b/configs/sim/axis/ngcgui/ngcgui_lathe.ini index 3dc553cda..7f1a89e55 100644 --- a/configs/sim/ngcgui/ngcgui_lathe.ini +++ b/configs/sim/axis/ngcgui/ngcgui_lathe.ini @@ -4,11 +4,11 @@ MACHINE = ngcgui-lathe [RS274NGC] PARAMETER_FILE = sim-lathe.var -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib/lathe:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib/lathe:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles [DISPLAY] -PROGRAM_PREFIX = ../../../nc_files +PROGRAM_PREFIX = ../../../../nc_files # Note: TKPKG (one or more) specifies tcl/tk apps to embed in axis tab pages TKPKG = Ngcgui 1.0 diff --git a/configs/sim/ngcgui/ngcgui_lathe.txt b/configs/sim/axis/ngcgui/ngcgui_lathe.txt index 45154a9e2..45154a9e2 100644 --- a/configs/sim/ngcgui/ngcgui_lathe.txt +++ b/configs/sim/axis/ngcgui/ngcgui_lathe.txt diff --git a/configs/sim/ngcgui/ngcgui_simple.ini b/configs/sim/axis/ngcgui/ngcgui_simple.ini index 475d65c3c..02bae84c6 100644 --- a/configs/sim/ngcgui/ngcgui_simple.ini +++ b/configs/sim/axis/ngcgui/ngcgui_simple.ini @@ -7,11 +7,11 @@ DEBUG = 0 [RS274NGC] PARAMETER_FILE = sim.var -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles [DISPLAY] -PROGRAM_PREFIX = ../../../nc_files +PROGRAM_PREFIX = ../../../../nc_files # Note: TKPKG (one or more) specifies tcl/tk apps to embed in axis tab pages TKPKG = Ngcgui 1.0 diff --git a/configs/sim/ngcgui/ngcgui_simple.txt b/configs/sim/axis/ngcgui/ngcgui_simple.txt index 22de284fe..22de284fe 100644 --- a/configs/sim/ngcgui/ngcgui_simple.txt +++ b/configs/sim/axis/ngcgui/ngcgui_simple.txt diff --git a/configs/sim/ngcgui/pyngcgui.ui b/configs/sim/axis/ngcgui/pyngcgui.ui index d56fcddd3..d56fcddd3 100644 --- a/configs/sim/ngcgui/pyngcgui.ui +++ b/configs/sim/axis/ngcgui/pyngcgui.ui diff --git a/configs/sim/ngcgui/pyngcgui_axis.ini b/configs/sim/axis/ngcgui/pyngcgui_axis.ini index 298ff1e9f..8c19decce 100644 --- a/configs/sim/ngcgui/pyngcgui_axis.ini +++ b/configs/sim/axis/ngcgui/pyngcgui_axis.ini @@ -7,11 +7,11 @@ DEBUG = 0 [RS274NGC] PARAMETER_FILE = sim.var -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles [DISPLAY] -PROGRAM_PREFIX = ../../../nc_files +PROGRAM_PREFIX = ../../../../nc_files USER_COMMAND_FILE = ./fullscreen.tcl EMBED_TAB_NAME = Pyngcgui diff --git a/configs/sim/ngcgui/pyngcgui_axis.txt b/configs/sim/axis/ngcgui/pyngcgui_axis.txt index 697e9d472..697e9d472 100644 --- a/configs/sim/ngcgui/pyngcgui_axis.txt +++ b/configs/sim/axis/ngcgui/pyngcgui_axis.txt diff --git a/configs/sim/ngcgui/pyngcgui_axis.ui b/configs/sim/axis/ngcgui/pyngcgui_axis.ui index a6b236122..a6b236122 100644 --- a/configs/sim/ngcgui/pyngcgui_axis.ui +++ b/configs/sim/axis/ngcgui/pyngcgui_axis.ui diff --git a/configs/sim/ngcgui/pyngcgui_gscreen.ini b/configs/sim/axis/ngcgui/pyngcgui_gscreen.ini index 9f8aca15f..e10968639 100644 --- a/configs/sim/ngcgui/pyngcgui_gscreen.ini +++ b/configs/sim/axis/ngcgui/pyngcgui_gscreen.ini @@ -83,7 +83,7 @@ MESSAGE_TYPE = okdialog status MESSAGE_PINNAME = bothtest # Prefix to be used -PROGRAM_PREFIX = ../../../nc_files/ +PROGRAM_PREFIX = ../../../../nc_files/ # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif @@ -113,8 +113,8 @@ CYCLE_TIME = 0.001 # Part program interpreter section -------------------------------------------- [RS274NGC] -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles # File containing interpreter variables PARAMETER_FILE = sim.var diff --git a/configs/sim/ngcgui/pyngcgui_gscreen.txt b/configs/sim/axis/ngcgui/pyngcgui_gscreen.txt index ae3f8abc3..ae3f8abc3 100644 --- a/configs/sim/ngcgui/pyngcgui_gscreen.txt +++ b/configs/sim/axis/ngcgui/pyngcgui_gscreen.txt diff --git a/configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.ini b/configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.ini index 1c00bcce8..f3befbba5 100644 --- a/configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.ini +++ b/configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.ini @@ -83,7 +83,7 @@ MESSAGE_TYPE = okdialog status MESSAGE_PINNAME = bothtest # Prefix to be used -PROGRAM_PREFIX = ../../../nc_files/ +PROGRAM_PREFIX = ../../../../nc_files/ # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif @@ -113,8 +113,8 @@ CYCLE_TIME = 0.001 # Part program interpreter section -------------------------------------------- [RS274NGC] -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles # File containing interpreter variables PARAMETER_FILE = sim.var diff --git a/configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.txt b/configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.txt index 3d642e2c3..3d642e2c3 100644 --- a/configs/sim/ngcgui/pyngcgui_gscreen_popupkeyboard.txt +++ b/configs/sim/axis/ngcgui/pyngcgui_gscreen_popupkeyboard.txt diff --git a/configs/sim/axis/ngcgui/pyngcgui_popupkeyboard.ui b/configs/sim/axis/ngcgui/pyngcgui_popupkeyboard.ui new file mode 120000 index 000000000..4e340be63 --- /dev/null +++ b/configs/sim/axis/ngcgui/pyngcgui_popupkeyboard.ui @@ -0,0 +1 @@ +../../pyngcgui_popupkeyboard.ui
\ No newline at end of file diff --git a/configs/sim/ngcgui/sim.tbl b/configs/sim/axis/ngcgui/sim.tbl index d67c68bf9..d67c68bf9 120000 --- a/configs/sim/ngcgui/sim.tbl +++ b/configs/sim/axis/ngcgui/sim.tbl diff --git a/configs/sim/ngcgui/sim_spindle_encoder.hal b/configs/sim/axis/ngcgui/sim_spindle_encoder.hal index 1dac03e59..1dac03e59 120000 --- a/configs/sim/ngcgui/sim_spindle_encoder.hal +++ b/configs/sim/axis/ngcgui/sim_spindle_encoder.hal diff --git a/configs/sim/ngcgui/simulated_home.hal b/configs/sim/axis/ngcgui/simulated_home.hal index 291b8a6ca..291b8a6ca 120000 --- a/configs/sim/ngcgui/simulated_home.hal +++ b/configs/sim/axis/ngcgui/simulated_home.hal diff --git a/configs/sim/ngcgui/gremlin_view.ui b/configs/sim/gremlin_view.ui index 8004e4d4e..8004e4d4e 100644 --- a/configs/sim/ngcgui/gremlin_view.ui +++ b/configs/sim/gremlin_view.ui diff --git a/configs/sim/ngcgui/pyngcgui_popupkeyboard.ui b/configs/sim/pyngcgui_popupkeyboard.ui index 7117808ca..7117808ca 100644 --- a/configs/sim/ngcgui/pyngcgui_popupkeyboard.ui +++ b/configs/sim/pyngcgui_popupkeyboard.ui diff --git a/configs/sim/touchy/ngcgui/axis_manualtoolchange.hal b/configs/sim/touchy/ngcgui/axis_manualtoolchange.hal new file mode 120000 index 000000000..397c8934a --- /dev/null +++ b/configs/sim/touchy/ngcgui/axis_manualtoolchange.hal @@ -0,0 +1 @@ +../../axis_manualtoolchange.hal
\ No newline at end of file diff --git a/configs/sim/touchy/ngcgui/core_sim.hal b/configs/sim/touchy/ngcgui/core_sim.hal new file mode 120000 index 000000000..ead328270 --- /dev/null +++ b/configs/sim/touchy/ngcgui/core_sim.hal @@ -0,0 +1 @@ +../core_sim.hal
\ No newline at end of file diff --git a/configs/sim/touchy/ngcgui/gremlin_view.ui b/configs/sim/touchy/ngcgui/gremlin_view.ui new file mode 120000 index 000000000..4c3bbf00a --- /dev/null +++ b/configs/sim/touchy/ngcgui/gremlin_view.ui @@ -0,0 +1 @@ +../../gremlin_view.ui
\ No newline at end of file diff --git a/configs/sim/touchy/ngcgui/lathe.hal b/configs/sim/touchy/ngcgui/lathe.hal new file mode 120000 index 000000000..8bc96fbb2 --- /dev/null +++ b/configs/sim/touchy/ngcgui/lathe.hal @@ -0,0 +1 @@ +../../lathe.hal
\ No newline at end of file diff --git a/configs/sim/ngcgui/pyngcgui_touchy.ini b/configs/sim/touchy/ngcgui/pyngcgui_touchy.ini index c0b2b88b3..e2303b918 100644 --- a/configs/sim/ngcgui/pyngcgui_touchy.ini +++ b/configs/sim/touchy/ngcgui/pyngcgui_touchy.ini @@ -43,7 +43,7 @@ NGCGUI_SUBFILE = "" DISPLAY = touchy -PROGRAM_PREFIX = ../../../nc_files/ +PROGRAM_PREFIX = ../../../../nc_files/ INTRO_GRAPHIC = linuxcnc.gif INTRO_TIME = 5 @@ -54,8 +54,8 @@ TASK = milltask CYCLE_TIME = 0.001 [RS274NGC] -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles # File containing interpreter variables PARAMETER_FILE = sim.var diff --git a/configs/sim/ngcgui/pyngcgui_touchy.txt b/configs/sim/touchy/ngcgui/pyngcgui_touchy.txt index 2b184ff1e..2b184ff1e 100644 --- a/configs/sim/ngcgui/pyngcgui_touchy.txt +++ b/configs/sim/touchy/ngcgui/pyngcgui_touchy.txt diff --git a/configs/sim/ngcgui/pyngcgui_touchy_lathe.ini b/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.ini index 3554c6500..f0d6816f8 100644 --- a/configs/sim/ngcgui/pyngcgui_touchy_lathe.ini +++ b/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.ini @@ -4,11 +4,11 @@ MACHINE = pyngcgui-touchy-lathe demo [RS274NGC] PARAMETER_FILE = sim-lathe.var -SUBROUTINE_PATH = ../../../nc_files/ngcgui_lib/lathe:../../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../../nc_files/ngcgui_lib/mfiles +SUBROUTINE_PATH = ../../../../nc_files/ngcgui_lib/lathe:../../../../nc_files/ngcgui_lib/utilitysubs +USER_M_PATH = ../../../../nc_files/ngcgui_lib/mfiles [DISPLAY] -PROGRAM_PREFIX = ../../../nc_files +PROGRAM_PREFIX = ../../../../nc_files EMBED_TAB_NAME = Pyngcgui EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui_touchy_popupkeyboard.ui diff --git a/configs/sim/ngcgui/pyngcgui_touchy_lathe.txt b/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.txt index d3ed86e43..d3ed86e43 100644 --- a/configs/sim/ngcgui/pyngcgui_touchy_lathe.txt +++ b/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.txt diff --git a/configs/sim/ngcgui/pyngcgui_touchy_popupkeyboard.ui b/configs/sim/touchy/ngcgui/pyngcgui_touchy_popupkeyboard.ui index 31d825f5b..31d825f5b 100644 --- a/configs/sim/ngcgui/pyngcgui_touchy_popupkeyboard.ui +++ b/configs/sim/touchy/ngcgui/pyngcgui_touchy_popupkeyboard.ui diff --git a/configs/sim/touchy/ngcgui/simulated_home.hal b/configs/sim/touchy/ngcgui/simulated_home.hal new file mode 120000 index 000000000..a0e8e5601 --- /dev/null +++ b/configs/sim/touchy/ngcgui/simulated_home.hal @@ -0,0 +1 @@ +../../simulated_home.hal
\ No newline at end of file diff --git a/configs/sim/ngcgui/touchy.hal b/configs/sim/touchy/ngcgui/touchy.hal index ab53c3807..ab53c3807 100644 --- a/configs/sim/ngcgui/touchy.hal +++ b/configs/sim/touchy/ngcgui/touchy.hal diff --git a/configs/sim/ngcgui/touchy_sim.tcl b/configs/sim/touchy/ngcgui/touchy_sim.tcl index 6f048c45e..6f048c45e 100755 --- a/configs/sim/ngcgui/touchy_sim.tcl +++ b/configs/sim/touchy/ngcgui/touchy_sim.tcl |