jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29426 commits 89 branches 0 tags 385 MiB
Commit graph

2736 commits

Author SHA1 Message Date
Greg Carl
70771d6de2 glcanon/interpret: feed, arcfeed, transverse use tuples instead of lists 
Previously these were a hodge podge of tuples and lists depending on 
which function populated them.  This results in faster processing and 
easier manipulation of these lists later.
 2022-11-27 18:07:05 -05:00
andypugh
96eea41a28 Merge branch '2.9' 
Signed-off-by: andypugh <andy@bodgesoc.org>
 2022-11-27 22:28:45 +00:00
andypugh
98fd15457c Manually apply PR #2133 to 2.9 
Original Author: luz paz <luzpaz@pm.me>

Signed-off-by: andypugh <andy@bodgesoc.org>
 2022-11-27 22:22:42 +00:00
Hans Unzner
7ddc73d205
Merge pull request #2145 from luzpaz/source-typos 
Fix typos in source
 2022-11-26 17:11:07 +01:00
Phillip Carter
e4afb73b39 fix typo 2022-11-24 15:43:51 +11:00
Phillip Carter
a7a1610502 fix conversational array rotation 2022-11-24 11:32:53 +11:00
CMorley
eb5ad84996 qtvcp -aux_program_loader: add error message for classicladder 2022-11-22 06:21:37 -08:00
luz paz
936712fd5f Fix typos in source 
Fixes various source typos
 2022-11-17 17:56:52 -05:00
CMorley
af395b669f qtvcp -versaprobe: improve help dialog layout/use 2022-11-12 12:05:03 -08:00
CMorley
56825f4939 qtvcp -camview_widget: add the rotation increment display 
also add the default .5 degree rotation to the selectable increments
 2022-11-12 12:05:03 -08:00
CMorley
7ec3e25798 qtvcp -versaprobe: improve help dialog layout/use 2022-11-11 15:48:14 -08:00
CMorley
3ca7b5ee5b qtvcp -camview_widget: add the rotation increment display 
also add the default .5 degree rotation to the selectable increments
 2022-11-11 12:21:23 -08:00
CMorley
872f791ed1 qtvcp -versaprobe: change layout to be less cluttered 
We don't show all the probe buttons at once - you select the type
with a button
 2022-11-05 11:06:18 -07:00
Greg Carl
d3a46f5cfb qtvcp: gcode_editor - refine regex tokens 2022-10-30 08:26:32 -04:00
Dewey Garrett
fb59d73627 tooldata_db.cc: support db_program args v2.1 
Optional args (10 max) can be used to specify startup parameters
for the [EMCIO]DB_PROGRAM

DB_VERSION=v2.1
Interface is backwards compatible, but DB_VERSION is bumped
in case applications used undocumented argv[1]==DB_VERSION
that was originally passed to DB_PROGRAM
 2022-10-16 18:03:11 -07:00
Dewey Garrett
f5deb99314 pyngcgui.py: handle absent [DISPLAY]PROGRAM_PREFIX 2022-10-16 17:52:38 -07:00
Greg Carl
0b61588c13
Merge pull request #2086 from jb0/gcode-lexer 
gcode_editor new lexer and qss updates
 2022-10-15 15:00:55 -04:00
jb0
63f7637c87 update comment command regex to be more more accurate with comma syntax for commands. 2022-10-15 14:55:21 -03:00
jb0
53d9964dbb gcodelexer - added highlighting for comment commands 
highlights commands in comments listed in the
https://linuxcnc.org/docs/html/gcode/overview.html using
color[5] (used by "Other" group in lexer). Only highlights the
last comment command on the line as requested by Greg Carl.
 2022-10-15 10:36:21 -03:00
CMorley
b7c9614bcc qtvcp -round_gauge: a fix for newer pyqt libraries. 
old library would accept floats for ints with QSize
New ones require ints
 2022-10-12 19:54:18 -07:00
Steffen Moeller
2dc8a0d348 src: s/ini/INI/ 
s/ini/INI/ - smallish correction

