search

LinuxCNC / linuxcnc

LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more.
http://linuxcnc.org/
GNU General Public License v2.0
1.75k stars 1.14k forks source link

New Bar Widgets #2851

Closed tjtr33 closed 6 months ago

tjtr33 commented 6 months ago

Moved files to porper location, Added submake files and readmes. tested ok locally.

tjtr33 commented 6 months ago

I have write access to my fork I do not understand the conflict with configs/sim/touchy/ngcgui/pyngcgui_touchy_popupkeyboard.ui

That directory does not exist in my fork

I do not understand the conflict with lib/python/pyvcp_widgets.py Of course ,that file is the core of this fork And of course it is different. The idea is to make other branches and master use the new pyvcp_wodgets.py

andypugh commented 6 months ago

It sounds like your fork is out of data with LinxCNC master.

"git pull --rebase" might fix this. It will undo all your changes, pull the current state of LinuxCNC master, then re-apply your changes. It's a good idea to do this before making any pull request.