Menu
▾
▴
[Emc-commit] master: gmoccapy 1.0 - stand alone , separated from gscreen
|
From: Norbert S. <gi...@gi...> - 2014-02-28 21:15:27
|
gmoccapy 1.0 - stand alone , separated from gscreen ver 1.0 - we reached the stable state! gmoccapy get completely separated from gsvreen, resultng in a faster reaction and easieer support and maintanance, as there is now less influence from the other gui. http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=5797977 --- configs/sim/gmoccapy/README | 11 +- configs/sim/gmoccapy/axis_manualtoolchange.hal | 1 - configs/sim/gmoccapy/botton.hal | 20 +- configs/sim/gmoccapy/gmoccapy.ini | 55 +- configs/sim/gmoccapy/gmoccapy2.glade | 81 + configs/sim/gmoccapy/gmoccapy_4_axis.ini | 3 +- configs/sim/gmoccapy/gmoccapy_development.pref | 71 + configs/sim/gmoccapy/gmoccapy_jog_wheels.ini | 3 +- configs/sim/gmoccapy/gmoccapy_lathe.ini | 3 +- configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini | 3 +- configs/sim/gmoccapy/gmoccapy_left_panel.ini | 5 +- configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy.pref | 69 + .../gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini | 6 +- .../gmoccapy/gmoccapy_plasma/gmoccapy_postgui.hal | 9 +- .../sim/gmoccapy/gmoccapy_plasma/plasma.var.BAD | 37 + configs/sim/gmoccapy/gmoccapy_postgui.hal | 59 +- .../sim/gmoccapy/gmoccapy_postgui_left_panel.hal | 75 +- configs/sim/gmoccapy/gmoccapy_right_panel.ini | 3 +- .../sim/gmoccapy/gmoccapy_sim_hardware_button.ini | 3 +- configs/sim/gmoccapy/gmoccapy_tool_sensor.ini | 4 +- configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini | 3 +- configs/sim/gmoccapy/jogwheel.hal | 10 +- configs/sim/gmoccapy/lathe.tbl | 6 +- configs/sim/gmoccapy/left.hal | 14 +- configs/sim/gmoccapy/macros/change.ngc | 16 +- .../sim/gmoccapy/ngcgui/axis_manualtoolchange.hal | 1 - configs/sim/gmoccapy/ngcgui/core_sim.hal | 1 - configs/sim/gmoccapy/ngcgui/gremlin_view.ui | 1 - configs/sim/gmoccapy/ngcgui/pyngcgui.ui | 1 - configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy.ini | 203 - .../pyngcgui_gmoccapy_with_popupkeyboard.ini | 203 - .../sim/gmoccapy/ngcgui/pyngcgui_popupkeyboard.ui | 1 - configs/sim/gmoccapy/ngcgui/simulated_home.hal | 1 - configs/sim/gmoccapy/ngcgui/spindle_sim.hal | 1 - configs/sim/gmoccapy/ngcgui/tool.tbl | 1 - configs/sim/gmoccapy/tool.tbl | 48 +- configs/sim/gmoccapy/tool_sensor_postgui.hal | 18 +- lib/python/gmoccapy/__init__.py | 0 lib/python/gmoccapy/dialogs.py | 190 + lib/python/gmoccapy/getiniinfo.py | 246 + lib/python/gmoccapy/notification.py | 271 + lib/python/gmoccapy/player.py | 62 + lib/python/gmoccapy/preferences.py | 50 + lib/python/gmoccapy/widgets.py | 44 + share/gmoccapy/gmoccapy.glade | 6663 +++++++++++++++++++ share/gmoccapy/images/E-Stop.gif | Bin 0 -> 2181 bytes share/gmoccapy/images/Logo.png | Bin 0 -> 500 bytes share/gmoccapy/images/README.txt | 87 + share/gmoccapy/images/applet-critical.png | Bin 0 -> 1411 bytes share/gmoccapy/images/auto_mode.png | Bin 0 -> 5224 bytes share/gmoccapy/images/clear.png | Bin 0 -> 2088 bytes share/gmoccapy/images/configure-2.png | Bin 0 -> 5145 bytes share/gmoccapy/images/coolant_off.png | Bin 0 -> 1159 bytes share/gmoccapy/images/coolant_on.gif | Bin 0 -> 1669 bytes share/gmoccapy/images/dimensions.png | Bin 0 -> 2802 bytes share/gmoccapy/images/editor.png | Bin 0 -> 2535 bytes share/gmoccapy/images/enter.png | Bin 0 -> 1230 bytes share/gmoccapy/images/estopred.png | Bin 0 -> 3509 bytes share/gmoccapy/images/exit.png | Bin 0 -> 3998 bytes share/gmoccapy/images/exit_application.png | Bin 0 -> 2989 bytes share/gmoccapy/images/forward.png | Bin 0 -> 1098 bytes share/gmoccapy/images/forward_on.gif | Bin 0 -> 1634 bytes share/gmoccapy/images/fullscreen_preview.png | Bin 0 -> 2854 bytes share/gmoccapy/images/index_tool.svg | 83 + share/gmoccapy/images/keyboard.png | Bin 0 -> 4136 bytes share/gmoccapy/images/machine_off.png | Bin 0 -> 3399 bytes share/gmoccapy/images/machine_on.png | Bin 0 -> 3375 bytes share/gmoccapy/images/manual_mode.png | Bin 0 -> 3727 bytes share/gmoccapy/images/mdi_mode.png | Bin 0 -> 3249 bytes share/gmoccapy/images/mist_off.png | Bin 0 -> 1341 bytes share/gmoccapy/images/mist_on.gif | Bin 0 -> 1743 bytes share/gmoccapy/images/pause.png | Bin 0 -> 1391 bytes share/gmoccapy/images/refa.png | Bin 0 -> 2604 bytes share/gmoccapy/images/refall.png | Bin 0 -> 1858 bytes share/gmoccapy/images/refb.png | Bin 0 -> 2492 bytes share/gmoccapy/images/refc.png | Bin 0 -> 2585 bytes share/gmoccapy/images/refu.png | Bin 0 -> 1818 bytes share/gmoccapy/images/refv.png | Bin 0 -> 2060 bytes share/gmoccapy/images/refw.png | Bin 0 -> 2249 bytes share/gmoccapy/images/refx.png | Bin 0 -> 1850 bytes share/gmoccapy/images/refy.png | Bin 0 -> 1742 bytes share/gmoccapy/images/refz.png | Bin 0 -> 1732 bytes share/gmoccapy/images/reload.png | Bin 0 -> 4065 bytes share/gmoccapy/images/reverse.png | Bin 0 -> 1098 bytes share/gmoccapy/images/reverse_on.gif | Bin 0 -> 1656 bytes share/gmoccapy/images/runfrom.png | Bin 0 -> 1245 bytes share/gmoccapy/images/save-as.png | Bin 0 -> 4233 bytes share/gmoccapy/images/save.png | Bin 0 -> 3886 bytes share/gmoccapy/images/start.png | Bin 0 -> 2276 bytes share/gmoccapy/images/std_info.gif | Bin 0 -> 659 bytes share/gmoccapy/images/step.png | Bin 0 -> 1171 bytes share/gmoccapy/images/stop.gif | Bin 0 -> 1325 bytes share/gmoccapy/images/stop.png | Bin 0 -> 3200 bytes share/gmoccapy/images/stop_on.gif | Bin 0 -> 1301 bytes share/gmoccapy/images/tool_blockdelete.gif | Bin 0 -> 350 bytes share/gmoccapy/images/tool_by_no.svg | 33 + share/gmoccapy/images/toolaxisp.png | Bin 0 -> 990 bytes share/gmoccapy/images/toolaxisx.png | Bin 0 -> 511 bytes share/gmoccapy/images/toolaxisy.png | Bin 0 -> 423 bytes share/gmoccapy/images/toolaxisy2.png | Bin 0 -> 343 bytes share/gmoccapy/images/toolaxisz.png | Bin 0 -> 499 bytes share/gmoccapy/images/toolchange.png | Bin 0 -> 2937 bytes share/gmoccapy/images/toolpath.png | Bin 0 -> 971 bytes share/gmoccapy/images/tools.png | Bin 0 -> 1905 bytes share/gmoccapy/images/touchoffwz.png | Bin 0 -> 3207 bytes share/gmoccapy/images/touchoffx.png | Bin 0 -> 3224 bytes share/gmoccapy/images/touchoffx_value.png | Bin 0 -> 2570 bytes share/gmoccapy/images/touchoffy.png | Bin 0 -> 2961 bytes share/gmoccapy/images/touchoffy_value.png | Bin 0 -> 2474 bytes share/gmoccapy/images/touchoffz.png | Bin 0 -> 2969 bytes share/gmoccapy/images/touchoffz_value.png | Bin 0 -> 2476 bytes share/gmoccapy/images/unhome.png | Bin 0 -> 1871 bytes share/gmoccapy/images/user_tabs.png | Bin 0 -> 2739 bytes share/gmoccapy/images/zoom-in.png | Bin 0 -> 2879 bytes share/gmoccapy/images/zoom-out.png | Bin 0 -> 2783 bytes share/gscreen/skins/gmoccapy/gcode.lang | 216 - share/gscreen/skins/gmoccapy/gmoccapy.glade | 6709 -------------------- share/gscreen/skins/gmoccapy/gmoccapy_handler.py | 3349 ---------- share/gscreen/skins/gmoccapy/icon/E-Stop.gif | Bin 2181 -> 0 bytes share/gscreen/skins/gmoccapy/icon/Logo.png | Bin 500 -> 0 bytes share/gscreen/skins/gmoccapy/icon/README.txt | 87 - .../skins/gmoccapy/icon/applet-critical.png | Bin 1411 -> 0 bytes share/gscreen/skins/gmoccapy/icon/auto_mode.png | Bin 5224 -> 0 bytes share/gscreen/skins/gmoccapy/icon/clear.png | Bin 2088 -> 0 bytes share/gscreen/skins/gmoccapy/icon/configure-2.png | Bin 5145 -> 0 bytes share/gscreen/skins/gmoccapy/icon/coolant_off.png | Bin 1159 -> 0 bytes share/gscreen/skins/gmoccapy/icon/coolant_on.gif | Bin 1669 -> 0 bytes share/gscreen/skins/gmoccapy/icon/dimensions.png | Bin 2802 -> 0 bytes share/gscreen/skins/gmoccapy/icon/editor.png | Bin 2535 -> 0 bytes share/gscreen/skins/gmoccapy/icon/enter.png | Bin 1230 -> 0 bytes share/gscreen/skins/gmoccapy/icon/estopred.png | Bin 3509 -> 0 bytes share/gscreen/skins/gmoccapy/icon/exit.png | Bin 3998 -> 0 bytes .../skins/gmoccapy/icon/exit_application.png | Bin 2989 -> 0 bytes share/gscreen/skins/gmoccapy/icon/forward.png | Bin 1098 -> 0 bytes share/gscreen/skins/gmoccapy/icon/forward_on.gif | Bin 1634 -> 0 bytes .../skins/gmoccapy/icon/fullscreen_preview.png | Bin 2854 -> 0 bytes share/gscreen/skins/gmoccapy/icon/index_tool.svg | 83 - share/gscreen/skins/gmoccapy/icon/keyboard.png | Bin 4136 -> 0 bytes share/gscreen/skins/gmoccapy/icon/machine_off.png | Bin 3399 -> 0 bytes share/gscreen/skins/gmoccapy/icon/machine_on.png | Bin 3375 -> 0 bytes share/gscreen/skins/gmoccapy/icon/manual_mode.png | Bin 3727 -> 0 bytes share/gscreen/skins/gmoccapy/icon/mdi_mode.png | Bin 3249 -> 0 bytes share/gscreen/skins/gmoccapy/icon/mist_off.png | Bin 1341 -> 0 bytes share/gscreen/skins/gmoccapy/icon/mist_on.gif | Bin 1743 -> 0 bytes share/gscreen/skins/gmoccapy/icon/pause.png | Bin 1391 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refa.png | Bin 2604 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refall.png | Bin 1858 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refb.png | Bin 2492 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refc.png | Bin 2585 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refu.png | Bin 1818 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refv.png | Bin 2060 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refw.png | Bin 2249 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refx.png | Bin 1850 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refy.png | Bin 1742 -> 0 bytes share/gscreen/skins/gmoccapy/icon/refz.png | Bin 1732 -> 0 bytes share/gscreen/skins/gmoccapy/icon/reload.png | Bin 4065 -> 0 bytes share/gscreen/skins/gmoccapy/icon/reverse.png | Bin 1098 -> 0 bytes share/gscreen/skins/gmoccapy/icon/reverse_on.gif | Bin 1656 -> 0 bytes share/gscreen/skins/gmoccapy/icon/runfrom.png | Bin 1245 -> 0 bytes share/gscreen/skins/gmoccapy/icon/save-as.png | Bin 4233 -> 0 bytes share/gscreen/skins/gmoccapy/icon/save.png | Bin 3886 -> 0 bytes share/gscreen/skins/gmoccapy/icon/start.png | Bin 2276 -> 0 bytes share/gscreen/skins/gmoccapy/icon/std_info.gif | Bin 659 -> 0 bytes share/gscreen/skins/gmoccapy/icon/step.png | Bin 1171 -> 0 bytes share/gscreen/skins/gmoccapy/icon/stop.gif | Bin 1325 -> 0 bytes share/gscreen/skins/gmoccapy/icon/stop.png | Bin 3200 -> 0 bytes share/gscreen/skins/gmoccapy/icon/stop_on.gif | Bin 1301 -> 0 bytes .../skins/gmoccapy/icon/tool_blockdelete.gif | Bin 350 -> 0 bytes share/gscreen/skins/gmoccapy/icon/tool_by_no.svg | 33 - share/gscreen/skins/gmoccapy/icon/toolaxisp.png | Bin 990 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolaxisx.png | Bin 511 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolaxisy.png | Bin 423 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolaxisy2.png | Bin 343 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolaxisz.png | Bin 499 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolchange.png | Bin 2937 -> 0 bytes share/gscreen/skins/gmoccapy/icon/toolpath.png | Bin 971 -> 0 bytes share/gscreen/skins/gmoccapy/icon/tools.png | Bin 1905 -> 0 bytes share/gscreen/skins/gmoccapy/icon/touchoffwz.png | Bin 3207 -> 0 bytes share/gscreen/skins/gmoccapy/icon/touchoffx.png | Bin 3224 -> 0 bytes .../skins/gmoccapy/icon/touchoffx_value.png | Bin 2570 -> 0 bytes share/gscreen/skins/gmoccapy/icon/touchoffy.png | Bin 2961 -> 0 bytes .../skins/gmoccapy/icon/touchoffy_value.png | Bin 2474 -> 0 bytes share/gscreen/skins/gmoccapy/icon/touchoffz.png | Bin 2969 -> 0 bytes .../skins/gmoccapy/icon/touchoffz_value.png | Bin 2476 -> 0 bytes share/gscreen/skins/gmoccapy/icon/unhome.png | Bin 1871 -> 0 bytes share/gscreen/skins/gmoccapy/icon/user_tabs.png | Bin 2739 -> 0 bytes share/gscreen/skins/gmoccapy/icon/zoom-in.png | Bin 2879 -> 0 bytes share/gscreen/skins/gmoccapy/icon/zoom-out.png | Bin 2783 -> 0 bytes .../gmoccapy/locale/de/LC_MESSAGES/gmoccapy.mo | Bin 40045 -> 0 bytes share/gscreen/skins/gmoccapy/locale/de/gmoccapy.po | 2240 ------- .../gscreen/skins/gmoccapy/locale/de/gmoccapy.pot | 1370 ---- .../gmoccapy/locale/es/LC_MESSAGES/gmoccapy.mo | Bin 39789 -> 0 bytes share/gscreen/skins/gmoccapy/locale/es/gmoccapy.po | 2209 ------- share/gscreen/skins/gmoccapy/locale/gmoccapy.pot | 1958 ------ .../gmoccapy/locale/rs/LC_MESSAGES/gmoccapy.mo | Bin 28527 -> 0 bytes share/gscreen/skins/gmoccapy/locale/rs/gmoccapy.po | 2422 ------- .../skins/gmoccapy/locale/rs/new_gmoccapy.po | 2331 ------- .../gscreen/skins/gmoccapy/python/notification.py | 271 - share/gscreen/skins/gmoccapy/release_notes.txt | 807 --- src/Makefile | 14 + src/emc/usr_intf/gmoccapy/Submakefile | 31 + src/emc/usr_intf/gmoccapy/__init__.py | 0 src/emc/usr_intf/gmoccapy/dialogs.py | 190 + src/emc/usr_intf/gmoccapy/getiniinfo.py | 246 + src/emc/usr_intf/gmoccapy/gmoccapy.glade | 6663 +++++++++++++++++++ src/emc/usr_intf/gmoccapy/gmoccapy.py | 3593 +++++++++++ src/emc/usr_intf/gmoccapy/gmoccapy/de.po | 2494 ++++++++ src/emc/usr_intf/gmoccapy/gmoccapy/es.po | 2454 +++++++ src/emc/usr_intf/gmoccapy/gmoccapy/gmoccapy.pot | 1608 +++++ src/emc/usr_intf/gmoccapy/gmoccapy/rs.po | 2193 +++++++ src/emc/usr_intf/gmoccapy/notification.py | 271 + src/emc/usr_intf/gmoccapy/player.py | 62 + src/emc/usr_intf/gmoccapy/preferences.py | 50 + src/emc/usr_intf/gmoccapy/release_notes.txt | 813 +++ src/emc/usr_intf/gmoccapy/widgets.py | 44 + src/po/Submakefile | 10 + src/po/gmoccapy/de.po | 2494 ++++++++ src/po/gmoccapy/es.po | 2454 +++++++ src/po/gmoccapy/rs.po | 2193 +++++++ 219 files changed, 36011 insertions(+), 24730 deletions(-) diff --git a/configs/sim/gmoccapy/README b/configs/sim/gmoccapy/README index 03c341b..87acb77 100644 --- a/configs/sim/gmoccapy/README +++ b/configs/sim/gmoccapy/README @@ -1,10 +1,13 @@ -This is a simulation of an XYZ axis mill (with metric units). +This is a simulation of an XYZ axis mill +and also a lathe. -The main purpose of this is to show the posibilities offered by gscreen to design custom screens. +This screen is based of the design of moccagui, an GUI coded in FreePascal. -This screen is based of the design of mocca, an GUI coded in FreePascal. +gmoccapy is using Python instead. -gscreen and moccapy is using Python instead. +gmoccapy is designed to bring the feel of industrial controls to linuxccn users, +most controls can be used with a touch screen and also most are accesible through +hal pins, so real hardware can be used. Feel free to send any comment to diff --git a/configs/sim/gmoccapy/axis_manualtoolchange.hal b/configs/sim/gmoccapy/axis_manualtoolchange.hal deleted file mode 120000 index b7c3010..0000000 --- a/configs/sim/gmoccapy/axis_manualtoolchange.hal +++ /dev/null @@ -1 +0,0 @@ -../axis_manualtoolchange.hal \ No newline at end of file diff --git a/configs/sim/gmoccapy/botton.hal b/configs/sim/gmoccapy/botton.hal index 51e15dc..a29888c 100644 --- a/configs/sim/gmoccapy/botton.hal +++ b/configs/sim/gmoccapy/botton.hal @@ -1,12 +1,12 @@ -net h_hardware_button_0 h_buttonlist.h_button_0 => gscreen.h-button-0 -net h_hardware_button_1 h_buttonlist.h_button_1 => gscreen.h-button-1 -net h_hardware_button_2 h_buttonlist.h_button_2 => gscreen.h-button-2 -net h_hardware_button_3 h_buttonlist.h_button_3 => gscreen.h-button-3 -net h_hardware_button_4 h_buttonlist.h_button_4 => gscreen.h-button-4 -net h_hardware_button_5 h_buttonlist.h_button_5 => gscreen.h-button-5 -net h_hardware_button_6 h_buttonlist.h_button_6 => gscreen.h-button-6 -net h_hardware_button_7 h_buttonlist.h_button_7 => gscreen.h-button-7 -net h_hardware_button_8 h_buttonlist.h_button_8 => gscreen.h-button-8 -net h_hardware_button_9 h_buttonlist.h_button_9 => gscreen.h-button-9 +net h_hardware_button_0 h_buttonlist.h_button_0 => gmoccapy.h-button-0 +net h_hardware_button_1 h_buttonlist.h_button_1 => gmoccapy.h-button-1 +net h_hardware_button_2 h_buttonlist.h_button_2 => gmoccapy.h-button-2 +net h_hardware_button_3 h_buttonlist.h_button_3 => gmoccapy.h-button-3 +net h_hardware_button_4 h_buttonlist.h_button_4 => gmoccapy.h-button-4 +net h_hardware_button_5 h_buttonlist.h_button_5 => gmoccapy.h-button-5 +net h_hardware_button_6 h_buttonlist.h_button_6 => gmoccapy.h-button-6 +net h_hardware_button_7 h_buttonlist.h_button_7 => gmoccapy.h-button-7 +net h_hardware_button_8 h_buttonlist.h_button_8 => gmoccapy.h-button-8 +net h_hardware_button_9 h_buttonlist.h_button_9 => gmoccapy.h-button-9 diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini index 6c25091..e4a2dd4 100644 --- a/configs/sim/gmoccapy/gmoccapy.ini +++ b/configs/sim/gmoccapy/gmoccapy.ini @@ -5,48 +5,18 @@ # General section ------------------------------------------------------------- [EMC] VERSION = $Revision$ -MACHINE = gmoccapy +MACHINE = gmoccapy_development #DEBUG = 0x7FFFFFFF DEBUG = 0 -# for details see nc_files/subroutines/maco_instructions.txt -[MACROS] -MACRO = i_am_lost -MACRO = halo_world -MACRO = jog_around -MACRO = increment xinc yinc -MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d -PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences - -#EMBED_TAB_NAME = right_side_panel -#EMBED_TAB_LOCATION = box_right -#EMBED_TAB_COMMAND = gladevcp -x {XID} v_buttonlist.glade - -#EMBED_TAB_NAME = camera -#EMBED_TAB_LOCATION = ntb_user_tabs -#EMBED_TAB_COMMAND = camview-emc -w {XID} - -#EMBED_TAB_NAME = Tab 2 -#EMBED_TAB_LOCATION = ntb_user_tabs -#EMBED_TAB_COMMAND = gladevcp -x {XID} vcp_box.glade - -#EMBED_TAB_NAME = left_side_panel -#EMBED_TAB_LOCATION = box_left -#EMBED_TAB_COMMAND = gladevcp -x {XID} vcp_box.glade - -# uncomment the following three lines to show the buttonlist -# dont forget to uncomment also the button lines in gmoccapy_postgui.hal -#EMBED_TAB_NAME = h_buttonlist -#EMBED_TAB_LOCATION = ntb_setup -#EMBED_TAB_COMMAND = gladevcp h_buttonlist.glade +DISPLAY = gmoccapy +#PREFERENCE_FILE_PATH = ~/.gmoccapy_sa -#EMBED_TAB_NAME = v_buttonlist -#EMBED_TAB_LOCATION = ntb_setup -#EMBED_TAB_COMMAND = gladevcp v_buttonlist.glade +#LATHE = 1 +BACK_TOOL_LATHE = 0 # Cycle time, in milliseconds, that display will sleep between polls CYCLE_TIME = 100 @@ -69,7 +39,19 @@ INTRO_GRAPHIC = linuxcnc.gif INTRO_TIME = 5 # list of selectable jog increments -INCREMENTS = 1mm, 0.1mm, 0.01mm, 0.001mm, 1.2345in +INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in + +#EMBED_TAB_NAME = Second user tab +#EMBED_TAB_LOCATION = ntb_preview +#EMBED_TAB_COMMAND = gladevcp -x {XID} vcp_box.glade + +# for details see nc_files/subroutines/maco_instructions.txt +[MACROS] +MACRO = i_am_lost +MACRO = halo_world +MACRO = jog_around +MACRO = increment xinc yinc +MACRO = go_to_position X-pos Y-pos Z-pos [FILTER] PROGRAM_EXTENSION = .png,.gif,.jpg Grayscale Depth Image @@ -102,7 +84,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy2.glade b/configs/sim/gmoccapy/gmoccapy2.glade new file mode 100644 index 0000000..8ccaa92 --- /dev/null +++ b/configs/sim/gmoccapy/gmoccapy2.glade @@ -0,0 +1,81 @@ +<?xml version="1.0"?> +<interface> + <!-- interface-requires gladevcp 0.0 --> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy project-wide --> + <object class="GtkWindow" id="window2"> + <property name="height_request">600</property> + <child> + <object class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">3</property> + <child> + <object class="HAL_Meter" id="s_display2"> + <property name="width_request">200</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="label">Spindle</property> + <property name="bg_color">#ffffffffffff</property> + <property name="z0_color">#0000ffff0000</property> + <property name="max">2000</property> + <property name="majorscale">200</property> + <property name="z1_color">#ffffffff0000</property> + <property name="z2_color">#ffff00000000</property> + <property name="sublabel">RPM</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">screen 2</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="button1"> + <property name="label" translatable="yes">Custom +Button</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_button_press"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/configs/sim/gmoccapy/gmoccapy_4_axis.ini b/configs/sim/gmoccapy/gmoccapy_4_axis.ini index eaa3064..5c51d56 100644 --- a/configs/sim/gmoccapy/gmoccapy_4_axis.ini +++ b/configs/sim/gmoccapy/gmoccapy_4_axis.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences #EMBED_TAB_NAME = right_side_panel @@ -102,7 +102,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim4.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_development.pref b/configs/sim/gmoccapy/gmoccapy_development.pref new file mode 100644 index 0000000..a84d525 --- /dev/null +++ b/configs/sim/gmoccapy/gmoccapy_development.pref @@ -0,0 +1,71 @@ +[DEFAULT] +unlock_way = no +rel_color = black +max_messages = 10.0 +show_preview_on_offset = False +jump_to_dir = /home/emcmesa +show_keyboard_on_offset = True +x_pos_popup = 15.0 +homed_color = green +height = 750.0 +system_name_g92 = G92 +logo = False +system_name_g59.2 = G59.2 +offset_axis_x = 0 +audio_error = /usr/share/sounds/ubuntu/stereo/dialog-warning.ogg +log_actions = False +view_tool_path = True +system_name_g59.3 = G59.3 +scale_max_vel = 85.0 +width = 979.0 +open_file = /home/emcmesa/linuxcnc-dev/configs/nc_files/gmoccapy_2_tools_with_cutter_radius_compensation.ngc +abs_color = blue +show_offsets = False +system_name_g59 = G59 +system_name_g58 = G58 +spindle_bar_min = 0.0 +show_dtg = False +show_keyboard_on_mdi = False +spindle_start_rpm = 300.0 +view_dimension = True +show_dro_btn = False +scale_spindle_override = 1.0 +system_name_g55 = G55 +system_name_g54 = G54 +system_name_g57 = G57 +system_name_g56 = G56 +unlock_code = 123 +x_pos = 10.0 +dtg_color = yellow +message_font = sans 10 +audio_alert = /usr/share/sounds/ubuntu/stereo/bell.ogg +screen1 = window +use_keyboard_shortcuts = True +spindle_bar_max = 6000.0 +use_auto_units = True +unhomed_color = red +enable_dro = False +gremlin_view = rbt_view_p +use_screen2 = False +opstop = True +show_keyboard_on_file_selection = False +grid_size = 1.0 +scale_feed_override = 1.0 +use_frames = True +system_name_tool = Tool +y_pos_popup = 55.0 +logofile = /home/emcmesa/linuxcnc-dev/share/gmoccapy/images/Logo.png +run_from_line = no_run +gtk_theme = Follow System Theme +show_keyboard_on_edit = True +system_name_rot = Rot +hide_cursor = False +y_pos = 10.0 +width_popup = 250.0 +show_keyboard_on_tooledit = False +system_name_g5x = G5x +system_name_g59.1 = G59.1 +blockdel = False +scale_jog_vel = 99.6 +view = p + diff --git a/configs/sim/gmoccapy/gmoccapy_jog_wheels.ini b/configs/sim/gmoccapy/gmoccapy_jog_wheels.ini index c0ba2c3..dbf531b 100644 --- a/configs/sim/gmoccapy/gmoccapy_jog_wheels.ini +++ b/configs/sim/gmoccapy/gmoccapy_jog_wheels.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences EMBED_TAB_NAME = right_side_panel @@ -102,7 +102,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_lathe.ini b/configs/sim/gmoccapy/gmoccapy_lathe.ini index 6f678da..0fb6406 100644 --- a/configs/sim/gmoccapy/gmoccapy_lathe.ini +++ b/configs/sim/gmoccapy/gmoccapy_lathe.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences LATHE = 1 @@ -105,7 +105,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini b/configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini index b7abd09..ed32e73 100644 --- a/configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini +++ b/configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences LATHE = 1 @@ -79,7 +79,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_left_panel.ini b/configs/sim/gmoccapy/gmoccapy_left_panel.ini index 00e35e3..9004dd6 100644 --- a/configs/sim/gmoccapy/gmoccapy_left_panel.ini +++ b/configs/sim/gmoccapy/gmoccapy_left_panel.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences #EMBED_TAB_NAME = right_side_panel @@ -103,11 +103,10 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. -POSTGUI_HALFILE = gmoccapy_postgui.hal +POSTGUI_HALFILE = gmoccapy_postgui_left_panel.hal HALUI = halui diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy.pref b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy.pref new file mode 100644 index 0000000..34b9b82 --- /dev/null +++ b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy.pref @@ -0,0 +1,69 @@ +[DEFAULT] +unlock_way = use +rel_color = black +max_messages = 10.0 +show_preview_on_offset = False +jump_to_dir = /home/emcmesa +show_keyboard_on_offset = True +spindle_bar_max = 6000.0 +homed_color = green +height = 750.0 +system_name_g92 = G92 +logo = False +system_name_g59.2 = G59.2 +system_name_g59.3 = G59.3 +audio_error = /usr/share/sounds/ubuntu/stereo/dialog-question.ogg +log_actions = False +view_tool_path = True +scale_max_vel = 140.166 +width = 979.0 +open_file = +abs_color = blue +show_offsets = False +system_name_g59 = G59 +system_name_g58 = G58 +show_keyboard_on_mdi = True +spindle_start_rpm = 300.0 +view_dimension = True +gremlin_view = rbt_view_p +scale_spindle_override = 1.0 +system_name_tool = Tool +system_name_g54 = G54 +system_name_rot = Rot +system_name_g56 = G56 +message_font = sans 10 +x_pos = 10.0 +y_pos = 10.0 +dtg_color = yellow +unlock_code = 123 +unhomed_color = red +screen1 = window +use_keyboard_shortcuts = False +x_pos_popup = 15.0 +spindle_bar_min = 0.0 +enable_dro = False +audio_alert = /usr/share/sounds/ubuntu/stereo/bell.ogg +use_screen2 = False +opstop = True +show_keyboard_on_file_selection = False +grid_size = 1.0 +scale_feed_override = 1.0 +use_frames = True +system_name_g55 = G55 +y_pos_popup = 55.0 +show_keyboard_on_edit = True +run_from_line = no_run +blockdel = False +gtk_theme = Follow System Theme +system_name_g5x = G5x +system_name_g57 = G57 +hide_cursor = False +use_auto_units = True +width_popup = 250.0 +show_keyboard_on_tooledit = False +show_dro_btn = False +system_name_g59.1 = G59.1 +show_dtg = False +scale_jog_vel = 99.6 +view = p + diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini index a45b008..127b36e 100755 --- a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini +++ b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini @@ -19,8 +19,8 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d -PREFERENCE_FILE_PATH = ~/.gmoccapy_preferences +DISPLAY = gmoccapy +#PREFERENCE_FILE_PATH = gmoccapy_preferences EMBED_TAB_NAME = tool_replacement_panel EMBED_TAB_LOCATION = box_tool_and_code_info @@ -83,8 +83,6 @@ SERVO_PERIOD = 1000000 # Hardware Abstraction Layer section -------------------------------------------------- [HAL] HALFILE = core_sim.hal -#HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_postgui.hal b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_postgui.hal index c681ce3..f22d14c 100644 --- a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_postgui.hal +++ b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_postgui.hal @@ -4,10 +4,7 @@ unlinkp iocontrol.0.tool-change unlinkp iocontrol.0.tool-changed -unlinkp hal_manualtoolchange.change -unlinkp hal_manualtoolchange.changed -unlinkp hal_manualtoolchange.number -net tool-change gscreen.change-tool iocontrol.0.tool-change -net tool-changed gscreen.tool-changed iocontrol.0.tool-changed -net tool-prep-number gscreen.tool-number iocontrol.0.tool-prep-number +net tool-change gmoccapy.toolchange-change iocontrol.0.tool-change +net tool-changed gmoccapy.toolchange-changed iocontrol.0.tool-changed +net tool-prep-number gmoccapy.toolchange-number iocontrol.0.tool-prep-number diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/plasma.var.BAD b/configs/sim/gmoccapy/gmoccapy_plasma/plasma.var.BAD new file mode 100644 index 0000000..fb7d97d --- /dev/null +++ b/configs/sim/gmoccapy/gmoccapy_plasma/plasma.var.BAD @@ -0,0 +1,37 @@ +# generated by gladevcp.persistence.create_default_ini() on Sat Jan 18 13:04:31 2014 +[ini] + version = 1 + signature = 769ec0ca67be3a03d904fa297bf4d5b87add11ed +[vars] + thcspeedincr = 1.0 + thcspeedmin = 1.0 + g0gapincr = 0.5 + thcspeedmax = 20.0 + cutgapmin = 0.1 + thctargetvoltval = 100.0 + piercedelaymax = 10.0 + thcspeedval = 15.0 + chlthresholdval = 60.0 + chlthresholdmin = 10.0 + g0gapmax = 55.0 + piercedelayval = 0.5 + chlthresholdincr = 10.0 + piercegapincr = 0.5 + piercedelayincr = 0.01 + cutgapval = 4.0 + chlthresholdmax = 100.0 + g0gapval = 45.0 + thctargetvoltincr = 5.0 + piercegapval = 5.0 + piercedelaymin = 0.01 + thctargetvoltmin = 55.0 + g0gapmin = 0.5 + thctargetvoltmax = 255.0 + cutgapincr = 0.1 + piercegapmax = 12.0 + piercegapmin = 2.0 + cutgapmax = 10.0 +[widgets] + Piercing-autostart = False + hal-btn-THC = False + enable-HeightLock = False diff --git a/configs/sim/gmoccapy/gmoccapy_postgui.hal b/configs/sim/gmoccapy/gmoccapy_postgui.hal index eb40ae9..22a3f9e 100644 --- a/configs/sim/gmoccapy/gmoccapy_postgui.hal +++ b/configs/sim/gmoccapy/gmoccapy_postgui.hal @@ -2,21 +2,18 @@ # moccapy_postgui.hal file from Norbert Schechner # ################################################################### -net spindle-speed-limited gscreen.spindle_feedback_bar -net spindle-at-speed gscreen.spindle_at_speed_led +net spindle-speed-limited gmoccapy.spindle_feedback_bar +net spindle-at-speed gmoccapy.spindle_at_speed_led unlinkp iocontrol.0.tool-change unlinkp iocontrol.0.tool-changed -unlinkp hal_manualtoolchange.change -unlinkp hal_manualtoolchange.changed -unlinkp hal_manualtoolchange.number -net tool-change gscreen.change-tool iocontrol.0.tool-change -net tool-changed gscreen.tool-changed iocontrol.0.tool-changed -net tool-prep-number gscreen.tool-number iocontrol.0.tool-prep-number +net tool-change gmoccapy.toolchange-change iocontrol.0.tool-change +net tool-changed gmoccapy.toolchange-changed iocontrol.0.tool-changed +net tool-prep-number gmoccapy.toolchange-number iocontrol.0.tool-prep-number -net tooloffset-x gscreen.tooloffset_x <= motion.tooloffset.x -net tooloffset-z gscreen.tooloffset_z <= motion.tooloffset.z +net tooloffset-x gmoccapy.tooloffset-x <= motion.tooloffset.x +net tooloffset-z gmoccapy.tooloffset-z <= motion.tooloffset.z ############################################################################# # Jogwheel / Handrad / Encoder # @@ -44,28 +41,28 @@ net tooloffset-z gscreen.tooloffset_z <= motion.tooloffset.z #net Jogwheel-phB encoder.0.phase-B <= parport.0.pin-13-in # connect encoder count, select the one you need -#net Jogwheel-counts encoder.0.counts => gscreen.spindle-override-counts -#net Jogwheel-counts encoder.0.counts => gscreen.feed-override-counts -#net Jogwheel-counts encoder.0.counts => gscreen.max-vel-counts -#net Jogwheel-counts encoder.0.counts => gscreen.jog-speed-counts +#net Jogwheel-counts encoder.0.counts => gmoccapy.spindle-override-counts +#net Jogwheel-counts encoder.0.counts => gmoccapy.feed-override-counts +#net Jogwheel-counts encoder.0.counts => gmoccapy.max-vel-counts +#net Jogwheel-counts encoder.0.counts => gmoccapy.jog-speed-counts -#net h_hardware_button_0 h_buttonlist.h_button_0 => gscreen.h-button_0 -#net h_hardware_button_1 h_buttonlist.h_button_1 => gscreen.h-button_1 -#net h_hardware_button_2 h_buttonlist.h_button_2 => gscreen.h-button_2 -#net h_hardware_button_3 h_buttonlist.h_button_3 => gscreen.h-button_3 -#net h_hardware_button_4 h_buttonlist.h_button_4 => gscreen.h-button_4 -#net h_hardware_button_5 h_buttonlist.h_button_5 => gscreen.h-button_5 -#net h_hardware_button_6 h_buttonlist.h_button_6 => gscreen.h-button_6 -#net h_hardware_button_7 h_buttonlist.h_button_7 => gscreen.h-button_7 -#net h_hardware_button_8 h_buttonlist.h_button_8 => gscreen.h-button_8 -#net h_hardware_button_9 h_buttonlist.h_button_9 => gscreen.h-button_9 +#net h_hardware_button_0 h_buttonlist.h_button_0 => gmoccapy.h-button_0 +#net h_hardware_button_1 h_buttonlist.h_button_1 => gmoccapy.h-button_1 +#net h_hardware_button_2 h_buttonlist.h_button_2 => gmoccapy.h-button_2 +#net h_hardware_button_3 h_buttonlist.h_button_3 => gmoccapy.h-button_3 +#net h_hardware_button_4 h_buttonlist.h_button_4 => gmoccapy.h-button_4 +#net h_hardware_button_5 h_buttonlist.h_button_5 => gmoccapy.h-button_5 +#net h_hardware_button_6 h_buttonlist.h_button_6 => gmoccapy.h-button_6 +#net h_hardware_button_7 h_buttonlist.h_button_7 => gmoccapy.h-button_7 +#net h_hardware_button_8 h_buttonlist.h_button_8 => gmoccapy.h-button_8 +#net h_hardware_button_9 h_buttonlist.h_button_9 => gmoccapy.h-button_9 -#net v_hardware_button_0 v_buttonlist.v_button_0 => gscreen.v-button_0 -#net v_hardware_button_1 v_buttonlist.v_button_1 => gscreen.v-button_1 -#net v_hardware_button_2 v_buttonlist.v_button_2 => gscreen.v-button_2 -#net v_hardware_button_3 v_buttonlist.v_button_3 => gscreen.v-button_3 -#net v_hardware_button_4 v_buttonlist.v_button_4 => gscreen.v-button_4 -#net v_hardware_button_5 v_buttonlist.v_button_5 => gscreen.v-button_5 -#net v_hardware_button_6 v_buttonlist.v_button_6 => gscreen.v-button_6 +#net v_hardware_button_0 v_buttonlist.v_button_0 => gmoccapy.v-button_0 +#net v_hardware_button_1 v_buttonlist.v_button_1 => gmoccapy.v-button_1 +#net v_hardware_button_2 v_buttonlist.v_button_2 => gmoccapy.v-button_2 +#net v_hardware_button_3 v_buttonlist.v_button_3 => gmoccapy.v-button_3 +#net v_hardware_button_4 v_buttonlist.v_button_4 => gmoccapy.v-button_4 +#net v_hardware_button_5 v_buttonlist.v_button_5 => gmoccapy.v-button_5 +#net v_hardware_button_6 v_buttonlist.v_button_6 => gmoccapy.v-button_6 diff --git a/configs/sim/gmoccapy/gmoccapy_postgui_left_panel.hal b/configs/sim/gmoccapy/gmoccapy_postgui_left_panel.hal index cbd3b36..acb7620 100644 --- a/configs/sim/gmoccapy/gmoccapy_postgui_left_panel.hal +++ b/configs/sim/gmoccapy/gmoccapy_postgui_left_panel.hal @@ -1,71 +1,26 @@ ################################################################### -# moccapy_postgui.hal file from Norbert Schechner # +# gmoccapy_postgui.hal file from Norbert Schechner # ################################################################### -net spindle-speed-limited gscreen.hal_hbar_spindle_feedback -net spindle-at-speed gscreen.hal_led_spindle_at_speed +net spindle-speed-limited gmoccapy.spindle_feedback_bar +net spindle-at-speed gmoccapy.spindle_at_speed_led unlinkp iocontrol.0.tool-change unlinkp iocontrol.0.tool-changed -unlinkp hal_manualtoolchange.change -unlinkp hal_manualtoolchange.changed -unlinkp hal_manualtoolchange.number -net tool-change gscreen.change-tool iocontrol.0.tool-change -net tool-changed gscreen.tool-changed iocontrol.0.tool-changed -net tool-prep-number gscreen.tool-number iocontrol.0.tool-prep-number +net tool-change gmoccapy.toolchange-change iocontrol.0.tool-change +net tool-changed gmoccapy.toolchange-changed iocontrol.0.tool-changed +net tool-prep-number gmoccapy.toolchange-number iocontrol.0.tool-prep-number -net tooloffset-x gscreen.tooloffset_x <= motion.tooloffset.x -net tooloffset-z gscreen.tooloffset_z <= motion.tooloffset.z +net tooloffset-x gmoccapy.tooloffset-x <= motion.tooloffset.x +net tooloffset-z gmoccapy.tooloffset-z <= motion.tooloffset.z -############################################################################# -# Jogwheel / Handrad / Encoder # -############################################################################# -# Nun die ParPort Treiber laden und die Adressen festlegen -#loadrt probe_parport -#loadrt hal_parport cfg="0xcc00 out " -#setp parport.0.reset-time 500 -#addf parport.0.read base-thread -#addf parport.0.write base-thread -#addf parport.0.reset base-thread - -# load the real-time encoder -# if you do use all hal_pins from gmoccapy, you will have to modify num_chan -# and add the other encoders to threads -#loadrt encoder num_chan=1 -#addf encoder.update-counters servo-thread -#addf encoder.capture-position servo-thread - -# disable 4 times encoder, otherwise each klick will ingreas jogwheel-count by 4 instead of 1 -#setp encoder.0.x4-mode FALSE - -# connect jog signals to hardware / Signale an Hardware anschlieÃen -#net Jogwheel-phA encoder.0.phase-A <= parport.0.pin-15-in -#net Jogwheel-phB encoder.0.phase-B <= parport.0.pin-13-in - -# connect encoder count, select the one you need -#net Jogwheel-counts encoder.0.counts => gscreen.spindle-override-counts -#net Jogwheel-counts encoder.0.counts => gscreen.feed-override-counts -#net Jogwheel-counts encoder.0.counts => gscreen.max-vel-counts -#net Jogwheel-counts encoder.0.counts => gscreen.jog-speed-counts - -#net h_hardware_button_0 h_buttonlist.h_button_0 => gscreen.h-button_0 -#net h_hardware_button_1 h_buttonlist.h_button_1 => gscreen.h-button_1 -#net h_hardware_button_2 h_buttonlist.h_button_2 => gscreen.h-button_2 -#net h_hardware_button_3 h_buttonlist.h_button_3 => gscreen.h-button_3 -#net h_hardware_button_4 h_buttonlist.h_button_4 => gscreen.h-button_4 -#net h_hardware_button_5 h_buttonlist.h_button_5 => gscreen.h-button_5 -#net h_hardware_button_6 h_buttonlist.h_button_6 => gscreen.h-button_6 -#net h_hardware_button_7 h_buttonlist.h_button_7 => gscreen.h-button_7 -#net h_hardware_button_8 h_buttonlist.h_button_8 => gscreen.h-button_8 -#net h_hardware_button_9 h_buttonlist.h_button_9 => gscreen.h-button_9 - -net v_hardware_button_0 v_buttonlist.v_button_0 => gscreen.v-button-0 -net v_hardware_button_1 v_buttonlist.v_button_1 => gscreen.v-button-1 -net v_hardware_button_2 v_buttonlist.v_button_2 => gscreen.v-button-2 -net v_hardware_button_3 v_buttonlist.v_button_3 => gscreen.v-button-3 -net v_hardware_button_4 v_buttonlist.v_button_4 => gscreen.v-button-4 -net v_hardware_button_5 v_buttonlist.v_button_5 => gscreen.v-button-5 -net v_hardware_button_6 v_buttonlist.v_button_6 => gscreen.v-button-6 +net v_button_0 v_buttonlist.v_button_0 => gmoccapy.v-button-0 +net v_button_1 v_buttonlist.v_button_1 => gmoccapy.v-button-1 +net v_button_2 v_buttonlist.v_button_2 => gmoccapy.v-button-2 +net v_button_3 v_buttonlist.v_button_3 => gmoccapy.v-button-3 +net v_button_4 v_buttonlist.v_button_4 => gmoccapy.v-button-4 +net v_button_5 v_buttonlist.v_button_5 => gmoccapy.v-button-5 +net v_button_6 v_buttonlist.v_button_6 => gmoccapy.v-button-6 diff --git a/configs/sim/gmoccapy/gmoccapy_right_panel.ini b/configs/sim/gmoccapy/gmoccapy_right_panel.ini index dd0cf91..05f0bc9 100644 --- a/configs/sim/gmoccapy/gmoccapy_right_panel.ini +++ b/configs/sim/gmoccapy/gmoccapy_right_panel.ini @@ -19,7 +19,7 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [DISPLAY] -DISPLAY = gscreen -c gmoccapy -d +DISPLAY = gmoccapy |