Merge state at commit ca06fc273acec789266678dc2565e27ad0be11ad #7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
they needed to be parented fom the main window. Added objectnames too
For reasons I couldn't quite figure out, the original design had so many layers that stylesheets changes on the main window would not change the SoftInputWidget's style. probably a parenting problem (or based on QObject vrs QWidget). Simplified now and only two widgets. Seems to work now.
they needed to be parented fom the main window. Added objectnames too
Shows the value of an option HAL input pin. You can set a text template for rich text/formatted display
and add some color to them with rich text
After fixing dialogs to be able to be styled - there didn't llok good. Now I specifically style them.
It seems on HAL float input pins that got their value from QPin's QTSignal, would get an integer number rather then the float. I could change that by changing the order of the overloaded pyqtSignal definition but then that may have just made eveything a float... Now we send a PyQt_PyObject that is not supposed to be converted internally. It seems to work.
1) print command lines settings usage example: 5axisgui pivot_len=300 2) parameterize pivot_len incorporating za,zb box heights 3) remove unused tool_radius var 4) pivot_len var now represents correctly the effective pivot_len with default value of 250 and is unchanged for compatibility with hal pin default of 5axiskins.c (no functional changes intended by this commit)
Inverting the step pin in the gui actually inverted the direction pin. Looks like do to python lists not having consistant ordering. Thank Peter for heads up.
I've needed to test something when i couldn;t see the screen. Now I can connect a HAL pin to this test LED and have it speak the (editable) label and state.
1) 5axiskins: use IN pin for pivot_len (not IO)
2) 5axisgui: provide OUT pin for gui simulated pivot length
3) configs/sim/5axis/bridgemill sim config:
5axis.tbl: use metric tool length values to agree with 5axis.ini
5axisgui.hal (new)
a) compute pivot length needed for 5axiskins with loaded tool
b) consolidate postgui hal statements
5axis.ini:
a) use added 5axisgui.hal file
b) add omitted [TRAJ]MAX_ANGULAR_VELOCITY
c) add tooledit options 'z diam'
d) update j5/w, j2,z limits
README: demo example
Fix rolfmill example could be tested now without additional moves
Replaced the component type magic numbers with an enumerated type. The new types have the same values as before. i.e. 0 == user 1 == realtime 2 == something else (not sure where this value is ever assigned) There should be no functional change.
…c_numbers hal: Remove component type magic numbers
The files moved and got renamed back in 2004, this changes the naming within the file itself.
increments must be a number
Don't error out each time it's selected, but don't set the increments either. We should add some more checking while parsing the INI actually
…asmaC files and error messages to align with user-doc changes.
plasmac: update user-docs and update/add images, update supporting Pl…
…asmaC files and error messages to align with user-doc changes.
torch on is automatic
Also add an option to read out all register values. Signed-off-by: andypugh <andy@bodgesoc.org>
Update PMX picture
changed pocket_number to mod_pocket in direction logic
fix torch on before pierce height error fix motion start after cut height error fix offset counts
Contributor
|
Thanks for keeping this up to date! |
Contributor
Author
|
EMCApplication from this version is uploaded in the Cloudsmith repository. The Sorry it took so long! |
Contributor
|
Thanks |
Contributor
|
tested to fix the setuid issue on armhf |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request merges in changes from upstream LinuxCNC@master branch at commit ca06fc2 (the latest commit with fully passed tests at LinuxCNC's buildbot operation).
I have been talking about rebuilding and upgrading the packages in #6, however the situation ended up so that enough time passed to justify merging in changes beforehand.
Checked locally in simulation mode on
amd64.