diff options
| author | Norbert Schechner <nieson@web.de> | 2014-02-28 21:59:33 +0100 |
|---|---|---|
| committer | Norbert Schechner <nieson@web.de> | 2014-02-28 21:59:33 +0100 |
| commit | 579797703e6da6f026ed03896cad78be191b3dec (patch) | |
| tree | 6d5ddf8d1b124d888b1afacfe6688dfb78605888 /configs | |
| parent | fba6f6578a7190012be59f3008bc261a2d617f76 (diff) | |
| download | linuxcnc-579797703e6da6f026ed03896cad78be191b3dec.tar.gz linuxcnc-579797703e6da6f026ed03896cad78be191b3dec.zip | |
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.
Diffstat (limited to 'configs')
37 files changed, 405 insertions, 645 deletions
diff --git a/configs/sim/gmoccapy/README b/configs/sim/gmoccapy/README index 03c341b13..87acb77e9 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 b7c30109b..000000000 --- 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 51e15dcc4..a29888c9b 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 6c25091ef..e4a2dd4d2 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 000000000..8ccaa92f5 --- /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 eaa3064b7..5c51d5685 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 000000000..a84d525eb --- /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 c0ba2c3a2..dbf531ba9 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 6f678daee..0fb6406d3 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 b7abd0949..ed32e73c0 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 00e35e3d0..9004dd615 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 000000000..34b9b8281 --- /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 a45b0087a..127b36ee3 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 c681ce38a..f22d14c3e 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 000000000..fb7d97ddf --- /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 eb40ae909..22a3f9ee6 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 cbd3b3647..acb7620c9 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 dd0cf9114..05f0bc9ba 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 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_sim_hardware_button.ini b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini index 4aca751cb..14c2328a7 100644 --- a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini +++ b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.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 @@ -88,7 +88,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_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini index fb4a90169..0d14e1381 100755 --- a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini +++ b/configs/sim/gmoccapy/gmoccapy_tool_sensor.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 @@ -127,8 +127,6 @@ SERVO_PERIOD = 1000000 [HAL] HALFILE = core_sim.hal HALFILE = spindle_sim.hal -#HALFILE = axis_manualtoolchange.hal -#HALFILE = manualtoolchange.hal HALFILE = simulated_home.hal # Single file that is executed after the GUI has started. diff --git a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini index 7519d7199..1486887e8 100644 --- a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini +++ b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.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 @@ -110,7 +110,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/jogwheel.hal b/configs/sim/gmoccapy/jogwheel.hal index a3357afef..3f1a08c84 100644 --- a/configs/sim/gmoccapy/jogwheel.hal +++ b/configs/sim/gmoccapy/jogwheel.hal @@ -1,8 +1,8 @@ # connect encoder count, select the one you need -net jog-spindle jogwheel.jog-wheel-spindle => gscreen.spindle-override-counts -net jog-feed jogwheel.jog-wheel-feed => gscreen.feed-override-counts -net jog-max-vel jogwheel.jog-wheel-max => gscreen.max-vel-counts -net jog-jog jogwheel.jog-wheel-jog => gscreen.jog-speed-counts +net jog-spindle jogwheel.jog-wheel-spindle => gmoccapy.spindle-override-counts +net jog-feed jogwheel.jog-wheel-feed => gmoccapy.feed-override-counts +net jog-max-vel jogwheel.jog-wheel-max => gmoccapy.max-vel-counts +net jog-jog jogwheel.jog-wheel-jog => gmoccapy.jog-speed-counts net jog-x jogwheel.jog-wheel-x => axis.0.jog-counts net jog-y jogwheel.jog-wheel-y => axis.1.jog-counts @@ -12,5 +12,5 @@ setp axis.0.jog-enable 1 setp axis.1.jog-enable 1 setp axis.2.jog-enable 1 -net scale axis.2.jog-scale <= axis.1.jog-scale <= axis.0.jog-scale <= gscreen.jog-increment +net scale axis.2.jog-scale <= axis.1.jog-scale <= axis.0.jog-scale <= gmoccapy.jog-increment diff --git a/configs/sim/gmoccapy/lathe.tbl b/configs/sim/gmoccapy/lathe.tbl index a96b3a5e6..26bba71ae 100644 --- a/configs/sim/gmoccapy/lathe.tbl +++ b/configs/sim/gmoccapy/lathe.tbl @@ -1,5 +1,5 @@ -T1 P1 D0.400000 X-25.000000 Z+50.000000 I+26.000000 J+86.000000 Q2 ;60 Grad vorn -T2 P2 D0.100000 X+0.104862 Z+0.129830 I+50.000000 J+85.000000 Q2 ;35 Grad vorn -T3 P3 D0.400000 X-0.258000 Z-0.236900 I-80.000000 J-25.000000 Q3 ;55 Grad vorn +T1 P1 D0.400000 X-120.000000 Z-25.000000 I+26.000000 J+86.000000 Q2 ;60 Grad vorn +T2 P2 D0.100000 X-36.337581 Z+39.000000 I+50.000000 J+85.000000 Q2 ;35 Grad vorn +T3 P3 D0.400000 X-54.337581 Z-160.258367 I-80.000000 J-25.000000 Q3 ;55 Grad vorn T4 P4 D0.100000 I+94.000000 J+154.000000 Q1 ;60 Grad Rück T5 P5 D0.100000 X+5.737000 Z+12.239900 Q6 ;Einstichstahl diff --git a/configs/sim/gmoccapy/left.hal b/configs/sim/gmoccapy/left.hal index 03c563a94..9365b827a 100644 --- a/configs/sim/gmoccapy/left.hal +++ b/configs/sim/gmoccapy/left.hal @@ -1,10 +1,10 @@ -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/macros/change.ngc b/configs/sim/gmoccapy/macros/change.ngc index 8912a9e3e..fc1a2599c 100644 --- a/configs/sim/gmoccapy/macros/change.ngc +++ b/configs/sim/gmoccapy/macros/change.ngc @@ -26,27 +26,27 @@ G49 ; using the code being remapped here means 'use builtin behaviour' M6 -O200 if [#<_hal[gscreen.toolmeasurement]> EQ 0] +O200 if [#<_hal[gmoccapy.toolmeasurement]> EQ 0] O200 return [3] ; indicate no tool measurement O200 endif G53 G0 X[#<_ini[TOOLSENSOR]X>] Y[#<_ini[TOOLSENSOR]Y>] G53 G0 Z[#<_ini[TOOLSENSOR]Z>] -O300 if [#<_hal[gscreen.searchvel]> LE 0] +O300 if [#<_hal[gmoccapy.searchvel]> LE 0] O300 return [-1] ; indicate searchvel <= 0 O300 endif -O400 if [#<_hal[gscreen.probevel]> LE 0] +O400 if [#<_hal[gmoccapy.probevel]> LE 0] O400 return [-2] ; indicate probevel <= 0 O400 endif -F #<_hal[gscreen.searchvel]> +F #<_hal[gmoccapy.searchvel]> G91 G38.2 Z #<_ini[TOOLSENSOR]MAXPROBE> G0 Z2 ; This is commented out only for sim. -;F #<_hal[gscreen.probevel]> +;F #<_hal[gmoccapy.probevel]> ;G38.2 Z-4 O500 if [#5070 EQ 0] @@ -58,12 +58,12 @@ G90 G53 G0 Z[#<_ini[CHANGE_POSITION]Z>] #<touch_result> = #5063 -#<probeheight> = #<_hal[gscreen.probeheight]> -#<blockheight> = #<_hal[gscreen.blockheight]> +#<probeheight> = #<_hal[gmoccapy.probeheight]> +#<blockheight> = #<_hal[gmoccapy.blockheight]> ;(DEBUG, #<touch_result> #<probeheight> #<blockheight>) -G10 L1 P#<tool> Z[#<touch_result> - #<_hal[gscreen.probeheight]> + #<_hal[gscreen.blockheight]>] +G10 L1 P#<tool> Z[#<touch_result> - #<_hal[gmoccapy.probeheight]> + #<_hal[gmoccapy.blockheight]>] G43 ;G10 L1 P#<tool> Z#<touch_result> diff --git a/configs/sim/gmoccapy/ngcgui/axis_manualtoolchange.hal b/configs/sim/gmoccapy/ngcgui/axis_manualtoolchange.hal deleted file mode 120000 index 397c8934a..000000000 --- a/configs/sim/gmoccapy/ngcgui/axis_manualtoolchange.hal +++ /dev/null @@ -1 +0,0 @@ -../../axis_manualtoolchange.hal
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/core_sim.hal b/configs/sim/gmoccapy/ngcgui/core_sim.hal deleted file mode 120000 index b79df2d33..000000000 --- a/configs/sim/gmoccapy/ngcgui/core_sim.hal +++ /dev/null @@ -1 +0,0 @@ -../../core_sim.hal
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/gremlin_view.ui b/configs/sim/gmoccapy/ngcgui/gremlin_view.ui deleted file mode 120000 index 4c3bbf00a..000000000 --- a/configs/sim/gmoccapy/ngcgui/gremlin_view.ui +++ /dev/null @@ -1 +0,0 @@ -../../gremlin_view.ui
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/pyngcgui.ui b/configs/sim/gmoccapy/ngcgui/pyngcgui.ui deleted file mode 120000 index 2ed4808d5..000000000 --- a/configs/sim/gmoccapy/ngcgui/pyngcgui.ui +++ /dev/null @@ -1 +0,0 @@ -../../pyngcgui.ui
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy.ini b/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy.ini deleted file mode 100644 index 482710e6d..000000000 --- a/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy.ini +++ /dev/null @@ -1,203 +0,0 @@ -# EMC controller parameters for a simulated machine. -# General note: Comments can either be preceded with a # or ; - either is -# acceptable, although # is in keeping with most linux config files. - -# General section ------------------------------------------------------------- -[EMC] -VERSION = pyngcgui -MACHINE = pyngcgui-gmoccapy demo -#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 - -#NGCGUI_OPTIONS = opt1 opt2 ... -# opt items: -# nonew -- disallow making new tab page -# noremove -- disallow removing any tab page -# noauto -- no autosend (makeFile, then manually send) -# noiframe -- no internal image, image on separate toplevel -# nom2 -- no m2 terminator (use %) -NGCGUI_PREAMBLE = mm_std.ngc -NGCGUI_SUBFILE = simp.ngc -NGCGUI_SUBFILE = gosper.ngc -NGCGUI_SUBFILE = xyz.ngc -NGCGUI_SUBFILE = ihex.ngc -NGCGUI_SUBFILE = slot.ngc -NGCGUI_SUBFILE = arc2.ngc -NGCGUI_SUBFILE = iquad.ngc -NGCGUI_SUBFILE = qpocket.ngc -NGCGUI_SUBFILE = "" - -EMBED_TAB_NAME = Pyngcgui -EMBED_TAB_LOCATION = ntb_preview -#alternate: EMBED_TAB_LOCATION = ntb_user_tabs -#this demo requires a parallel ngcgui dir -EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui.ui - -EMBED_TAB_NAME = Gremlinview -EMBED_TAB_LOCATION = ntb_preview -#alternate: EMBED_TAB_LOCATION = ntb_user_tabs -#this demo requires a parallel ngcgui dir -EMBED_TAB_COMMAND = gladevcp -x {XID} gremlin_view.ui - - -# Cycle time, in milliseconds, that display will sleep between polls -CYCLE_TIME = 300 - -# Highest value that will be allowed for feed override, 1.0 = 100% -MAX_FEED_OVERRIDE = 1.5 -MAX_SPINDLE_OVERRIDE = 1.2 -MIN_SPINDLE_OVERRIDE = .5 - -# Max and default jog speeds in units per second -MAX_LINEAR_VELOCITY = 166 -DEFAULT_LINEAR_VELOCITY = 5 -MAX_ANGULAR_VELOCITY = 234 - -# Prefix to be used -PROGRAM_PREFIX = ../../nc_files/ - -# Introductory graphic -INTRO_GRAPHIC = linuxcnc.gif -INTRO_TIME = 5 - -# list of selectable jog increments -INCREMENTS = 1mm, 0.1mm, 0.01mm, 0.001mm, 10mm, 1.2345in - -[FILTER] -PROGRAM_EXTENSION = .png,.gif,.jpg Grayscale Depth Image -PROGRAM_EXTENSION = .py Python Script -png = image-to-gcode -gif = image-to-gcode -jpg = image-to-gcode -py = python - -# Task controller section ----------------------------------------------------- -[TASK] -TASK = milltask -CYCLE_TIME = 0.001 - -# Part program interpreter section -------------------------------------------- -[RS274NGC] -RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 -PARAMETER_FILE = sim.var -SUBROUTINE_PATH = nc_files/subroutines:../../nc_files/ngcgui_lib:../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../nc_files/ngcgui_lib/mfiles - -# Motion control section ------------------------------------------------------ -[EMCMOT] -EMCMOT = motmod -COMM_TIMEOUT = 1.0 -COMM_WAIT = 0.010 -BASE_PERIOD = 100000 -SERVO_PERIOD = 1000000 - -# Hardware Abstraction Layer section -------------------------------------------------- -[HAL] -HALFILE = core_sim.hal -HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal -HALFILE = simulated_home.hal - -HALUI = halui - -# Trajectory planner section -------------------------------------------------- -[TRAJ] -AXES = 3 -COORDINATES = X Y Z -HOME = 0 0 0 -LINEAR_UNITS = mm -ANGULAR_UNITS = degree -CYCLE_TIME = 0.010 -DEFAULT_VELOCITY = 9.0 -MAX_VELOCITY = 234 -POSITION_FILE = position.txt - -# First axis -[AXIS_0] -TYPE = LINEAR -HOME = 0.000 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 0.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 1 -HOME_IS_SHARED = 1 - -# Second axis -[AXIS_1] -TYPE = LINEAR -HOME = 0.000 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 0.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 1 - -# Third axis -[AXIS_2] -TYPE = LINEAR -HOME = 0.0 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 1.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 0 -HOME_IS_SHARED = 1 - -# Only needed for gmoccapy to set min and max values for the spindle bar -[SPINDLE] -MIN_REV = 0 -MAX_REV = 6000 - -# section for main IO controller parameters ----------------------------------- -[EMCIO] -EMCIO = io -CYCLE_TIME = 0.100 - -# tool table file -TOOL_TABLE = tool.tbl -TOOL_CHANGE_POSITION = 100 100 -10 -TOOL_CHANGE_QUILL_UP = 1 diff --git a/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy_with_popupkeyboard.ini b/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy_with_popupkeyboard.ini deleted file mode 100644 index f9193fca7..000000000 --- a/configs/sim/gmoccapy/ngcgui/pyngcgui_gmoccapy_with_popupkeyboard.ini +++ /dev/null @@ -1,203 +0,0 @@ -# EMC controller parameters for a simulated machine. -# General note: Comments can either be preceded with a # or ; - either is -# acceptable, although # is in keeping with most linux config files. - -# General section ------------------------------------------------------------- -[EMC] -VERSION = pyngcgui -MACHINE = pyngcgui-gmoccapy demo -#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 - -#NGCGUI_OPTIONS = opt1 opt2 ... -# opt items: -# nonew -- disallow making new tab page -# noremove -- disallow removing any tab page -# noauto -- no autosend (makeFile, then manually send) -# noiframe -- no internal image, image on separate toplevel -# nom2 -- no m2 terminator (use %) -NGCGUI_PREAMBLE = mm_std.ngc -NGCGUI_SUBFILE = simp.ngc -NGCGUI_SUBFILE = gosper.ngc -NGCGUI_SUBFILE = xyz.ngc -NGCGUI_SUBFILE = ihex.ngc -NGCGUI_SUBFILE = slot.ngc -NGCGUI_SUBFILE = arc2.ngc -NGCGUI_SUBFILE = iquad.ngc -NGCGUI_SUBFILE = qpocket.ngc -NGCGUI_SUBFILE = "" - -EMBED_TAB_NAME = Pyngcgui -EMBED_TAB_LOCATION = ntb_preview -#alternate: EMBED_TAB_LOCATION = ntb_user_tabs -#this demo requires a parallel ngcgui dir -EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui_popupkeyboard.ui - -EMBED_TAB_NAME = Gremlinview -EMBED_TAB_LOCATION = ntb_preview -#alternate: EMBED_TAB_LOCATION = ntb_user_tabs -#this demo requires a parallel ngcgui dir -EMBED_TAB_COMMAND = gladevcp -x {XID} gremlin_view.ui - - -# Cycle time, in milliseconds, that display will sleep between polls -CYCLE_TIME = 300 - -# Highest value that will be allowed for feed override, 1.0 = 100% -MAX_FEED_OVERRIDE = 1.5 -MAX_SPINDLE_OVERRIDE = 1.2 -MIN_SPINDLE_OVERRIDE = .5 - -# Max and default jog speeds in units per second -MAX_LINEAR_VELOCITY = 166 -DEFAULT_LINEAR_VELOCITY = 5 -MAX_ANGULAR_VELOCITY = 234 - -# Prefix to be used -PROGRAM_PREFIX = ../../nc_files/ - -# Introductory graphic -INTRO_GRAPHIC = linuxcnc.gif -INTRO_TIME = 5 - -# list of selectable jog increments -INCREMENTS = 1mm, 0.1mm, 0.01mm, 0.001mm, 10mm, 1.2345in - -[FILTER] -PROGRAM_EXTENSION = .png,.gif,.jpg Grayscale Depth Image -PROGRAM_EXTENSION = .py Python Script -png = image-to-gcode -gif = image-to-gcode -jpg = image-to-gcode -py = python - -# Task controller section ----------------------------------------------------- -[TASK] -TASK = milltask -CYCLE_TIME = 0.001 - -# Part program interpreter section -------------------------------------------- -[RS274NGC] -RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 -PARAMETER_FILE = sim.var -SUBROUTINE_PATH = nc_files/subroutines:../../nc_files/ngcgui_lib:../../nc_files/ngcgui_lib/utilitysubs -USER_M_PATH = ../../nc_files/ngcgui_lib/mfiles - -# Motion control section ------------------------------------------------------ -[EMCMOT] -EMCMOT = motmod -COMM_TIMEOUT = 1.0 -COMM_WAIT = 0.010 -BASE_PERIOD = 100000 -SERVO_PERIOD = 1000000 - -# Hardware Abstraction Layer section -------------------------------------------------- -[HAL] -HALFILE = core_sim.hal -HALFILE = spindle_sim.hal -HALFILE = axis_manualtoolchange.hal -HALFILE = simulated_home.hal - -HALUI = halui - -# Trajectory planner section -------------------------------------------------- -[TRAJ] -AXES = 3 -COORDINATES = X Y Z -HOME = 0 0 0 -LINEAR_UNITS = mm -ANGULAR_UNITS = degree -CYCLE_TIME = 0.010 -DEFAULT_VELOCITY = 9.0 -MAX_VELOCITY = 234 -POSITION_FILE = position.txt - -# First axis -[AXIS_0] -TYPE = LINEAR -HOME = 0.000 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 0.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 1 -HOME_IS_SHARED = 1 - -# Second axis -[AXIS_1] -TYPE = LINEAR -HOME = 0.000 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 0.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 1 - -# Third axis -[AXIS_2] -TYPE = LINEAR -HOME = 0.0 -MAX_VELOCITY = 166 -MAX_ACCELERATION = 1500.0 -BACKLASH = 0.000 -INPUT_SCALE = 4000 -OUTPUT_SCALE = 1.000 -MIN_LIMIT = -400.0 -MAX_LIMIT = 400.0 -FERROR = 0.050 -MIN_FERROR = 0.010 -HOME_OFFSET = 1.0 -HOME_SEARCH_VEL = 200.0 -HOME_LATCH_VEL = 20.0 -HOME_USE_INDEX = NO -HOME_IGNORE_LIMITS = NO -HOME_SEQUENCE = 0 -HOME_IS_SHARED = 1 - -# Only needed for gmoccapy to set min and max values for the spindle bar -[SPINDLE] -MIN_REV = 0 -MAX_REV = 6000 - -# section for main IO controller parameters ----------------------------------- -[EMCIO] -EMCIO = io -CYCLE_TIME = 0.100 - -# tool table file -TOOL_TABLE = tool.tbl -TOOL_CHANGE_POSITION = 100 100 -10 -TOOL_CHANGE_QUILL_UP = 1 diff --git a/configs/sim/gmoccapy/ngcgui/pyngcgui_popupkeyboard.ui b/configs/sim/gmoccapy/ngcgui/pyngcgui_popupkeyboard.ui deleted file mode 120000 index 4e340be63..000000000 --- a/configs/sim/gmoccapy/ngcgui/pyngcgui_popupkeyboard.ui +++ /dev/null @@ -1 +0,0 @@ -../../pyngcgui_popupkeyboard.ui
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/simulated_home.hal b/configs/sim/gmoccapy/ngcgui/simulated_home.hal deleted file mode 120000 index a0e8e5601..000000000 --- a/configs/sim/gmoccapy/ngcgui/simulated_home.hal +++ /dev/null @@ -1 +0,0 @@ -../../simulated_home.hal
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/spindle_sim.hal b/configs/sim/gmoccapy/ngcgui/spindle_sim.hal deleted file mode 120000 index 4b2079cb0..000000000 --- a/configs/sim/gmoccapy/ngcgui/spindle_sim.hal +++ /dev/null @@ -1 +0,0 @@ -../spindle_sim.hal
\ No newline at end of file diff --git a/configs/sim/gmoccapy/ngcgui/tool.tbl b/configs/sim/gmoccapy/ngcgui/tool.tbl deleted file mode 120000 index 4393451da..000000000 --- a/configs/sim/gmoccapy/ngcgui/tool.tbl +++ /dev/null @@ -1 +0,0 @@ -../tool.tbl
\ No newline at end of file diff --git a/configs/sim/gmoccapy/tool.tbl b/configs/sim/gmoccapy/tool.tbl index 193e47365..b42b8ba02 100644 --- a/configs/sim/gmoccapy/tool.tbl +++ b/configs/sim/gmoccapy/tool.tbl @@ -1,24 +1,24 @@ -T1 P1 D4.500000 Z+36.942571 ;4.5 mm 3 flute cutter -T2 P2 D25.000000 Z-12.214000 ;25 mm cutter -T3 P3 D7.500000 Z+34.403841 ;7.5 mm 3 flute cutter -T4 P4 D4.000000 Z-10.256000 ;4 mm Drill -T5 P5 D5.000000 Z-10.254000 ;5 mm Drill -T6 P6 D6.000000 Z-11.120000 ;6 mm Carbide burr -T7 P7 D6.500000 Z-14.589000 ;6.5 mm HSS burr -T8 P8 D12.000000 Z-14.458000 ;Cutter with 2 faces -T9 P9 D16.000000 Z-14.254000 ;Cutter with 3 faces -T10 P10 D165.000000 Z-12.112000 ;Facer with carbide inserts -T11 P11 D10.000000 Z-14.258000 ;Centering drill -T12 P12 D4.000000 Z+13.214000 ;3d taster elektronisch -T13 P13 D13.000000 Z-14.388000 ;3-Schneider Schaftfräser -T14 P14 D10.000000 Z-12.256000 ;3 Schneiden Stufenbohrer 5.5 auf 10 -T15 P15 D10.000000 Z-14.888000 ;Bohrer TiN beschichtet -T16 P16 D12.500000 Z-14.583000 ;Stufenbohrer 6.8 auf 12.5 - 3 Schneiden -T17 P17 D6.500000 Z-14.254000 ;Stufenbohrer 4.2 auf 6.5 mit 45 Grad Übergang -T18 P18 D4.000000 Z-16.595000 ;Schaftfräser 4 Schneider -T19 P19 D11.000000 Z-15.235000 ;Bohrer -T20 P20 D50.100000 Z-16.235000 ;Messerkopf 4 Platten -T21 P21 D7.800000 Z-14.587000 ;Bohrer poliert -T22 P22 D16.150000 Z-18.253000 ;Messerkopf Zweischneider -T23 P23 D3.300000 Z-14.254000 ;Bohrer poliert -T24 P24 D12.020000 Z-14.256000 ;Fräser nachgeschliffen, nicht beschichtet +T1 P1 D4.500000 Z+14.786229 ;4.5 mm 3 flute cutter +T2 P2 D25.000000 Z-12.214000 ;25 mm cutter +T3 P3 D7.500000 Z+42.553791 ;7.5 mm 3 flute cutter +T4 P4 D4.000000 Z-10.256000 ;4 mm Drill +T5 P5 D5.000000 Z-10.254000 ;5 mm Drill +T6 P6 D6.000000 Z-11.120000 ;6 mm Carbide burr +T7 P7 D6.500000 Z-14.589000 ;6.5 mm HSS burr +T8 P8 D12.000000 Z-14.458000 ;Cutter with 2 faces +T9 P9 D16.000000 Z-14.254000 ;Cutter with 3 faces +T10 P10 D165.000000 Z-12.112000 ;Facer with carbide inserts +T11 P11 D10.000000 Z-14.258000 ;Centering drill +T12 P12 D4.000000 Z+13.214000 ;3d taster elektronisch +T13 P13 D13.000000 Z-14.388000 ;3-Schneider Schaftfräser +T14 P14 D10.000000 Z-12.256000 ;3 Schneiden Stufenbohrer 5.5 auf 10 +T15 P15 D10.000000 Z-14.888000 ;Bohrer TiN beschichtet +T16 P16 D12.500000 Z-14.583000 ;Stufenbohrer 6.8 auf 12.5 - 3 Schneiden +T17 P17 D6.500000 Z-14.254000 ;Stufenbohrer 4.2 auf 6.5 mit 45 Grad Übergang +T18 P18 D4.000000 Z-16.595000 ;Schaftfräser 4 Schneider +T19 P19 D11.000000 Z-15.235000 ;Bohrer +T20 P20 D50.100000 Z-16.235000 ;Messerkopf 4 Platten +T21 P21 D7.800000 Z-14.587000 ;Bohrer poliert +T22 P22 D16.150000 Z-18.253000 ;Messerkopf Zweischneider +T23 P23 D3.300000 Z-14.254000 ;Bohrer poliert +T24 P24 D12.020000 Z-14.256000 ;Fräser nachgeschliffen, nicht beschichtet diff --git a/configs/sim/gmoccapy/tool_sensor_postgui.hal b/configs/sim/gmoccapy/tool_sensor_postgui.hal index 2351d1590..4242ffa4f 100644 --- a/configs/sim/gmoccapy/tool_sensor_postgui.hal +++ b/configs/sim/gmoccapy/tool_sensor_postgui.hal @@ -2,23 +2,19 @@ # gmoccapy_tool_length_probe_postgui.hal file # ################################################################### -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 # need to unlink, because they are linked allready in core:sim.hal 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 |