Update lib/python/gladevcp/hal_gremlin.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/adjustment_bar.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/hal/user_comps/vfs11_vfd/vfs11_vfd.c

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/adjustment_bar.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

More 'ini' -> 'INI' in src

ini -> INI to sync tests

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/offset_tool_button.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

s/modbus/Modbus/

Update lib/python/qtvcp/widgets/offset_tool_button.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update scripts/linuxcnc.in

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/emc/rs274ngc/interp_namedparams.cc

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/emc/usr_intf/emcsh.cc

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

docs: inifile -> INI file, etc
 2022-10-11 19:04:38 +02:00
jb0
041ba71b08 gcodelexer - move IJK from Axes to Other 2022-10-09 16:35:00 -03:00
jb0
1da8361a3d gcode_editor new lexer and qss updates 
gcode_editor.py changes
	Rewrite GcodeLexer using token based parsing with regex
	Refactored some of the get/set function to make it more dynamic and versatile when changing colors or switching/disabling lexers
	Added qproperty-styleSyntaxHighlightEnabled to optionally disable the lexer/syntax highlighting from stylesheet. (Defaults to True)
	Add callback to dynamically resize the line number margin based on number of lines in the editor

qtdragon & qtdragon_hd qss changes
	Update Editor Colors and fonts for new lexer in argentinium.qss, dark_grey.qss, qtdragon_dark_grey.qss
	Disable alternite row coloring in dark_grey.qss, qtdragon_dark_grey.qss
	Remove QComboBox::item font setting, was causing issues in stylesheet editor window using dropdown selection
	Add styling missing for QToolButon in qtdragon_hd dark.qss, dark_grey.qss & metal.qss
 2022-10-08 16:46:17 -03:00
CMorley
b23a50f91e qtvcp -macro_widget: use new touchEntry widget for entry 
Might need some tweaks we will see what people think
 2022-10-08 12:07:51 -07:00
CMorley
2edf48adbe qtvcp -touchEntry: add new widget for numeric touch entry 
For quick numeric entry with a touch screen
 2022-10-08 12:05:31 -07:00
Hans Unzner
cad3a1bea4 tooledit: corrected data type for column 'orient' to int, add error message when loading invalid value 2022-10-07 10:30:36 +02:00
Hans Unzner
b81c602107 tooledit: fix navigating with cursor keys 2022-10-07 10:30:36 +02:00
Hans Unzner
88016f2744 tooledit: replaced some deprecated widgets 2022-10-07 10:30:36 +02:00
CMorley
65d909b034 qtvcp -versa probe: connect set X,Y,Z, and Angle buttons signals 
reported on github issues.
 2022-10-03 18:24:57 -07:00
