From ff1c6567321328c3da61bab48f8e1a95cfe81d8b Mon Sep 17 00:00:00 2001
From: "ton, LinuxCNCMESA" <ton_@microkloon.nl>
Date: Tue, 23 Apr 2019 15:43:45 +0200
Subject: [PATCH] pendant working again

---
 layout2.inc    |   1 +
 mesa_2019.ini  | 112 ++++++++++++++++++++++++++++++++++++++++++++++++-
 mesa_2019.pref |   4 +-
 3 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 layout2.inc

diff --git a/layout2.inc b/layout2.inc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layout2.inc
@@ -0,0 +1 @@
+
diff --git a/mesa_2019.ini b/mesa_2019.ini
index 67abec8..4d91b5e 100644
--- a/mesa_2019.ini
+++ b/mesa_2019.ini
@@ -4,7 +4,7 @@
 [EMC]
 VERSION = 1.1
 MACHINE = mesa_2019
-DEBUG = 0x00000002
+DEBUG = 0x00000000
 
 [HOSTMOT2]
 DRIVER = hm2_eth
@@ -30,7 +30,7 @@ EMBED_TAB_COMMAND = gladevcp  -x {XID} -u python/probe_screen.py probe_icons/pro
 
 EMBED_TAB_NAME = Camera
 EMBED_TAB_LOCATION = ntb_preview
-EMBED_TAB_COMMAND = mplayer -wid {XID} tv://0 -vf  rectangle=-1:2:-1:240,rectangle=2:-1:320:-1
+EMBED_TAB_COMMAND = mplayer -quiet -msglevel all=-1 -wid {XID} tv://0 -vf  rectangle=-1:2:-1:240,rectangle=2:-1:320:-1
 
 
 [KINS]
@@ -66,8 +66,116 @@ HALFILE = custom.hal
 HALFILE = postgui.hal
 HALUI = halui
 
+HALFILE = LIB:xhc-hb04.tcl
+
 [HALUI]
 
+[XHC_HB04_CONFIG]
+# specify layout = n for LIB:xhc-hb04-layout{n}.cfg files
+layout = 2
+# coords: specify upto 4 letters from set {x y z a b c u v w}
+# coords: switch labels are xyza but any unique 4 letters
+#         from the set {xyxabcuvw) can be used (if the coord exists)
+coords = x y z
+# lowpass settings:
+# coef: slows rate of change of output,  range: 0 < coef < 1
+coefs = 1 1 1 1
+# scale plus or minus, rotaries may require larger scale factor:
+scales = 1 -1 1 1
+# jogmode normal(default) or vnormal
+jogmode = normal
+# sequence 1: 0.001,0.010,0.100,1.000 (mm-based machine)
+# sequence 2: 0.001,0.005,0.010,0.020 (inch-based machine)
+# sequence 3: 0.001,0.010,0.100
+# sequence 4: 0.001,0.005,0.010,0.020,0.050,0.100
+# sequence 5: 0.001,0.010,0.050,0.100,1.000
+sequence = 1
+# require_pendant = yes|no: create xhc-hb04 hal pins when pendant not
+#                           connected at startup
+require_pendant = no
+# inch_or_mm = in | mm
+inch_or_mm = mm
+# mpg_accels: provision for reduced acceleration for manual mode jogging
+mpg_accels = 1 2 20 600
+
+[APPLICATIONS]
+APP = monitor-xhc-hb04
+
+[XHC_HB04_BUTTONS]
+# use button names according to layout file LIB:xhc-hb04-layout{n}.cfg
+# note: "start-pause" is connected for standard behavior
+#        controlling halui.pause/halui.resume/halui.run
+# these are examples, edit as required:
+
+goto-zero   = halui.mdi-command-00
+# synthesized per-axis buttons for goto-zero button:
+goto-zero-x = ""
+goto-zero-y = ""
+goto-zero-z = ""
+goto-zero-a = ""
+
+start-pause = std_start_pause
+rewind      = halui.program.step
+# probe-input for simulating a probe:
+#probe-z     = motion.probe-input
+macro-3     = halui.mdi-command-03
+
+half        = halui.spindle.stop
+# synthesized per-axis buttons for half button:
+half-x      = ""
+half-y      = ""
+half-z      = ""
+half-a      = ""
+
+zero        = ""
+# synthesized per-axis buttons for zero button:
+zero-x      = halui.mdi-command-12
+zero-y      = halui.mdi-command-13
+zero-z      = halui.mdi-command-14
+zero-a      = halui.mdi-command-15
+
+safe-z      = halui.mdi-command-10
+# in this sim, home-all only works first time, hold down till finished:
+home        = halui.home-all
+macro-1     = halui.mdi-command-01
+macro-2     = halui.mdi-command-02
+spindle     = halui.spindle.start
+step        = xhc-hb04.stepsize-up
+mode        = ""
+macro-6     = halui.mdi-command-06
+macro-7     = halui.mdi-command-07
+stop        = halui.program.stop
+reset       = halui.estop.activate
+
+[HALUI]
+# these are examples, edit as required:
+# a halui hal pin is created for each MDI_COMMAND below
+# halui.mdi-command-00, halui.mdi-command-01,... etc
+MDI_COMMAND=G0 X0 Y0 Z0
+MDI_COMMAND=(debug, example: mdi-01)
+MDI_COMMAND=(debug, example: mdi-02)
+#03 M110: clears notifications
+MDI_COMMAND=M110
+MDI_COMMAND=(debug, example: mdi-04)
+MDI_COMMAND=(debug, example: mdi-05)
+MDI_COMMAND=(debug, example: mdi-06)
+#07 M101: example print to stdout
+MDI_COMMAND=M101
+MDI_COMMAND=(debug, example: mdi-08)
+MDI_COMMAND=(debug, example: mdi-09)
+MDI_COMMAND=(debug, example: mdi-10)
+MDI_COMMAND=(debug, example: mdi-11)
+#12
+MDI_COMMAND= G10 L20 P0 X0
+#13
+MDI_COMMAND= G10 L20 P0 Y0
+#14
+MDI_COMMAND= G10 L20 P0 Z0
+#15
+MDI_COMMAND= G10 L20 P0 C0
+
+
+
 [AXIS_X]
 MIN_LIMIT = 0
 MAX_LIMIT = 541
diff --git a/mesa_2019.pref b/mesa_2019.pref
index 67c69c4..9098727 100644
--- a/mesa_2019.pref
+++ b/mesa_2019.pref
@@ -2,7 +2,7 @@
 blockheight = 0.0
 spindle_start_rpm = 300.0
 scale_jog_vel = 27.0
-scale_spindle_override = 1
+scale_spindle_override = 10.0
 scale_feed_override = 1
 scale_rapid_override = 1
 hide_turtle_jog_button = False
@@ -37,7 +37,7 @@ show_keyboard_on_offset = False
 show_keyboard_on_tooledit = False
 show_keyboard_on_edit = False
 show_keyboard_on_mdi = False
-spindle_bar_min = 800.0
+spindle_bar_min = 10000.0
 spindle_bar_max = 6000.0
 x_pos_popup = 45.0
 y_pos_popup = 55