diff --git a/TODO b/TODO index 8151bcffd8a..892f0837a0d 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,7 @@ TODO for the joints_axes branch * clean up joints/axes throughout the whole code (lots of parts already done) * define a unified jogging way (both for joints and axes) -* implement joint-limits for carthesian moves (requires simulating the speed in userspace) +* implement joint-limits for cartesian moves (requires simulating the speed in userspace) * update configs (and many other probably..) diff --git a/docs/README.adoc b/docs/README.adoc index 83780e5176d..abd5ed01edb 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -174,7 +174,7 @@ make -C src translateddocs ``` Once this is completed, the files in docs/po/ will be updated, and -should be commited into git and pulled into Weblate. +should be committed into git and pulled into Weblate. === How to add a new translation language diff --git a/docs/man/man1/mdro.1 b/docs/man/man1/mdro.1 index 77cd49ea6f9..0a91567d10c 100644 --- a/docs/man/man1/mdro.1 +++ b/docs/man/man1/mdro.1 @@ -114,7 +114,7 @@ when \fBmdro\fR starts: mdro.index-enable.3 In this example, the first row will be labeled "X" and will show the data associated -with pin mdro.axis.0. In many configurations, mdro.axis.0 can be conneted +with pin mdro.axis.0. In many configurations, mdro.axis.0 can be connected directly to x-pos-fb in the POSTGUI-HAL file. The index pins should be connected to the corresponding index-enable pins from the DRO. diff --git a/docs/man/man1/xhc-hb04.1 b/docs/man/man1/xhc-hb04.1 index 427f45d0597..2fbce88d069 100644 --- a/docs/man/man1/xhc-hb04.1 +++ b/docs/man/man1/xhc-hb04.1 @@ -118,7 +118,7 @@ in the xhc\-hb04 (loadusr) command. .SH Input Pins (to the pendant LCD display) .TP -(float in) \fIxhc\-hb04.[xyza].pos\-absolute\fR Absolule position display. +(float in) \fIxhc\-hb04.[xyza].pos\-absolute\fR Absolute position display. (typically connect to: halui.axis.N.pos\-feedback). The LCD display for pos\-absolute is fixed format with a sign, 4 number digits and 3 fraction digits (+XXXX.XXX), require: \-9999.999 <= value <= 9999.999. diff --git a/docs/man/man9/hostmot2.9 b/docs/man/man9/hostmot2.9 index 6b863670f7e..e9cec73b9fd 100644 --- a/docs/man/man9/hostmot2.9 +++ b/docs/man/man9/hostmot2.9 @@ -630,7 +630,7 @@ e: (Encoder): (float, r/w) hm2_XXXX.N.ssi.MM..scale: (float, r.w) The encoder scale in counts per machine unit. (u32, r/w) hm2_XXXX.N.ssi.MM..counts\-per\-rev (u32, r/w) Used to emulate -the index behaviour of an incemental+index encoder. This would normally be set +the index behaviour of an incremental+index encoder. This would normally be set to the actual counts per rev of the encoder, but can be any whole number of revs. Integer divisors or multipliers of the true PPR might be useful for index-homing. Non-integer factors might be appropriate where there is a diff --git a/docs/man/man9/stepgen.9 b/docs/man/man9/stepgen.9 index 35e2a50bffc..713c4422bd4 100644 --- a/docs/man/man9/stepgen.9 +++ b/docs/man/man9/stepgen.9 @@ -152,7 +152,7 @@ The minimum time between a forward step and a reverse step, in nanoseconds. There are five timing parameters which control the output waveform. No step type uses all five, and only those which will be used are exported to HAL. The values of these parameters are in nano-seconds, so no recalculation is needed when -changing thread periods. In the timing diagrams that follow, they are identfied +changing thread periods. In the timing diagrams that follow, they are identified by the following numbers: .P (1) \fBstepgen.n.steplen\fR diff --git a/docs/src/config/ini-config.adoc b/docs/src/config/ini-config.adoc index a292c4b8916..f60a35a03dc 100644 --- a/docs/src/config/ini-config.adoc +++ b/docs/src/config/ini-config.adoc @@ -309,7 +309,7 @@ User Manual. [NOTE] The following [DISPLAY] items are used by GladeVCP, see the -<> section of the GladeVCP Chapter. +<> section of the GladeVCP Chapter. * 'EMBED_TAB_NAME=GladeVCP demo' * 'EMBED_TAB_COMMAND=halcmd loadusr -Wn gladevcp gladevcp -c gladevcp -x {XID} -u ./gladevcp/hitcounter.py ./gladevcp/manual-example.ui' diff --git a/docs/src/config/stepconf.adoc b/docs/src/config/stepconf.adoc index 473d7236e4c..9db8aecbdbd 100644 --- a/docs/src/config/stepconf.adoc +++ b/docs/src/config/stepconf.adoc @@ -259,7 +259,7 @@ Using the buttons provided, jog the axis to near the center of travel. Take care because with a low acceleration value, it can take a surprising distance for the axis to decelerate to a stop. -After gaging the amount of travel available, +After gauging the amount of travel available, enter a safe distance in Test Area, keeping in mind that after a stall the motor may next start to move in an unexpected direction. Then click Run. diff --git a/docs/src/drivers/hostmot2.adoc b/docs/src/drivers/hostmot2.adoc index e875e613d2e..47e1bf6af98 100644 --- a/docs/src/drivers/hostmot2.adoc +++ b/docs/src/drivers/hostmot2.adoc @@ -730,7 +730,7 @@ following pins and parameters: * 'scale' - (Float, RW) Converts from 'count' units to 'position' units. A quadrature encoder will normally have 4 counts per pulse so a 100 PPR encoder would be 400 counts per revolution. In '.counter-mode' a 100 - PPR encoder would have 100 counts per revelution as it only uses the + PPR encoder would have 100 counts per revolution as it only uses the rising edge of A and direction is B. * 'vel-timeout' - (Float, RW) When the encoder is moving slower than one diff --git a/docs/src/drivers/mb2hal.adoc b/docs/src/drivers/mb2hal.adoc index 6c371a898a5..b4f6a8df4e5 100644 --- a/docs/src/drivers/mb2hal.adoc +++ b/docs/src/drivers/mb2hal.adoc @@ -147,7 +147,7 @@ could become `mb2hal.plcin.01`. The name must not exceed 28 characters. *NOTE:* when using names be careful that you don't end up with two transactions using the same name. |`MAX_UPDATE_RATE`| Float | No | Maximum update rate in Hz. Defaults to -0.0 (0.0 = as soon as available = infinit). +0.0 (0.0 = as soon as available = infinite). *NOTE:* This is a maximum rate and the actual rate may be lower. If you want to calculate it in ms use (1000 / required_ms). Example: 100 ms = `MAX_UPDATE_RATE=10.0`, diff --git a/docs/src/drivers/mitsub-vfd.adoc b/docs/src/drivers/mitsub-vfd.adoc index 307b72bbebe..60597eb19f5 100644 --- a/docs/src/drivers/mitsub-vfd.adoc +++ b/docs/src/drivers/mitsub-vfd.adoc @@ -14,7 +14,7 @@ This is a userspace HAL program, written in python, to control VFD's from Mitsubishi. + -Specifcally the A500 F500 E500 A500 D700 E700 F700 series - others may work. + +Specifically the A500 F500 E500 A500 D700 E700 F700 series - others may work. + mitsub_vfd supports serial control using the RS485 protocol. + Conversion from USB or serial port to RS485 requires special hardware. + [NOTE] diff --git a/docs/src/getting-started/getting-linuxcnc.adoc b/docs/src/getting-started/getting-linuxcnc.adoc index 7545e008ae3..69f608aa917 100644 --- a/docs/src/getting-started/getting-linuxcnc.adoc +++ b/docs/src/getting-started/getting-linuxcnc.adoc @@ -126,7 +126,7 @@ https://help.ubuntu.com/community/HowToMD5SUM[How To MD5SUM] == Write the image to a bootable device -The Raspbery Pi image is a completes SD card image and should be +The Raspberry Pi image is a completes SD card image and should be written to an SD card in https://www.raspberrypi.org/documentation/installation/installing-images/README.md[the normal way]. diff --git a/docs/src/gui/gladevcp.adoc b/docs/src/gui/gladevcp.adoc index 5123f1bd65e..3b33598c8eb 100644 --- a/docs/src/gui/gladevcp.adoc +++ b/docs/src/gui/gladevcp.adoc @@ -354,8 +354,8 @@ might not be needed in your setup. The relative path specifier ../../nc_files/gl is constructed to work with directories copied by the configuration picker and when using a run-in-place setup. -[[gladevcp:embeding-tab]] -=== Embeding as a Tab +[[gladevcp:embedding-tab]] +=== Embedding as a Tab To do so, edit your .ini file and add to the DISPLAY and HAL sections of ini file as follows: @@ -1383,7 +1383,7 @@ grid size:: Defaults to 0 use default mouse controls:: This disables the default mouse controls. + - This is most useful when using a touchscreen as the default controls do not work well. You can programatically + This is most useful when using a touchscreen as the default controls do not work well. You can programmatically add controls using python and the handler file technique. + Default = true. view:: diff --git a/docs/src/gui/gmoccapy.adoc b/docs/src/gui/gmoccapy.adoc index 45dcc23c022..e46fb8c273c 100644 --- a/docs/src/gui/gmoccapy.adoc +++ b/docs/src/gui/gmoccapy.adoc @@ -144,7 +144,7 @@ PREFERENCE_FILE_PATH = gmoccapy_preferences gmoccapy 3 does support the following command line options: - * -user_mode : If set, the setup button will be disabled, so normal machine opperators are not able to edit the settings of the machine * + * -user_mode : If set, the setup button will be disabled, so normal machine operators are not able to edit the settings of the machine * * -logo : If given, the logo will hide the jog button tab in manual mode, this is only useful for machines with hardware button for jogging and increment selection + The line PREFERENCE_FILE_PATH gives the location and name of the preferences file to be used. @@ -1578,7 +1578,7 @@ Details about how exactly an IconTheme is built can be found at https://specific Start by creating an empty directory with the name of the icon theme. Place the directory in one of gmoccapy's IconTheme directories. Then we need a file called index.theme in the root folder of our icon theme which contains the required metadata for the theme. -Thats a simple text file with at least the following sections: +That's a simple text file with at least the following sections: [Icon Theme] Name=YOUR_THEME_NAME @@ -1589,7 +1589,7 @@ Thats a simple text file with at least the following sections: * Name: The name of your icon theme * Comment: A description of your icon theme * Inherits: A icon theme can derive from another icon theme, the default is hicolor -* Directories: A comma separted list of all the directories of your icon theme +* Directories: A comma separated list of all the directories of your icon theme Each directory usually contains all the icons of the theme in a specific size, for example 16x16/actions should contain all icons with the category "actions" in the size 16x16 pixels as pixel-graphics (e.g. png files). A special case is the directory called "scalable/actions", this contains scalable icons not tied to a specific size (e.g. svg files). @@ -1610,7 +1610,7 @@ Fo each directory we also have to write a section in the index.theme file: Context=Actions ---- -* Size: Nominal icon size in this direcotry +* Size: Nominal icon size in this directory * Type: Fixed, Threshold or Scalable * Context: Intended "category" of icons diff --git a/docs/src/gui/gscreen.adoc b/docs/src/gui/gscreen.adoc index 44d35be762f..e753a21f9e3 100644 --- a/docs/src/gui/gscreen.adoc +++ b/docs/src/gui/gscreen.adoc @@ -137,7 +137,7 @@ Some will load the theme that is the same name in the config file. The sample Inside this folder is another folder call gtk-2.0, inside that is the theme files. If you add this file, Gscreen will default to this theme on start up. gscreen-gaxis has a sample custom theme that looks for certain named widgets -and changes the visual behaivor of those specific widgets. The Estop and +and changes the visual behavior of those specific widgets. The Estop and machine-on buttons use different colors then the rest of the buttons so that they stand out. This is done in the handler file by giving them specific names an by adding specific commands in the theme's gtkrc file. @@ -529,7 +529,7 @@ MESSAGE_TYPE = yesnodialog MESSAGE_PINNAME = yndialogtest # This pops up a dialog that requires an ok response and it shows in the status bar and -# the destop notify popup. +# the desktop notify popup. MESSAGE_BOLDTEXT = This is the short text MESSAGE_TEXT = This is the longer text of the both type test. It can be longer then the status bar text MESSAGE_DETAILS = BOTH DETAILS diff --git a/docs/src/gui/qtvcp-development.adoc b/docs/src/gui/qtvcp-development.adoc index bc6ed2c813f..22c735c6b89 100644 --- a/docs/src/gui/qtvcp-development.adoc +++ b/docs/src/gui/qtvcp-development.adoc @@ -138,7 +138,7 @@ self.SETTINGS_ = the Qsettings object ---- When making a custom widget, import and sub class the -'_HalWidgetBase' class for this behaivor: +'_HalWidgetBase' class for this behavior: === Dialogs diff --git a/docs/src/gui/qtvcp-libraries.adoc b/docs/src/gui/qtvcp-libraries.adoc index 0808e0ac44b..ed56d0b1189 100644 --- a/docs/src/gui/qtvcp-libraries.adoc +++ b/docs/src/gui/qtvcp-libraries.adoc @@ -661,7 +661,7 @@ MESSAGE_TYPE = yesnodialog MESSAGE_PINNAME = yndialogtest # This pops up a dialog that requires an ok response and it shows in the status bar and -# the destop notify popup. +# the desktop notify popup. MESSAGE_BOLDTEXT = This is the short text MESSAGE_TEXT = This is the longer text of the both type test. It can be longer then the status bar text MESSAGE_DETAILS = BOTH DETAILS @@ -694,7 +694,7 @@ This module allows one to load and save preference data permanently to storage m The screenoptions widget can automatically set up the preference system. + qtvcp searches for the screenoption widget first and if found calls `\_pref_init()`. + This will create the preference object and return it to qtvcp to pass to all the widgets and + -add it to the window object attributes. In this case the preferences object would be accesable + +add it to the window object attributes. In this case the preferences object would be accessible + from the handler file's initialized_ method as self.w.PREFS_ + Also all widgets can have access to a specific preference file at initialization time. + diff --git a/docs/src/gui/qtvcp-widgets.adoc b/docs/src/gui/qtvcp-widgets.adoc index 0a5e63fe2e8..c91f675e6bf 100644 --- a/docs/src/gui/qtvcp-widgets.adoc +++ b/docs/src/gui/qtvcp-widgets.adoc @@ -2193,7 +2193,7 @@ to add actions. * add_tool() - adds a blank dummy tool (99) that the user can edit to suit. * delete_tools() - deletes the currently checkbox selected tools -* get_checked_list() - returns a list of tools selected by checkboxs. +* get_checked_list() - returns a list of tools selected by checkboxes. * set_all_unchecked() - uncheck all selected tools. [source,python] diff --git a/docs/src/hal/halmodule.adoc b/docs/src/hal/halmodule.adoc index 55310c37a07..71cbf4b4ca9 100644 --- a/docs/src/hal/halmodule.adoc +++ b/docs/src/hal/halmodule.adoc @@ -213,7 +213,7 @@ hal.connect("pinname","signal_name") === disconnect -Disonnect a pin from a signal. + +Disconnect a pin from a signal. + .Example ---- diff --git a/docs/src/hal/rtcomps.adoc b/docs/src/hal/rtcomps.adoc index 5882d6824b1..7571a7ff2d1 100644 --- a/docs/src/hal/rtcomps.adoc +++ b/docs/src/hal/rtcomps.adoc @@ -355,7 +355,7 @@ rates of 10 kHz to perhaps up to 50 kHz. The base thread should be 1/2 count speed to allow for noise and timing variation. For example if you have a 100 pulse per revolution encoder on the -spindle and your maximnum RPM is 3000 the maximum base thread should be 25 µs. +spindle and your maximum RPM is 3000 the maximum base thread should be 25 µs. A 100 pulse per revolution encoder will have 400 counts. The spindle speed of 3000 RPM = 50 RPS (revolutions per second). 400 * 50 = 20,000 counts per second or 50 µs between counts. diff --git a/docs/src/man/man1/hy_gt_vfd.1.adoc b/docs/src/man/man1/hy_gt_vfd.1.adoc index 52a097e3638..39e152467ae 100644 --- a/docs/src/man/man1/hy_gt_vfd.1.adoc +++ b/docs/src/man/man1/hy_gt_vfd.1.adoc @@ -50,7 +50,7 @@ P0.03:: P0.04:: - Set Upper Frequence Limit to the maximum frequency you want the VFD + Set Upper Frequency Limit to the maximum frequency you want the VFD to output, in Hz. This should be the same as the value in P0.03. P0.05:: @@ -73,7 +73,7 @@ P2.02 = ???:: P2.03 = ???:: Set Motor Rated Speed to the motor's speed in RPM at its rated - maximum frequence. + maximum frequency. P2.04 = ???:: diff --git a/docs/src/plasma/qtplasmac.adoc b/docs/src/plasma/qtplasmac.adoc index 47ed77ad6cc..d6d4c8eb327 100644 --- a/docs/src/plasma/qtplasmac.adoc +++ b/docs/src/plasma/qtplasmac.adoc @@ -678,7 +678,7 @@ DISPLAY = qtvcp -f qtplasmac *[TRAJ]* Section -This variable is mandatory. +This variable is mandatory. [source,{ini}] ---- @@ -728,7 +728,7 @@ The following sections will give a general overview of the QtPlasmaC layout. === Exiting QtPlasmaC -Exiting or shuting down QtPlasmaC is done by either of: +Exiting or shutting down QtPlasmaC is done by either: . Click the window shutdown button on the window title bar . Long press the *POWER* button on the MAIN Tab. @@ -1649,11 +1649,11 @@ If an alignment laser has been set up then it is possible to use the laser durin Path tolerance is set with a G64 command and a following P value. The P value corresponds to the amount that the actual cut path followed by the machine may deviate from the programmed cut path. -The default LinuxCNC path tolerence is set for maximum speed which will severely round corners when used with normal plasma cutting speeds. +The default LinuxCNC path tolerance is set for maximum speed which will severely round corners when used with normal plasma cutting speeds. It is recommended that the path tolerance is set by placing the appropriate G64 command and P value in the header of each G-Code file. -The provided G-Code filter program will test for the existance of a G64 Pn command prior to the first motion command. If no G64 command is found it will insert a G64 P0.1 command which sets the path tolerance to 0.1mm. For a imperial config the command will be G64 P0.004. +The provided G-Code filter program will test for the existence of a G64 Pn command prior to the first motion command. If no G64 command is found it will insert a G64 P0.1 command which sets the path tolerance to 0.1mm. For a imperial config the command will be G64 P0.004. For Metric: [source,{ngc}] @@ -2001,7 +2001,7 @@ M2 (end job) QtPlasmaC has the ability to automatically modify the G-Code to reduce the velocity and/or apply *Over cut* which can be useful when cutting holes. -For valid hole sensing it is required that all values in the G2 or G3 G-Code line are explicit, an error dialog will be dispalyed if any values are mathematically calculated. +For valid hole sensing it is required that all values in the G2 or G3 G-Code line are explicit, an error dialog will be displayed if any values are mathematically calculated. QtPlasmaC Hole Sensing is disabled by default. It can be enabled/disabled by using the following G-Code parameters to select the desired hole sensing mode: diff --git a/nc_files/macros/lathe/facing.ngc b/nc_files/macros/lathe/facing.ngc index e894727a3c6..32acc9ffec0 100644 --- a/nc_files/macros/lathe/facing.ngc +++ b/nc_files/macros/lathe/facing.ngc @@ -10,7 +10,7 @@ ; #4 feed/rpm ; #5 Face Z length ; #6 face angle -; #7 tool numbber +; #7 tool number ;Facing diff --git a/nc_files/ngcgui_lib/iquad.ngc b/nc_files/ngcgui_lib/iquad.ngc index 8fea5594037..1baa496f62d 100644 --- a/nc_files/ngcgui_lib/iquad.ngc +++ b/nc_files/ngcgui_lib/iquad.ngc @@ -86,7 +86,7 @@ o call [#][#][#][#] # = #<_line:cos> # = #<_line:sin> - (compute angles at line interesctions:) + (compute angles at line intersections:) o call [#][#][#][#][#][#] # = #<_dot:ang> o call [#][#][#][#][#][#] diff --git a/nc_files/ngcgui_lib/qpocket.ngc b/nc_files/ngcgui_lib/qpocket.ngc index 54f43e6c320..01f9f1f66e3 100644 --- a/nc_files/ngcgui_lib/qpocket.ngc +++ b/nc_files/ngcgui_lib/qpocket.ngc @@ -253,7 +253,7 @@ o call [#][#][#][#] # = #<_line:cos> # = #<_line:sin> - ;compute angles at line interesctions: + ;compute angles at line intersections: o call [#][#][#][#][#][#] # = #<_dot:ang> o call [#][#][#][#][#][#] diff --git a/share/axis/tcl/combobox.tcl b/share/axis/tcl/combobox.tcl index 55309dfdf8e..aa30ce098e1 100644 --- a/share/axis/tcl/combobox.tcl +++ b/share/axis/tcl/combobox.tcl @@ -319,7 +319,7 @@ proc ::combobox::SetClassBindings {} { # # I'm not convinced these are the proper bindings. Ideally all # bindings should be on "Combobox", but because of my juggling of -# bindtags I'm not convinced thats what I want to do. But, it all +# bindtags I'm not convinced that's what I want to do. But, it all # seems to work, its just not as robust as it could be. # # Arguments: diff --git a/src/emc/kinematics/scorbot-kins.c b/src/emc/kinematics/scorbot-kins.c index 5eef70dd3db..ff67fdde2c7 100644 --- a/src/emc/kinematics/scorbot-kins.c +++ b/src/emc/kinematics/scorbot-kins.c @@ -96,7 +96,7 @@ int kinematicsForward( j2_vector.tran.z = L1_LENGTH * sin(TO_RAD * joints[1]); // rtapi_print("fwd: j2=(%f, %f, %f)\n", j2_vector.tran.x, j2_vector.tran.y, j2_vector.tran.z); - // Link 2 connectes j2 (elbow) to j3 (wrist). + // Link 2 connects j2 (elbow) to j3 (wrist). // J3 is the controlled point. r = L2_LENGTH * cos(TO_RAD * joints[2]); j3_vector.tran.x = r * cos(TO_RAD * joints[0]); diff --git a/src/emc/motion/axis.c b/src/emc/motion/axis.c index d4114486974..05ebf97ccd3 100644 --- a/src/emc/motion/axis.c +++ b/src/emc/motion/axis.c @@ -7,7 +7,7 @@ typedef struct { double pos_cmd; /* commanded axis position */ - double teleop_vel_cmd; /* comanded axis velocity */ + double teleop_vel_cmd; /* commanded axis velocity */ double max_pos_limit; /* upper soft limit on axis pos */ double min_pos_limit; /* lower soft limit on axis pos */ double vel_limit; /* upper limit of axis speed */ diff --git a/src/emc/motion/motion.h b/src/emc/motion/motion.h index 672a2a1268c..1cd3dbd9077 100644 --- a/src/emc/motion/motion.h +++ b/src/emc/motion/motion.h @@ -564,7 +564,7 @@ Suggestion: Split this in to an Error and a Status flag register.. memory, and it reports motion controller status to higher level code in user space. For the most part, this structure contains higher level variables - low level stuff is made visible to the - HAL and troubleshooting, etc, is done using the HAL oscilliscope. + HAL and troubleshooting, etc, is done using the HAL oscilloscope. */ /*! \todo FIXME - this struct is broken into two parts... at the top are diff --git a/src/emc/rs274ngc/interp_g7x.cc b/src/emc/rs274ngc/interp_g7x.cc index 40aa8b4ff74..d046c44c140 100644 --- a/src/emc/rs274ngc/interp_g7x.cc +++ b/src/emc/rs274ngc/interp_g7x.cc @@ -12,7 +12,7 @@ #endif //////////////////////////////////////////////////////////////////////////////// -// Ancient compiler work-arounds +// Ancient compiler workarounds //////////////////////////////////////////////////////////////////////////////// #if __cplusplus < 201402L diff --git a/src/emc/rs274ngc/interp_internal.hh b/src/emc/rs274ngc/interp_internal.hh index af32aedbb71..1dc1c4dca00 100644 --- a/src/emc/rs274ngc/interp_internal.hh +++ b/src/emc/rs274ngc/interp_internal.hh @@ -770,7 +770,7 @@ struct setup int value_returned; // the last NGC procedure did/did not return a value int call_level; // current subroutine level context sub_context[INTERP_SUB_ROUTINE_LEVELS]; - int call_state; // enum call_states - inidicate Py handler reexecution + int call_state; // enum call_states - indicate Py handler reexecution offset_map_type offset_map; // store label x name, file, line bool adaptive_feed; // adaptive feed is enabled diff --git a/src/emc/rs274ngc/rs274ngc_pre.cc b/src/emc/rs274ngc/rs274ngc_pre.cc index 9fc80de629f..8f4aeb4e886 100644 --- a/src/emc/rs274ngc/rs274ngc_pre.cc +++ b/src/emc/rs274ngc/rs274ngc_pre.cc @@ -2652,7 +2652,7 @@ int Interp::on_abort(int reason, const char *message) // spun out from interp_o_word so we can use it to test ngc file accessibility during // config file parsing (REMAP... ngc=) // Will expand ~ to user's home path -// searchs this sequence until it finds a match: +// searches this sequence until it finds a match: // 1) checks if path is already the full path // 2) tries adding the INI defined program prefix to path // 3) tries adding the INI defined subroutine prefix to path diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc index 7a3154e489f..7a0adf1e075 100644 --- a/src/emc/task/emctaskmain.cc +++ b/src/emc/task/emctaskmain.cc @@ -115,7 +115,7 @@ static RCS_TIMER *timer = 0; static int emcTaskNoDelay = 0; // flag signifying that on the next loop, there should be no delay. // this is set when transferring trajectory data from userspace to kernel -// space, annd reset otherwise. +// space, and reset otherwise. static int emcTaskEager = 0; static int no_force_homing = 0; // forces the user to home first before allowing MDI and Program run diff --git a/src/emc/task/taskintf.cc b/src/emc/task/taskintf.cc index 23cf8cdb439..39a428f788c 100644 --- a/src/emc/task/taskintf.cc +++ b/src/emc/task/taskintf.cc @@ -422,7 +422,7 @@ int emcJointSetMaxAcceleration(int joint, double acc) return retval; } -/*! functions involving carthesian Axes (X,Y,Z,A,B,C,U,V,W) */ +/*! functions involving cartesian Axes (X,Y,Z,A,B,C,U,V,W) */ int emcAxisSetMinPositionLimit(int axis, double limit) { diff --git a/src/emc/tp/tp.c b/src/emc/tp/tp.c index 4639155ee25..0bba891b660 100644 --- a/src/emc/tp/tp.c +++ b/src/emc/tp/tp.c @@ -2410,8 +2410,8 @@ void tpCalculateTrapezoidalAccel(TP_STRUCT const * const tp, TC_STRUCT * const t double discr = discr_term1 + discr_term2 + discr_term3; - // Descriminant is a little more complicated with final velocity term. If - // descriminant < 0, we've overshot (or are about to). Do the best we can + // Discriminant is a little more complicated with final velocity term. If + // discriminant < 0, we've overshot (or are about to). Do the best we can // in this situation #ifdef TP_PEDANTIC if (discr < 0.0) { diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index 3553a5cc24a..552246687d2 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -2663,7 +2663,7 @@ def on_hal_status_interp_run(self, widget): self.macro_dic["keyboard"].set_sensitive(True) def on_hal_status_tool_in_spindle_changed(self, object, new_tool_no): - print("hal signal tool chnaged") + print("hal signal tool changed") # need to save the tool in spindle as preference, to be able to reload it on startup self.prefs.putpref("tool_in_spindle", new_tool_no, int) self._update_toolinfo(new_tool_no) @@ -4429,7 +4429,7 @@ def on_btn_block_height_clicked(self, widget, data=None): self.command.mode(linuxcnc.MODE_MANUAL) self.command.wait_complete() - # choose a theme to aply + # choose a theme to apply def on_theme_choice_changed(self, widget): return #TODO: @@ -5557,9 +5557,9 @@ def _on_blockheight_value_changed(self, pin): # ========================================================= # The actions of the buttons def _button_pin_changed(self, pin): - # we check if the button is pressed ore release, + # we check if the button is pressed or released, # otherwise a signal will be emitted, if the button is released and - # the signal drob down to zero + # the signal drop down to zero if not pin.get(): return diff --git a/src/emc/usr_intf/gmoccapy/notification.py b/src/emc/usr_intf/gmoccapy/notification.py index 8d9ffd2a00e..73ae8d101cd 100755 --- a/src/emc/usr_intf/gmoccapy/notification.py +++ b/src/emc/usr_intf/gmoccapy/notification.py @@ -192,7 +192,7 @@ def del_last(self): # this will delete a message, if the user gives a valid number it will be deleted, # but the user must take care to use the correct number - # if you give a value of "-1" all messages will be deletet + # if you give a value of "-1" all messages will be deleted def del_message(self, messagenumber): '''del_message(messagenumber) delete the message with the given number diff --git a/src/emc/usr_intf/gremlin/qt5_graphics.py b/src/emc/usr_intf/gremlin/qt5_graphics.py index 6a5af6ad53a..8b1e71d7561 100644 --- a/src/emc/usr_intf/gremlin/qt5_graphics.py +++ b/src/emc/usr_intf/gremlin/qt5_graphics.py @@ -175,7 +175,7 @@ def next_line(self, st): self.notify = 0 # this is class patched - # output the text from the magic comment eg: (PREVEIW,notify,The text) + # output the text from the magic comment eg: (PREVIEW,notify,The text) def output_notify_message(self, message): pass @@ -408,7 +408,7 @@ def load(self,filename = None): def output_notify_message(self, message): print("Preview Notify:", message) - # monkey patched function from Progess class + # monkey patched function from Progress class def emit_percent(self, percent): self.percentLoaded.emit(percent) diff --git a/src/emc/usr_intf/gscreen/gscreen.py b/src/emc/usr_intf/gscreen/gscreen.py index 94a0e65dc7f..07fe7794a7c 100755 --- a/src/emc/usr_intf/gscreen/gscreen.py +++ b/src/emc/usr_intf/gscreen/gscreen.py @@ -979,9 +979,9 @@ def init_window_geometry_pref(self): self.data.window2_max = self.prefs.getpref('window2_force_max', False, bool) def init_keybinding_pref(self): - """ adds the default keyboard bindings from the prefence file + """ adds the default keyboard bindings from the preference file This covers jogging, increments, estop,power and abort - A user can change the prefence file entries to change keys + A user can change the preference file entries to change keys Right Left Up @@ -1263,7 +1263,7 @@ def init_audio(self): self.widgets.audio_error_chooser.set_filename(self.data.error_sound) def init_desktop_notify(self): - """set destop_notfy widget active as per data class + """set desktop_notify widget active as per data class """ self.widgets.desktop_notify.set_active(self.data.desktop_notify) @@ -2052,7 +2052,7 @@ def on_index_tool_return(self,widget,result,calc): def set_grid_size(self,widget): """ This is a callback function for setting the graphics display grid size - reguires the graphics display to be called gremlin. + requires the graphics display to be called gremlin. requires the calling widget to return a float value records the preference in the preference file. """ @@ -2541,7 +2541,7 @@ def on_mode_select_clicked(self,widget,event): def on_estop_clicked(self,*args): """This is a callback function for a click of the estop button - It will togle between estop/machine off and enabled/machine on. + It will toggle between estop/machine off and enabled/machine on. Requires a button widget with a label named on_label Adds an alarm entry message on each toggle. """ @@ -4084,7 +4084,7 @@ def update_active_axis_buttons(self,widget): # adjust sensitivity and labels of buttons def jog_mode(self): print("jog mode:",self.widgets.button_jog_mode.get_active()) - # if muliple axis selected - unselect all of them + # if multiple axes selected - unselect all of them if len(self.data.active_axis_buttons) > 1 and self.widgets.button_jog_mode.get_active(): for i in self.data.axis_list: self.widgets["axis_%s"%i].set_active(False) @@ -4583,7 +4583,7 @@ def update_feed_speed_label(self): self.data.active_spindle_command,text)) def update_tool_label(self): - # corodinate system: + # coordinate system: systemlabel = (_("Machine"),"G54","G55","G56","G57","G58","G59","G59.1","G59.2","G59.3") tool = str(self.data.tool_in_spindle) if tool == None: tool = "None" diff --git a/src/emc/usr_intf/pncconf/external.glade b/src/emc/usr_intf/pncconf/external.glade index 347383e1557..5b0684087c8 100644 --- a/src/emc/usr_intf/pncconf/external.glade +++ b/src/emc/usr_intf/pncconf/external.glade @@ -708,7 +708,7 @@ True False - Use the checkboxs to enable options. + Use the checkboxes to enable options. Press the corresponding info button to show / adjust parameters. 0.44999998807907104 diff --git a/src/emc/usr_intf/pncconf/main_page.glade b/src/emc/usr_intf/pncconf/main_page.glade index 59bf9674c37..d06494af61d 100644 --- a/src/emc/usr_intf/pncconf/main_page.glade +++ b/src/emc/usr_intf/pncconf/main_page.glade @@ -285,7 +285,7 @@ Data False This program creates configuration files (.ini and .hal) for milling machines and lathes connected to a Mesa Card. -It is a recommended stategy to start with very basic axes options, get them functional then go back and add other options such as VFD spindle control or advanced limit/home control etc. +It is a recommended strategy to start with very basic axes options, get them functional then go back and add other options such as VFD spindle control or advanced limit/home control etc. True diff --git a/src/emc/usr_intf/pncconf/pncconf-help/help-axismotor.txt b/src/emc/usr_intf/pncconf/pncconf-help/help-axismotor.txt index 3011e61dfaf..f8887f3e76a 100644 --- a/src/emc/usr_intf/pncconf/pncconf-help/help-axismotor.txt +++ b/src/emc/usr_intf/pncconf/pncconf-help/help-axismotor.txt @@ -84,7 +84,7 @@ Dac Max Output: Use BLDC Motor Commutation Control: Select this to use and configure the BLDC component. - You would use this with special daugther boards or odd situations. + You would use this with special daughter boards or odd situations. The BLDC component can be used to control brushless motors directly and for HALL sensor conversions. See the MAN pages. For HALL conversion one must select the HALL/GRAY signals diff --git a/src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt b/src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt index 888d6a80994..24fefca0bbc 100644 --- a/src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt +++ b/src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt @@ -58,7 +58,7 @@ Virtual Control Panels: you can choose standalone panels for any frontend. - AXIS can have panels integrated on the side or in the center tab. side panels are always visible center tab panels are not always. - - TOUCHY can only have center tab intergation + - TOUCHY can only have center tab integration - pushing the display sample panel button will load a panel with the user chosen options, unless existing custom program radio button is active. It will then load the existing panel in the diff --git a/src/emc/usr_intf/pncconf/pncconf-help/help-mesa.txt b/src/emc/usr_intf/pncconf/pncconf-help/help-mesa.txt index 9deef5c8fc4..bfd5c98234e 100644 --- a/src/emc/usr_intf/pncconf/pncconf-help/help-mesa.txt +++ b/src/emc/usr_intf/pncconf/pncconf-help/help-mesa.txt @@ -138,7 +138,7 @@ Connector Tabs: 8i20 amplifier ( untested ) Linuxcnc supports 4 ports of 8 channels each of sserial PNCconf only configures 5 channels of port 0 (so max 5 sserial boards - - note that some 5i25 daugther boards use some of the sserial channels + note that some 5i25 daughter boards use some of the sserial channels internally.) Note that some daughter boards use multiple sserial channels. diff --git a/src/emc/usr_intf/pncconf/private_data.py b/src/emc/usr_intf/pncconf/private_data.py index 0e39a21ecc9..d348339afd3 100644 --- a/src/emc/usr_intf/pncconf/private_data.py +++ b/src/emc/usr_intf/pncconf/private_data.py @@ -964,7 +964,7 @@ def __init__(self,app,bin_dir,base_dir): ] #************************** - # mesa daugther board data + # mesa daughter board data #************************** self._NUM_CHANNELS = 6 self._SUBBOARDNAME = 0; self._SUBFIRMNAME = 1; self._SUBMODE = 2;self._SUBCONLIST = 3;self._SUBSTARTOFDATA = 12 # 4-10 spare for now. diff --git a/src/libnml/buffer/memsem.cc b/src/libnml/buffer/memsem.cc index b73babdc616..0868fb1a522 100644 --- a/src/libnml/buffer/memsem.cc +++ b/src/libnml/buffer/memsem.cc @@ -44,7 +44,7 @@ extern "C" { * Take the mutual exclusion semaphore. * * Parameters: -* data should point to an area of memory accesable to all processes that +* data should point to an area of memory accessible to all processes that * is at least "total_connections" bytes long, * connection_number is a unique identifier for this process it should * be between 0 and ("total_connections"-1) @@ -246,7 +246,7 @@ int mem_get_access(void *data, long connection_number, * Give up the mutual exclusion semaphore. * * Parameters: -* data should point to an area of memory accesable to all processes that +* data should point to an area of memory accessible to all processes that * is at least "total_connections" bytes long, * connection_number is a unique identifier for this process it should * be between 0 and ("total_connections"-1) diff --git a/src/libnml/buffer/physmem.cc b/src/libnml/buffer/physmem.cc index 330c61af42a..76392ca65b4 100644 --- a/src/libnml/buffer/physmem.cc +++ b/src/libnml/buffer/physmem.cc @@ -114,7 +114,7 @@ int PHYSMEM_HANDLE::read(void *_to, long _read_size) return (0); } - /* include platform specific ways of accessing phsical memory here. */ + /* include platform specific ways of accessing physical memory here. */ if (!(physmem_read_local_address_is_null_error_print_count % 100000)) { rcs_print_error ("PHYSMEM_HANDLE: Cannot read from physical memory when local address is NULL.\n"); @@ -162,7 +162,7 @@ int PHYSMEM_HANDLE::write(void *_from, long _write_size) return (0); } - /* include platform specific ways of accessing phsical memory here. */ + /* include platform specific ways of accessing physical memory here. */ if (!(physmem_write_local_address_is_null_error_print_count % 100000)) { rcs_print_error ("PHYSMEM_HANDLE: Cannot write to physical memory when local address is NULL.\n"); diff --git a/tcl/bin/pickconfig.tcl b/tcl/bin/pickconfig.tcl index 7627afc5b88..7a86a832178 100755 --- a/tcl/bin/pickconfig.tcl +++ b/tcl/bin/pickconfig.tcl @@ -724,7 +724,7 @@ proc prompt_copy configname { puts $fd " # = #1 (=123 pvalue)" puts $fd " (debug, readme.ngc: pvalue = #)" puts $fd "o endsub" - # include m2 to preculde message: + # include m2 to preclude message: # "File ended with no percent sign or program end" puts $fd "m2" close $fd diff --git a/tcl/ngcgui.tcl b/tcl/ngcgui.tcl index 736239cfc62..ecf282893a7 100755 --- a/tcl/ngcgui.tcl +++ b/tcl/ngcgui.tcl @@ -223,8 +223,8 @@ # in both "Numbered" (ex: o100) and "Named" (ex: o) forms. # Support for the "Numbered" label format is included, but # it would be clearer to limit ngcgui support to: -# Positional Parametrs --> #1, ..., #n 1<=n<=30 -# Named Labels --> o +# Positional Parameters --> #1, ..., #n 1<=n<=30 +# Named Labels --> o # This seems consistent with the trajectory of LinuxCNC gcode and # accommodation of earlier styles (numbered labels like # #n+1 to #30) is a small matter of editing:). @@ -315,7 +315,7 @@ # Alternatively, these files can be placed in a different # directory specified in the ini file [WIZARD]WIZARD_ROOT -# 16. Using a launcher (like ubuntu gnome destop launcher) doesn't +# 16. Using a launcher (like ubuntu gnome desktop launcher) doesn't # make it easy to pass in environmental variables like VISUAL. # This works for a launcher: put ngcgui.tcl in a directory # such as /home/yourname/bin and create script such as diff --git a/tests/realtime-math/checkresult b/tests/realtime-math/checkresult index 183cd58d010..82e7de12566 100755 --- a/tests/realtime-math/checkresult +++ b/tests/realtime-math/checkresult @@ -1,3 +1,3 @@ #!/bin/sh -# success or failure is dermined by the return value of the test.sh script +# success or failure is determined by the return value of the test.sh script exit 0 diff --git a/tests/remap/predefined-named-params/test.ngc b/tests/remap/predefined-named-params/test.ngc index cc23b22cb4f..e36047cc67d 100644 --- a/tests/remap/predefined-named-params/test.ngc +++ b/tests/remap/predefined-named-params/test.ngc @@ -1,6 +1,6 @@ ; add a python predefined named parameter which does the same thing as the builtin ; _motion_mode -; assert accessability and results at Python and NGC level +; assert accessibility and results at Python and NGC level ;py,from interpreter import *