jb0
668a7f2f99 qtvcp audio_player.py fix segfault on exit 
espeak library used by qtvcp audio_player.py was causing a segfault on
exit when attempting to clear the callback function. (Issue #1379)
 2022-10-01 13:07:01 -07:00
Phillip Carter
a343b06d52 Allow one or more embedded pyvcp tabs in axis 
This is an extension of some work by forum user "nkp"
 2022-09-30 14:38:58 +10:00
CMorley
fdda9b21a9 qtvcp -basic/versa probe: make sure error polling is reset when finished 
other wise errors are reported late.
 2022-09-27 21:47:56 -07:00
CMorley
0beb1ffbff qtvcp -file_manager:fix button sizes to auto adjust 
Thanks to MarkoPolo from the forum for the updates
 2022-09-27 20:09:01 -07:00
Greg Carl
54f765206c qtvcp: machine-log formatting changes 2022-09-26 21:01:07 -04:00
CMorley
439bed9bca qtvcp -indicatedPushButton: fix python command calling 2022-09-24 19:21:11 -07:00
Phillip Carter
f6ec3184f9 rework void sensing 2022-09-22 16:19:45 +10:00
CMorley
6152295e40 qtvcp -mdiline: add new loadable program commands 
TESTLED, TESTBUTTON and TESTDIAL for qtvcp's test panels
 2022-09-19 20:37:22 -07:00
CMorley
ded43a0676 qtvcp aux_program_loader: add qtvcp's led, button and dial test panels 2022-09-19 20:37:22 -07:00
CMorley
efa5954eb7 qtvcp -fix selection of output PIN name, spindle near percent 2022-09-19 20:37:22 -07:00
CMorley
43f2e85a21 qtvcp -fix newer vesion of qt's property error: float vrs int 2022-09-17 18:08:51 -07:00
cnc
6854b4b8b0 gcode_editor/qtdragon: add styleColorMarkerBackground in qtvcp gcode_editor 
-to set current line marker bg color.
-Updated argentinium.qss and dark_grey.qss in qtdragon_hd to use this style for better readability
coded by jb0 on github

cleanup
 2022-09-14 18:34:30 -07:00
cnc
344ce38822 Add Detection for Metric or Imperial and adjust default values and get Default spindle speed from INI if it exist. 2022-09-14 11:22:03 -03:00
Phillip Carter
a1fce5b1fd
Update install_script 
fix message for rip installations
 2022-09-14 17:23:06 +10:00
CMorley
ff34393c28 qtvcp -test_led/test_button - add/update test panels 
test_button: An indicated  HAL button for testing with many options
test_led:  add ability to load a test button
 2022-09-11 20:18:51 -07:00
CMorley
42c2918479 qtvcp -pushbutton/indicatedPushButton: add dis/connect functions 
A new test panel wants to be able to set checkable at runtime.
We have to disconnect/reconnect signals, as momentary and checkable
buttons use different signals
 2022-09-11 19:34:58 -07:00
Greg Carl
20ffaa9123 qtvcp: file_editor make QBoxLayouts accessible from handlers 2022-09-11 12:01:14 -04:00
Greg Carl
4120874377 qtplasmac: move powermax port option 2022-09-11 09:33:51 -04:00
CMorley
429f7d28ea qtvcp -switch gcode ripper to python2 due to bugs 
Aparently between python 2.6 - 3.7, python 're' behaivour changed.
I tried 3.8 still errored. original author has beed advided.
 2022-09-10 13:59:57 -07:00
Greg Carl
44cbb48ca7 qtvcp: origin_offsetview.py - use status for current offset vs var file 
Thanks to Chris for the leg work on this.
Previously, the widget may not have always shown the most up to date 
info for the current offset until the var file was updated.  This fixes 
that.
 2022-09-10 15:19:31 -04:00
Greg Carl
2394460cba qtvcp: notify.py - remove debug print 2022-09-10 14:11:01 -04:00
CMorley
73d28e35b9 qtvcp -versa_probe: catch HAL error if linuxcnc isn't running 
don't pop error dialog
 2022-09-08 22:02:53 -07:00
CMorley
90740a64c6 qtvcp simple_widgets: add auto_pause_sensittive property 
widget will be enabled when linuxcnc is paused.
 2022-09-08 22:02:08 -07:00
CMorley
5c2e17ad3c qtvcp -state_led: add ability to follow an abitrary HAL pin 
show state of most any pin
 2022-09-08 22:01:39 -07:00
Greg Carl
b44eb51951 qtvcp: make filemanager windowLayout accessible from handlers 2022-09-07 20:07:29 -04:00
Greg Carl
71d183989d qtvcp keybindings: add ability to remove keybindings 2022-09-05 21:16:22 -04:00
CMorley
e8e5b99629 qtvcp -versa/basic probe: improve aborting of routines. 
WE poll the error channel rather then read standard error.
to do this we block the main screens eror polling and let the sub_program
read it until it is finished. linuxcnc can only have one program read the
error channel at a time. this allso requites tha abort send a message thru
the error change. currently tha requires having an on_abort.ngc subroutine
and an INI entry, as per remap docs.
 2022-09-04 17:01:40 -07:00
CMorley
fcf9913a4f qtvcp -screen_option: add some commented out debug code 
Will be handy again.
 2022-09-04 17:01:40 -07:00
CMorley
f454961286 qtvcp -istat: remove debug print statement 2022-09-04 17:01:40 -07:00
CMorley
b4db0f6db7 qtvcp -core: add ability to trace status poll un/block commands 
for debugging subroutines
 2022-09-04 17:01:40 -07:00
CMorley
fc83ccc4f6 qtvcp -hole_circle: more fixes for newer pyqt versions 2022-09-03 13:06:11 -07:00
CMorley
9f9bd1fa45 qtvcp -istat: quiet some annoying warnings 
not useful on files not using the INI
 2022-09-02 12:03:10 -07:00
CMorley
ce33c9df0d qtvcp -pstat: fix error from having no handler 
panels don't always use handlers - don't cause an error when
looking fir the handler directory
 2022-09-02 12:03:10 -07:00
CMorley
0f8e0abad3 qtvcp -fileManager: add delete jump button, load button 
Authur: Jim 'Persei'
Having to delete 'jump to' file paths from the preference file was
annoying. add a button to do it. add a loadfile button and expose
the copy file features with a checkbox
 2022-09-02 12:03:10 -07:00
Phillip Carter
9cbe6ed284 add optional automatic thc activation 2022-09-02 10:47:52 +10:00
CMorley
d9afe1ecc0 qtvcp -add a check for running in auto mode to MDI calls 
can't call MDI when running in auto mode.
 2022-08-30 21:41:59 -07:00
c-morley
18f6b3c952
qtvcp -pstat: fix syntax error 
Fix copy paste error?
 2022-08-29 10:31:21 -07:00
Petter Reinholdtsen
c51ed92007 Switched qtvcp/lib/ripper/gcode_ripper.py shebang to python3. 
Thanks lintian for noticing.
 2022-08-29 05:16:26 +02:00
CMorley
86ba807467 qtvcp -pstat: add handler/ui directory variables 2022-08-28 17:20:58 -07:00
CMorley
2f7941c2c5 qtvcp -simple_widges: fix missed update required by newer PyQT libraries 
requires ints rather the accepting floats
 2022-08-28 14:26:51 -07:00
CMorley
760767bb19 qtvcp -update drawing code for pyqt in Debian 12 
pyqt used to accept floats but now only ints
 2022-08-28 12:07:19 -07:00
CMorley
5a55bd6bc9 qtvcp touchoff_subprogram: add more error checking 
When aborting this should catch errors sooner.
 2022-08-28 10:52:45 -07:00
CMorley
bef5e32468 qtvcp -add auto height probe code 2022-08-28 10:52:45 -07:00
CMorley
a08b7a90b4 qtvcp -aux_program_loader: add gcode_ripper loader 2022-08-28 10:52:45 -07:00
CMorley
9aa4ee9e77 qtvcp -add gcode ripper and z_level_compensation component for auto probe leveling 2022-08-28 10:52:45 -07:00
CMorley
a290fa86bd qtvcp -indicated_PushButtons: add polishing state and enabled states 
polish on homed state
enabled/disabled on states of all-homed,machine-on,idle,running,manual,mdi,auto
 2022-08-28 10:52:45 -07:00
Greg Carl
0c665304f9 qtvcp: clean up unused code/modules, whitespace, variable assignments 2022-08-27 08:05:59 -04:00
CMorley
a025f70127 qtvcp -qtdragon/HD: update to probing, add autoheight to HD 
improve error catching for probe routines.
Autoheight probing helps with tool auto probe setup.
 2022-08-26 20:18:22 -07:00
Greg Carl
6068ac0033 qtplasmac: remove unused modules, variables 2022-08-23 19:52:46 -04:00
Damian Wrobel
25f05dc6c0 Switch to python3 for fanuc_200f.py 
Also adds executable bit.

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2022-08-22 22:44:57 +02:00
Dewey Garrett
0b8c3acc4c tooldb.py: include traceback for nak_reply() 
Provides additional debugging information for
negative acknowledgment.

Note: empty_line is special case with no traceback reqd
 2022-08-21 19:31:20 -07:00
Greg Carl
353bf37e99 qtplasmac: fix translation issues 2022-08-21 10:24:01 -04:00
Greg Carl
bb1ba63132 qtvcp project: fix various issues 
missing modules, copy/paste, undefined variables, whitespace, etc.
 2022-08-20 15:20:49 -04:00
CMorley
4591036421 qtvcp -nurbs_editor: remove unused function call 
copied over from example code, but never utilized
 2022-08-20 12:07:03 -07:00
CMorley
045a6381d1 qtvcp -fix embedding into AXIS gui. 
code for embedding qtvcp into qtvcp screens,
was run on qtvcp panels being embedded in AXIS.

Now we decide which tyoe it is by looking for 'loadusr'
That is only used for embedding into AXIS (so far)
 2022-08-20 11:56:55 -07:00
Petter Reinholdtsen
ffe664c042 Removed deprecated axis and deprecated_axes fields 
These were flagged as deprecated in 2015, and 7 years seem like long
enough time for people to prepare for its removal.  Also adjusted
tests to no longer expect the field, and update documentation to mention that
the field was removed in version 2.9.
 2022-08-19 22:25:46 +02:00
Phillip Carter
c8dd11e89e qtplasmac: fix errors in v1.229.229 2022-08-19 21:17:19 +10:00
Phillip Carter
415d725e53 qtplasmac: fix updates for v154 and v170 2022-08-19 13:59:20 +10:00
Greg Carl
5de8e34f18 qtplasmac: conversational origin 
use relative instead of absolute position for origin
 2022-08-16 18:21:07 -04:00
CMorley
962669b7a8 qtvcp -change exit clean up code. 
Hoping to help the segfault on exit problem - it didn't.
But this does make more logical sense: cleanup before entering close event
 2022-08-12 19:51:12 -07:00
CMorley
383fc1ea74 qtvcp -allow keyboard entry with the caculator widget 
Some people like to use a keyboard too.
 2022-08-12 19:51:12 -07:00
Greg Carl
f924c1e8cd qtplasmac: change workflow for setting peripheral offsets 2022-08-08 21:34:03 -04:00
CMorley
737d495321 qtvcp : add panel instance reference, fix check for preference 2022-08-07 13:52:48 -07:00
CMorley
fc7fa95a99 qtvcp -change 'has_closing_handler' variable default 2022-08-07 13:31:13 -07:00
CMorley
02726aa7a3 qtvcp -add error polling control functions 
trying to control who polls the error channel
 2022-08-07 13:31:13 -07:00
Greg Carl
7d6a88df23 qtplasmac: fix updater handling of pref conversion from string to bool 2022-08-07 10:35:56 -04:00
CMorley
b5d7ea6d56 qtvcp -ngcgui: add images 2022-08-04 20:10:50 -07:00
CMorley
bea856a4b8 qtvcp -ngcgui: add the proper path for the silverdragon image 
image used if the NGCGUI sub doesn't supply one.
 2022-08-04 20:10:50 -07:00
CMorley
75da4dece4 qtvcp -qt_action: CALL_MDI_WAIT now reliably catches errors 
before if there were multiple MDI commands and if one errorred, the next was often
run regardless.
This was do to having two linuxcnc.error channels competing for the data.
We now use STATUS.ERROR only.
There may be more code that need to use STATUS error in Qtvcp  yet...
 2022-08-04 20:10:50 -07:00
CMorley
123b2d91cd qtvcp -move error channel instance to core AKA status 
this makes sure we have acces to the one instance.
Probing/MDI will use this to check for errors.
 2022-08-04 20:10:50 -07:00
CMorley
899874833e qtvcp -qt_ngcgui; fix bugs after testing 2022-08-03 21:47:04 -07:00