From 44d3960545366cae7716f4cd33a426c955829d0a Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sat, 27 Jul 2024 17:28:58 +0000 Subject: [PATCH] Fix various typos in the codebase --- configs/by_interface/servotogo/stg.ini | 2 +- configs/sim/axis/laser/python/remap.py | 2 +- configs/sim/axis/plasma/README | 2 +- .../plasmac2/lib/custom/user_periodic.py | 2 +- configs/sim/axis/remap/README | 2 +- configs/sim/gmoccapy/gmoccapy_messages.ini | 2 +- .../plasma_config/gmoccapy_plasma.ini | 4 ++-- .../screens/qtdragon/qtdragon_handler.py | 2 +- .../nuPyvcpBars/pyvcp_widgets18nov2023.py | 2 +- docs/src/code/building-linuxcnc.adoc | 4 ++-- docs/src/drivers/hal_pi_gpio.adoc | 2 +- .../getting-started/hardware-interface.adoc | 4 ++-- docs/src/gui/qtdragon.adoc | 2 +- docs/src/gui/qtvcp-libraries.adoc | 2 +- docs/src/plasma/qtplasmac.adoc | 2 +- lib/python/plasmac/gusset.py | 2 +- lib/python/pyvcp_widgets.py | 20 +++++++++---------- lib/python/qtvcp/core.py | 4 ++-- lib/python/qtvcp/lib/message.py | 2 +- lib/python/qtvcp/lib/ripper/gcode_ripper.py | 2 +- lib/python/qtvcp/qt_action.py | 2 +- lib/python/qtvcp/qt_makepins.py | 2 +- lib/python/qtvcp/qt_pstat.py | 2 +- lib/python/qtvcp/widgets/origin_offsetview.py | 2 +- lib/python/qtvcp/widgets/screen_options.py | 2 +- lib/python/qtvcp/widgets/stylesheeteditor.py | 2 +- lib/python/qtvcp/widgets/tool_offsetview.py | 2 +- lib/python/raster.py | 4 ++-- nc_files/nurbs/G6/read.me | 2 +- src/hal/classicladder/README.txt | 2 +- src/hal/classicladder/drawing_sequential.c | 2 +- src/hal/classicladder/edit.c | 4 ++-- src/hal/classicladder/files.c | 2 +- src/hal/classicladder/manager_gtk.c | 2 +- src/hal/classicladder/serial_linux.c | 2 +- tcl/ngcgui.tcl | 2 +- tests/interp/g71-endless-loop2/test.sh | 2 +- tests/linuxcncrsh-tcp/tcp.nml | 2 +- tests/raster/test | 8 ++++---- unit_tests/catch.hpp | 2 +- 40 files changed, 58 insertions(+), 58 deletions(-) diff --git a/configs/by_interface/servotogo/stg.ini b/configs/by_interface/servotogo/stg.ini index 9cae0b7faab..e0c38de445b 100644 --- a/configs/by_interface/servotogo/stg.ini +++ b/configs/by_interface/servotogo/stg.ini @@ -138,7 +138,7 @@ HOME = 0.000 MAX_VELOCITY = 30.48 # maximum acceleration MAX_ACCELERATION = 500.0 -# machanical backlash measured +# mechanical backlash measured BACKLASH = 0.000 # time to update the axis # number of encoder ticks / unit diff --git a/configs/sim/axis/laser/python/remap.py b/configs/sim/axis/laser/python/remap.py index e25df3aeab0..e11ffd0e577 100644 --- a/configs/sim/axis/laser/python/remap.py +++ b/configs/sim/axis/laser/python/remap.py @@ -33,7 +33,7 @@ def rasterData(self, **words): def rasterStart(self, **words): global rasterProgrammer - #matchine must be in position before run issued + #machine must be in position before run issued #make motion complete queue prior to run program command yield INTERP_EXECUTE_FINISH if rasterProgrammer: diff --git a/configs/sim/axis/plasma/README b/configs/sim/axis/plasma/README index 97ad57a28c9..0514a2bff24 100644 --- a/configs/sim/axis/plasma/README +++ b/configs/sim/axis/plasma/README @@ -1,6 +1,6 @@ plasmac2 is a customised AXIS GUI for operating a plasma cutting table using the plasmac component. -Included is an appliction to enable migrating a working QtPlasmaC configuration to plasmac2. +Included is an application to enable migrating a working QtPlasmaC configuration to plasmac2. To begin a migration, call the application from a terminal using one of the following commands depending on the LinuxCNC installation type: Package installation: diff --git a/configs/sim/axis/plasma/plasmac2/lib/custom/user_periodic.py b/configs/sim/axis/plasma/plasmac2/lib/custom/user_periodic.py index ccc14b23158..b72c1c0c0c3 100644 --- a/configs/sim/axis/plasma/plasmac2/lib/custom/user_periodic.py +++ b/configs/sim/axis/plasma/plasmac2/lib/custom/user_periodic.py @@ -1,5 +1,5 @@ # CUSTOM PERIODIC CODE, RUNS ONCE EVERY CYCLE -# example to print vaue of custom hal pin if not zero +# example to print value of custom hal pin if not zero #if comp['my-halpin']: # print(comp['my-halpin']) diff --git a/configs/sim/axis/remap/README b/configs/sim/axis/remap/README index 98e1a6aec79..9f442d1fcaf 100644 --- a/configs/sim/axis/remap/README +++ b/configs/sim/axis/remap/README @@ -18,7 +18,7 @@ iocontrol-removed: a 'research part' of the (now merged) remapping branch: It de python-stdglue contains embedded Python code supporting the above examples. This should eventually evolve into canned code which users need not touch except in more exotic circumstances. Note all examples above use the same glue code from remap.py. -common_nc_subs: this contains reset_state.ngc, which should be called from ON_ABORT procedure. Note that it is in particular important to reset the modal state after a failed remap procedure because this can lead to susequent failures (e.g. bug ID 3437928). The demos use their own on_abort sub and call reset_state. +common_nc_subs: this contains reset_state.ngc, which should be called from ON_ABORT procedure. Note that it is in particular important to reset the modal state after a failed remap procedure because this can lead to subsequent failures (e.g. bug ID 3437928). The demos use their own on_abort sub and call reset_state. Remapping Documentation: http://www.linuxcnc.org/docs/devel/html/remap/structure.html diff --git a/configs/sim/gmoccapy/gmoccapy_messages.ini b/configs/sim/gmoccapy/gmoccapy_messages.ini index aa1a34c9e6a..ad97c93d397 100644 --- a/configs/sim/gmoccapy/gmoccapy_messages.ini +++ b/configs/sim/gmoccapy/gmoccapy_messages.ini @@ -43,7 +43,7 @@ INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in # MESSAGE_TEXT = The text to be displayed, may be pango markup formatted # MESSAGE_TYPE = one of "status" , "okdialog" , "yesnodialog" -# status : Will just display a message as popup window, using the messsaging system of gmoccapy +# status : Will just display a message as popup window, using the messaging system of gmoccapy # okdialog : Will hold focus on the message dialog and will activate a "-waiting" Hal_Pin OUT. # Closing the message will reset the waiting pin # yesnodialog : Will hold focus on the message dialog and will activate a "-waiting" Hal_Pin bit OUT diff --git a/configs/sim/gmoccapy/plasma_config/gmoccapy_plasma.ini b/configs/sim/gmoccapy/plasma_config/gmoccapy_plasma.ini index 575f07d0d46..a635a509922 100644 --- a/configs/sim/gmoccapy/plasma_config/gmoccapy_plasma.ini +++ b/configs/sim/gmoccapy/plasma_config/gmoccapy_plasma.ini @@ -198,9 +198,9 @@ MACRO = go_to_position X-pos Y-pos Z-pos # Sections for display options ------------------------------------------------ [PLASMA] -# Note that setting Ignition timeout to high can cause issues with very short cuts, problems can arrise when the timeout has not expired and starting to cut a new part +# Note that setting Ignition timeout to high can cause issues with very short cuts, problems can arise when the timeout has not expired and starting to cut a new part -#- Ignition fault timeout, the time allwed from TorchOn until ArcOK before re-probing and re-initiating, in seconds +#- Ignition fault timeout, the time allowed from TorchOn until ArcOK before re-probing and re-initiating, in seconds IGNITION_TIMEOUT = 3 #- ArcOK timeout, a filter, for a signal to be valid it needs to exceed the specified time period, in seconds diff --git a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py b/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py index 9a1702a2399..1c039fe8544 100644 --- a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py +++ b/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py @@ -1143,7 +1143,7 @@ def chk_use_virtual_changed(self, state): if not state: self.w.stackedWidget_dro.setCurrentIndex(0) - # show ngcgui info tab (in the stackedWidget) if ngcgui utilites + # show ngcgui info tab (in the stackedWidget) if ngcgui utilities # tab is selected def tab_utilities_changed(self, num): if num == 2: diff --git a/configs/tomp/nuPyvcpBars/pyvcp_widgets18nov2023.py b/configs/tomp/nuPyvcpBars/pyvcp_widgets18nov2023.py index 9957216b229..ea9b9cfd964 100644 --- a/configs/tomp/nuPyvcpBars/pyvcp_widgets18nov2023.py +++ b/configs/tomp/nuPyvcpBars/pyvcp_widgets18nov2023.py @@ -2072,7 +2072,7 @@ def update(self,pycomp): # ################################################################## # #11nov there is no xor in python - # BUT if both itens evaluate to booleans ( a !- b) is ~ xot + # BUT if both items evaluate to booleans ( a !- b) is ~ xot # one item must be true and the other false # soL use (caseA) != (vaseB) to get 'xor' equiv # diff --git a/docs/src/code/building-linuxcnc.adoc b/docs/src/code/building-linuxcnc.adoc index c47c7dd2b12..eff0ab9d4f7 100644 --- a/docs/src/code/building-linuxcnc.adoc +++ b/docs/src/code/building-linuxcnc.adoc @@ -227,7 +227,7 @@ can be skipped. LinuxCNC is then installed as part of those packages on the same machines or on whatever machine of the same architecture that the .deb files are copied to. LinuxCNC cannot be run until the Debian packages are installed on a target machine and then the executables are available -in /usr/bin and /usr/lib just like other regular software of the sytem. +in /usr/bin and /usr/lib just like other regular software of the system. This build mode is primarily useful when packaging the software for delivery to end users, and when building the software for a machine @@ -426,7 +426,7 @@ would combine all the options introduced in this section. A Debian package can be recognised by its .deb extension. The tool installing it, `dpkg` is part of every Debian installation. -The .deb files created by `dpkg-buildpackage` are found in the directoy above the linuxcnc-source-dir, i.e. in `..`. +The .deb files created by `dpkg-buildpackage` are found in the directory above the linuxcnc-source-dir, i.e. in `..`. To see what files are provided in a package, run ---- diff --git a/docs/src/drivers/hal_pi_gpio.adoc b/docs/src/drivers/hal_pi_gpio.adoc index aa1e53a4cf7..cc7c9635450 100644 --- a/docs/src/drivers/hal_pi_gpio.adoc +++ b/docs/src/drivers/hal_pi_gpio.adoc @@ -7,7 +7,7 @@ It is only really intended to work on the Raspberry Pi. It may, or may not, work == Purpose -This driver allows the use of the Rapberry Pi GPIO pins in a way analagous to the parallel port driver on x86 PCs. +This driver allows the use of the Rapberry Pi GPIO pins in a way analogous to the parallel port driver on x86 PCs. It can use the same step generators, encoder counters and similar components. == Usage diff --git a/docs/src/getting-started/hardware-interface.adoc b/docs/src/getting-started/hardware-interface.adoc index dd0e52784e9..1dd19eb0cfa 100644 --- a/docs/src/getting-started/hardware-interface.adoc +++ b/docs/src/getting-started/hardware-interface.adoc @@ -24,7 +24,7 @@ Interfaces include: A mix of different interfaces can be used. For example, a combination of ethercat for servo drives, and parallel port for additional General Purpose Inputs / Outputs (GPIO) -Some of these solutions are usable for all aspects of hardware interfacing, and some have specific roles (e.g. non-realtime GPIO, for an operator inferface). +Some of these solutions are usable for all aspects of hardware interfacing, and some have specific roles (e.g. non-realtime GPIO, for an operator interface). Hardware interface options change over time. This list is not a 100% complete list of all hardware interfaces that can be used with LinuxCNC. @@ -65,7 +65,7 @@ Multiple ethernet interface FPGA cards are available, with many expansion cards Website: http://mesanet.com/ Store: http://store.mesanet.com/ === Remora Ethernet -Realtime requirements are offloaded onto a controller board. Multiple differnet controller boards are supported - see Remora docs. +Realtime requirements are offloaded onto a controller board. Multiple different controller boards are supported - see Remora docs. Note that some of these controller boards (e.g. NVEM, EC300, EC500) are designed / sold for use with Mach3. Use with LinuxCNC requires flashing new firmware, which has been developed by the LinuxCNC community. The manufacturer does not support LinuxCNC. diff --git a/docs/src/gui/qtdragon.adoc b/docs/src/gui/qtdragon.adoc index 3764788ff02..3509c92b8d0 100644 --- a/docs/src/gui/qtdragon.adoc +++ b/docs/src/gui/qtdragon.adoc @@ -617,7 +617,7 @@ The button increments are 1 inch or 5 mm (depending on the units the machine is {NOTE} If using the Spindle lift option, HALUI can not be used to pause/resume the program. There is a pin, 'QtDragon.external-pause' available to pause/resume from an external source. -You must also enable external offets. In the setting tab check 'use external offsets' +You must also enable external offsets. In the setting tab check 'use external offsets' If you wish to inhibit the spindle when a probe tool is loaded, you will need to use an logical `or` component to combine the two spindle inhibit signals to connect to spindle.0.inhibit. diff --git a/docs/src/gui/qtvcp-libraries.adoc b/docs/src/gui/qtvcp-libraries.adoc index 8ace41e4501..aad55f23dd1 100644 --- a/docs/src/gui/qtvcp-libraries.adoc +++ b/docs/src/gui/qtvcp-libraries.adoc @@ -467,7 +467,7 @@ def buttonChanged(self, pinObject, value): def buttonDriven(self, pinObject, state): message = 'not driven by an output pin' if state: - message = 'is driven by an ouput pin' + message = 'is driven by an output pin' print('Pin name:{} is {}'.format(pinObject.text(), message)) ---- diff --git a/docs/src/plasma/qtplasmac.adoc b/docs/src/plasma/qtplasmac.adoc index 6620b35af53..9e18efe19b3 100644 --- a/docs/src/plasma/qtplasmac.adoc +++ b/docs/src/plasma/qtplasmac.adoc @@ -2464,7 +2464,7 @@ Click this button to start the program from the beginning of the selected line. ==== THIS CUTPATH -*THIS CUTPATH* will run only the cutpath that the seleceted segment is a part of. +*THIS CUTPATH* will run only the cutpath that the selected segment is a part of. The blinking "SELECTED _nn_" button will change to *RUN FROM LINE CYCLE START* button. Click this button to run the selected cutpath. diff --git a/lib/python/plasmac/gusset.py b/lib/python/plasmac/gusset.py index 4f91ac5e9ad..03e7abd445b 100644 --- a/lib/python/plasmac/gusset.py +++ b/lib/python/plasmac/gusset.py @@ -112,7 +112,7 @@ def preview(Conv, fTmp, fNgc, fNgcBkp, y1 = y0 + width * math.sin(right) # get offset start point x0n, y0n, = get_offset_coordinates([x1, y1], [x0, y0], angle, kerfWidth, isExternal) - # get new start poin + # get new start point x0 = x0n + (x0 - x0n) * 2 y0 = y0n + (y0 - y0n) * 2 # get new points diff --git a/lib/python/pyvcp_widgets.py b/lib/python/pyvcp_widgets.py index c8985cabef9..530451cad60 100644 --- a/lib/python/pyvcp_widgets.py +++ b/lib/python/pyvcp_widgets.py @@ -1,4 +1,4 @@ -#22nov allowed range color chganges to border when dwgf or imgf are used +#22nov allowed range color changes to border when dwgf or imgf are used # # this file ius found in /home/tomp/linuxnc-barwidgets/configs/tomp/nuPyvcpBars # fname is pyvcp_widgets18nov2023.py @@ -1315,7 +1315,7 @@ def __init__(self,master,pycomp,fillcolor="green", bgcolor="grey", min_=0, max_= self.min_ = min_ self.max_ = max_ # - # allow ommision of origin tag, defaulting to min_ + # allow omission of origin tag, defaulting to min_ if origin == None: self.origin = self.min_ else: @@ -1532,7 +1532,7 @@ def __init__(self,master,pycomp,fillcolor="green", bgcolor="grey", min_=0, max_= ) # # ########################################### - # only layout 0 allows dwgf OR imgf thumbs ( not mandetory) + # only layout 0 allows dwgf OR imgf thumbs (not mandatory) # ########################################### # # if no text wanted (layout==0) and (no imf and no dwgf), t0hen show rect thumb @@ -1608,10 +1608,10 @@ def __init__(self,master,pycomp,fillcolor="green", bgcolor="grey", min_=0, max_= # else layouit != ''0' and # and (neither imgf nor dwgf are wanted) # ############################################# - # the tag 'orient' can be 'Vert' or 'Horz' or None ( deaults to Horz) + # the tag 'orient' can be 'Vert' or 'Horz' or None (defaults to Horz) # re bars: lielty arcs can be done, but I stop dev for now 25oct2023 # - #15 make all pins allways ( any orient any layout) + #15 make all pins always (any orient any layout) if(self.layout == "0" )and((imgf==None)and(dwgf==None)): pycomp.newpin(halpin+".minpin", HAL_FLOAT, HAL_OUT) pycomp.newpin(halpin+".maxpin", HAL_FLOAT, HAL_OUT) @@ -1796,7 +1796,7 @@ def __init__(self,master,pycomp,fillcolor="green", bgcolor="grey", min_=0, max_= # # ############################################ # 12nov - # ??? what @ layou == 0? for Vert ANND for Hoerz??? + # ??? what @ layou == 0? for Vert AND for Hoerz??? # ############################################ # # ############################################ @@ -1824,7 +1824,7 @@ def __init__(self,master,pycomp,fillcolor="green", bgcolor="grey", min_=0, max_= # # end of if orient == 'Vert': # - # NB for vert X0 Y0 X1 alreay set + # NB for vert X0 Y0 X1 already set # horz X0 Y0 Y1 already set # this leaves ony 1 ord to calculate # the remaining ordinate is done ion func 'update' @@ -1867,7 +1867,7 @@ def update(self,pycomp): valtext = str(self.nformat % self.value) self.itemconfig(self.val_text,text=valtext) # update the bar color if rangeColors wanted - # ranges rulkes not allowe if ldwgf != NNone AND imgf != None + # ranges rulkes not allowed if ldwgf != NNone AND imgf != None if self.ranges: self.set_fill(self.range1, self.range2, self.range3) # @@ -1940,7 +1940,7 @@ def update(self,pycomp): # if(self.origin == self.min_): #09nov constrain thumbX1 to limits min_ max_ - # while accomodating for + # while accommodating for # padding between left of canvas to left of bar if((self.value + littlebit)>=self.max_): self.thumbX1 = 0 @@ -1984,7 +1984,7 @@ def update(self,pycomp): # ################################################################## # #11nov there is no xor in python - # BUT if both itens evaluate to booleans ( a !- b) is ~ xot + # BUT if both items evaluate to booleans ( a !- b) is ~ xot # one item must be true and the other false # soL use (caseA) != (vaseB) to get 'xor' equiv # diff --git a/lib/python/qtvcp/core.py b/lib/python/qtvcp/core.py index 18e15aee10e..1c95af9f6fe 100644 --- a/lib/python/qtvcp/core.py +++ b/lib/python/qtvcp/core.py @@ -75,7 +75,7 @@ def text(self): return self.get_name() # always returns False because - # there was no errpr when making pin + # there was no error when making pin # see class DUMMY def error(self): return False @@ -123,7 +123,7 @@ def __init__(self, *a, **kw): self._kw = kw # always returns True because - # there was an errpr when making HAL pin + # there was an error when making HAL pin # see class QPin def error(self): return True diff --git a/lib/python/qtvcp/lib/message.py b/lib/python/qtvcp/lib/message.py index ded15e71924..816b5205fe7 100644 --- a/lib/python/qtvcp/lib/message.py +++ b/lib/python/qtvcp/lib/message.py @@ -40,7 +40,7 @@ def message_setup(self, hal_comp, window=None, notify=None): self.HAL_GCOMP_ = hal_comp self.NOTIFY = notify - # if no notify suplied, make our owm + # if no notify supplied, make our owm if not notify is None: self.notify_normal = self.NOTIFY.new_normal() diff --git a/lib/python/qtvcp/lib/ripper/gcode_ripper.py b/lib/python/qtvcp/lib/ripper/gcode_ripper.py index 50041cd10b0..0a2de2e10ab 100755 --- a/lib/python/qtvcp/lib/ripper/gcode_ripper.py +++ b/lib/python/qtvcp/lib/ripper/gcode_ripper.py @@ -6030,7 +6030,7 @@ def EXPRESSION_EVAL(self,line): line = line.replace(" ","") ################################################# - ### G-CODE OPPERATORS ### + ### G-CODE OPERATORS ### ### In Precedence Order ### ################################################# ## ** # diff --git a/lib/python/qtvcp/qt_action.py b/lib/python/qtvcp/qt_action.py index 6a74ea80e7f..781a443f50d 100644 --- a/lib/python/qtvcp/qt_action.py +++ b/lib/python/qtvcp/qt_action.py @@ -38,7 +38,7 @@ def __init__(self): self.home_all_warning_flag = False self.proc = None - # imported here to advoid cicular imports + # imported here to advoid circular imports from qtvcp.lib.mdi_subprogram.mdi_command_process import MDICommand self.MDIPROCESS = MDICommand() diff --git a/lib/python/qtvcp/qt_makepins.py b/lib/python/qtvcp/qt_makepins.py index 5e04f9aeabf..a5f86f8a3e3 100644 --- a/lib/python/qtvcp/qt_makepins.py +++ b/lib/python/qtvcp/qt_makepins.py @@ -210,7 +210,7 @@ def go(x, y, w, h): temp = self._geo_string.split(' ') go(int(temp[0]), int(temp[1]), int(temp[2]), int(temp[3])) except Exception as e: - LOG.exception('main window gometry python error: {}'.format(e)) + LOG.exception('main window geometry python error: {}'.format(e)) LOG.error('Calculating geometry of main window using natural placement.') x = self.window.geometry().x() y = self.window.geometry().y() diff --git a/lib/python/qtvcp/qt_pstat.py b/lib/python/qtvcp/qt_pstat.py index 3604900fcac..0647d8fb855 100644 --- a/lib/python/qtvcp/qt_pstat.py +++ b/lib/python/qtvcp/qt_pstat.py @@ -477,7 +477,7 @@ def modnamefromFilename(self, fname): module = "{}.{}".format(base,panel) return module - # tempararily adds the screen directory to path + # temporarily adds the screen directory to path # so the handler can be imported to be used for subclassing def importDefaultHandler(self, module=None): import importlib diff --git a/lib/python/qtvcp/widgets/origin_offsetview.py b/lib/python/qtvcp/widgets/origin_offsetview.py index 6e60bc08b70..e820f3c692d 100644 --- a/lib/python/qtvcp/widgets/origin_offsetview.py +++ b/lib/python/qtvcp/widgets/origin_offsetview.py @@ -173,7 +173,7 @@ def showSelection(self, item): self.setWindowTitle(sf) # row 0 is not editable (absolute position) # row has limited entries (rotational) - # column 9 is the descritive text column + # column 9 is the descriptive text column if item.column() == 9: self.callTextDialog(text,item) elif item.row() == 1: diff --git a/lib/python/qtvcp/widgets/screen_options.py b/lib/python/qtvcp/widgets/screen_options.py index b20c976f78e..0da1ef7d03c 100644 --- a/lib/python/qtvcp/widgets/screen_options.py +++ b/lib/python/qtvcp/widgets/screen_options.py @@ -322,7 +322,7 @@ def _pref_init(self): # check that there is a directory present dir = os.path.split(str(self.pref_filename)) - # expand the directoty path if there is one + # expand the directory path if there is one if not dir[0] == '': dir = os.path.expanduser(dir[0]) if not os.path.exists(dir): diff --git a/lib/python/qtvcp/widgets/stylesheeteditor.py b/lib/python/qtvcp/widgets/stylesheeteditor.py index 28a4a88894e..f1011c2f7c8 100644 --- a/lib/python/qtvcp/widgets/stylesheeteditor.py +++ b/lib/python/qtvcp/widgets/stylesheeteditor.py @@ -102,7 +102,7 @@ def setPath(self): self.loadedItem.setData("Use the preference loaded Stylesheet", role = QtCore.Qt.ToolTipRole) model.appendRow(self.loadedItem) - # add 'None' to cancel all sylesheet changes + # add 'None' to cancel all stylesheet changes item = QtGui.QStandardItem('None') item.setData( 'None', role = QtCore.Qt.UserRole + 1) item.setData("Use system default Stylesheet", role = QtCore.Qt.ToolTipRole) diff --git a/lib/python/qtvcp/widgets/tool_offsetview.py b/lib/python/qtvcp/widgets/tool_offsetview.py index e40deb5b49e..e7ce456642b 100644 --- a/lib/python/qtvcp/widgets/tool_offsetview.py +++ b/lib/python/qtvcp/widgets/tool_offsetview.py @@ -164,7 +164,7 @@ def showSelection(self, item): # display in title bar for convenience self.setWindowTitle(sf) # row 0 is not editable (checkbox position) - # column 19 is the descritive text column + # column 19 is the descriptive text column if item.column() == 19: self.callTextDialog(text,item) elif item.column() <19 and item.column() > 0: diff --git a/lib/python/raster.py b/lib/python/raster.py index 4888a104674..ed8c286644d 100644 --- a/lib/python/raster.py +++ b/lib/python/raster.py @@ -31,7 +31,7 @@ class RasterProgrammer(object): The raster component operates one line at a time. Example: - Assuming rastering is done accross the X axis. + Assuming rastering is done across the X axis. A simple raster program would be from X=0.0 Power=0.0 to X=1.0 Power=100.0 As the x axis passes from x0.0 to x1.0 the power will rise from 0 to 100 linearly. @@ -82,7 +82,7 @@ def __waitEnabled(self, enabled): def begin(self, offset, bpp, ppu, count): """ - Sends the program begin command along with relavent parameters. + Sends the program begin command along with relevant parameters. offset - The relative starting position that the incoming data starts. Data is always programmed from most negative on the axis to most positive. bpp - Bits per pixel in increments of 4 bits, up to 32 bits diff --git a/nc_files/nurbs/G6/read.me b/nc_files/nurbs/G6/read.me index 3d23c9da008..72f072094d8 100644 --- a/nc_files/nurbs/G6/read.me +++ b/nc_files/nurbs/G6/read.me @@ -2,7 +2,7 @@ The files are from La Valvo and Drago: An Efficient NURBS Path Generator for a Open Source CNC -A litle bit modified by Joachim Franek for inclusion to LinuxCNC 2023-01-20 +A little bit modified by Joachim Franek for inclusion to LinuxCNC 2023-01-20 Curva_Chitarra #1=1.ngc Curva_Chitarra #1=2.ngc diff --git a/src/hal/classicladder/README.txt b/src/hal/classicladder/README.txt index 6a37b970e12..89c04186377 100644 --- a/src/hal/classicladder/README.txt +++ b/src/hal/classicladder/README.txt @@ -71,7 +71,7 @@ You can: When editing, use the pointer of the toolbar if you want only to modify properties, else select the element you want to place in the rung. -Many rungs can be displayed at the same time, and you can use a vertical scollbar. +Many rungs can be displayed at the same time, and you can use a vertical scrollbar. The current rung is the rung with the blue bars on each side. When window resized, it is automatically selected by choosing the toppest rung which is completely visible. You can manually select one between the others below (if you can see them with a large vertical window). diff --git a/src/hal/classicladder/drawing_sequential.c b/src/hal/classicladder/drawing_sequential.c index 39396ee67af..e341a182446 100644 --- a/src/hal/classicladder/drawing_sequential.c +++ b/src/hal/classicladder/drawing_sequential.c @@ -146,7 +146,7 @@ void DrawSeqTransition( cairo_t * cr,int x,int y,int Size,StrTransition * pTrans } } - // multiple steps desactivation ? + // multiple steps deactivation ? for ( ScanSwitch=1; ScanSwitch=0) { diff --git a/tcl/ngcgui.tcl b/tcl/ngcgui.tcl index 4bed6776c04..a287015d188 100755 --- a/tcl/ngcgui.tcl +++ b/tcl/ngcgui.tcl @@ -3219,7 +3219,7 @@ proc ::ngcgui::wgui {dir} { # this proc is useful for testing with tkcon: # to debug using tkcon: source this file then % ::ngcgui::wgui dirname # to run ngcgui in a frame, use ::ngcgui::gui hdl create frame - # multiple intantiations of ngcgui within the same process are not supported + # multiple instantiations of ngcgui within the same process are not supported package require Tk set hdl 0 catch {unset ::ngc} diff --git a/tests/interp/g71-endless-loop2/test.sh b/tests/interp/g71-endless-loop2/test.sh index b5522f1e0c8..c936ada7589 100755 --- a/tests/interp/g71-endless-loop2/test.sh +++ b/tests/interp/g71-endless-loop2/test.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Demonstrate endless loop when an additinal segment is added in the G71 call. +# Demonstrate endless loop when an additional segment is added in the G71 call. # This is a subset of a file that was supplied in # https://github.com/LinuxCNC/linuxcnc/issues/2844 and which worked up to and # including 2.9.1~pre1. It entered an endless loop after diff --git a/tests/linuxcncrsh-tcp/tcp.nml b/tests/linuxcncrsh-tcp/tcp.nml index b99fe4019ae..4fc193ee806 100644 --- a/tests/linuxcncrsh-tcp/tcp.nml +++ b/tests/linuxcncrsh-tcp/tcp.nml @@ -15,7 +15,7 @@ B emcError SHMEM localhost 8192 0 0 3 # These are for the IO controller, EMCIO B toolCmd SHMEM localhost 1024 0 0 4 16 1004 TCP=5005 xdr -# toolSts size made big enough to accomodate --enable-toolnml option (see linuxcnc_big.nml) +# toolSts size made big enough to accommodate --enable-toolnml option (see linuxcnc_big.nml) B toolSts SHMEM localhost 155648 0 0 5 16 1005 TCP=5005 xdr # Processes diff --git a/tests/raster/test b/tests/raster/test index 7617c2a3c5d..a56bb8db009 100755 --- a/tests/raster/test +++ b/tests/raster/test @@ -19,14 +19,14 @@ def assertIdle(pin): def waitEnabled(pin): stop = time.process_time() + timeout while not pin['enabled'].value: - assert pin['fault'].value == 0, "Fault occured. Code {0}".format(fault_code.value) - assert time.process_time() < stop, "Timeout while wainting" + assert pin['fault'].value == 0, "Fault occurred. Code {0}".format(fault_code.value) + assert time.process_time() < stop, "Timeout while waiting" def waitDisabled(): stop = time.process_time() + timeout while enabled.value: - assert fault.value == 0, "Fault occured. Code {0}".format(fault_code.value) + assert fault.value == 0, "Fault occurred. Code {0}".format(fault_code.value) assert time.process_time() < stop, "Timeout while waiting" def waitFault(pin): @@ -37,7 +37,7 @@ def waitFault(pin): def waitIdle(): stop = time.process_time() + timeout while pin['state'].value != 0: - assert fault.value == 0, "Fault occured. Code {0}".format(fault_code.value) + assert fault.value == 0, "Fault occurred. Code {0}".format(fault_code.value) assert time.process_time() < stop, "Timeout while waiting" def resetRaster(prog, pin): diff --git a/unit_tests/catch.hpp b/unit_tests/catch.hpp index 3205ffbaadf..1869193de1c 100644 --- a/unit_tests/catch.hpp +++ b/unit_tests/catch.hpp @@ -10306,7 +10306,7 @@ namespace Catch { } void close() override { TrackerBase::close(); - // Generator interface only finds out if it has another item on atual move + // Generator interface only finds out if it has another item on actual move if (m_runState == CompletedSuccessfully && m_generator->next()) { m_children.clear(); m_runState = Executing;