Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linuxcnc retrofit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Machines et équipements
Méca Heavy
Mori Seiki SL0
linuxcnc retrofit
Commits
635686fa
Commit
635686fa
authored
Dec 06, 2020
by
electrolab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Connect all homing command signals to genuine gmoccapy buttons, and remove temporary panel
parent
1cafec69
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
8 deletions
+28
-8
gmoccapy_postgui.hal
gmoccapy_postgui.hal
+4
-0
maurice_gmoccapy.ini
maurice_gmoccapy.ini
+4
-4
maurice_gmoccapy.py
maurice_gmoccapy.py
+20
-4
No files found.
gmoccapy_postgui.hal
View file @
635686fa
net X-homed => halui.joint.0.home
net Z-homed => halui.joint.2.home
net Home-All <= gmoccapy.joint.all.home
net Home-X <= gmoccapy.joint.0.home
net Home-Z <= gmoccapy.joint.2.home
maurice_gmoccapy.ini
View file @
635686fa
...
...
@@ -9,11 +9,11 @@ MACHINE = EtherCAT Machine
DEBUG
=
1
[DISPLAY]
DISPLAY
=
gmocca
py
DISPLAY
=
./maurice_gmoccapy.
py
EMBED_TAB_NAME
=
right_side_panel
EMBED_TAB_LOCATION
=
box_custom_4
EMBED_TAB_COMMAND
=
gladevcp -x {XID} -H vcp_box.hal vcp_box.glade
#
EMBED_TAB_NAME = right_side_panel
#
EMBED_TAB_LOCATION = box_custom_4
#
EMBED_TAB_COMMAND = gladevcp -x {XID} -H vcp_box.hal vcp_box.glade
PREFERENCE_FILE_PATH
=
gmoccapy_preferences
LATHE
=
1
...
...
maurice_gmoccapy.py
View file @
635686fa
...
...
@@ -110,7 +110,8 @@ _BB_LOAD_FILE = 8
_TEMPDIR
=
tempfile
.
gettempdir
()
# Now we know where the tempdir is, usualy /tmp
# set up paths to files
BASE
=
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
sys
.
argv
[
0
]),
".."
))
#BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), ".."))
BASE
=
"/usr"
# Maurice local gmoccapy
LIBDIR
=
os
.
path
.
join
(
BASE
,
"lib"
,
"python"
)
sys
.
path
.
insert
(
0
,
LIBDIR
)
...
...
@@ -3583,7 +3584,10 @@ class gmoccapy(object):
def
on_btn_home_all_clicked
(
self
,
widget
,
data
=
None
):
self
.
_set_motion_mode
(
0
)
# home -1 means all
self
.
command
.
home
(
-
1
)
#self.command.home(-1)
# Maurice homing
self
.
halcomp
[
"joint.all.home"
]
=
1
self
.
halcomp
[
"joint.all.home"
]
=
0
def
_on_btn_unhome_clicked
(
self
,
widget
):
self
.
_set_motion_mode
(
0
)
...
...
@@ -3608,8 +3612,15 @@ class gmoccapy(object):
joint_or_axis
=
-
1
self
.
_set_motion_mode
(
0
)
self
.
command
.
home
(
joint_or_axis
)
#self.command.home(joint_or_axis)
# Maurice homing
if
joint_axis
==
1
:
home_pin
=
"joint.all.home"
else
:
home_pin
=
"joint.%d.home"
%
(
joint_axis
)
self
.
halcomp
[
home_pin
]
=
1
self
.
halcomp
[
home_pin
]
=
0
def
_unhome_signal
(
self
,
object
,
joint
):
self
.
_set_motion_mode
(
0
)
self
.
all_homed
=
False
...
...
@@ -5181,6 +5192,11 @@ class gmoccapy(object):
# make a pin to set ignore limits
pin
=
self
.
halcomp
.
newpin
(
"ignore-limits"
,
hal
.
HAL_BIT
,
hal
.
HAL_IN
)
hal_glib
.
GPin
(
pin
).
connect
(
"value_changed"
,
self
.
_ignore_limits
)
# make pins for Maurice lathe
self
.
halcomp
.
newpin
(
"joint.all.home"
,
hal
.
HAL_BIT
,
hal
.
HAL_OUT
)
self
.
halcomp
.
newpin
(
"joint.0.home"
,
hal
.
HAL_BIT
,
hal
.
HAL_OUT
)
self
.
halcomp
.
newpin
(
"joint.2.home"
,
hal
.
HAL_BIT
,
hal
.
HAL_OUT
)
# Hal Pin Handling End
# =========================================================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment