Skip to content

Commit

Permalink
src: s/ini/INI/
Browse files Browse the repository at this point in the history
s/ini/INI/ - smallish correction

Update lib/python/gladevcp/hal_gremlin.py

Co-authored-by: Jérémie Tarot <[email protected]>

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <[email protected]>

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

Co-authored-by: Jérémie Tarot <[email protected]>

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

Co-authored-by: Jérémie Tarot <[email protected]>

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

Co-authored-by: Jérémie Tarot <[email protected]>

More 'ini' -> 'INI' in src

ini -> INI to sync tests

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <[email protected]>

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

Co-authored-by: Jérémie Tarot <[email protected]>

s/modbus/Modbus/

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

Co-authored-by: Jérémie Tarot <[email protected]>

Update scripts/linuxcnc.in

Co-authored-by: Jérémie Tarot <[email protected]>

Update src/emc/rs274ngc/interp_namedparams.cc

Co-authored-by: Jérémie Tarot <[email protected]>

Update src/emc/usr_intf/emcsh.cc

Co-authored-by: Jérémie Tarot <[email protected]>

docs: inifile -> INI file, etc
  • Loading branch information
smoe committed Oct 11, 2022
1 parent 123f69e commit 2dc8a0d
Show file tree
Hide file tree
Showing 146 changed files with 372 additions and 372 deletions.
6 changes: 3 additions & 3 deletions lib/hallib/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ This directory contains halfiles (*.hal and *.tcl) that are available
using the LinuxCNC halfile search path or by an explicit directive.

The HALLIB_PATH is '.:HALLIB_DIR'
The '.' specifies the directory containing the ini file.
The '.' specifies the directory containing the INI file.
HALIB_DIR specifies this directory.

The explicit directive uses a prefix (LIB:) to identify halfiles:
Expand Down Expand Up @@ -42,7 +42,7 @@ tripodsim.hal simulated tripodkins system
Haltcl Files (*.tcl) Notes
----------------------- ---------------------------------------------
basic_sim.tcl set up a sim config (arbitrary no. of axes)
var_show.tcl show ini variables and context
var_show.tcl show INI variables and context
hookup_moveoff.tcl make connections for a moveoff component
plasmac.tcl common connections for the plasmac component

Expand All @@ -66,5 +66,5 @@ sim_lib.tcl simulator config procedures
util_lib.tcl utility procedures
procs:
show_context (calling parms)
show_ini (ini file settings)
show_ini (INI file settings)
show_env (environmental vars)
6 changes: 3 additions & 3 deletions lib/hallib/basic_sim.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# this script (and any prior executed hal commands)
#
# Coordinate letters and number_of_joints are determined from the usual
# ini # file settings.
# INI file settings.
#
# Ini file usage:
# INI file usage:
# [HAL]HALFILE = basic_sim.tcl [Options]
# Options:
# -no_make_ddts
Expand All @@ -24,7 +24,7 @@
# Notes:
# 1) ::env() is a global associative array of environmental variables
# as exported by the main LinuxCNC script (linuxcnc)
# 2) Settings from the ini file are available as global associative
# 2) Settings from the INI file are available as global associative
# arrays named: ::SECTION(varname)
# example: ::EMCMOT(SERVO_PERIOD)
# 3) procs are from sim_lib.tcl
Expand Down
6 changes: 3 additions & 3 deletions lib/hallib/core_servo.hal
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# first load the core RT modules that will be needed
# kinematics
loadrt [KINS]KINEMATICS
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
# PID module, for three PID loops
loadrt pid num_chan=3
Expand All @@ -30,9 +30,9 @@ setp pid.0.maxoutput [JOINT_0]MAX_VELOCITY
setp pid.1.maxoutput [JOINT_1]MAX_VELOCITY
setp pid.2.maxoutput [JOINT_2]MAX_VELOCITY

# set PID loop gains from inifile
# set PID loop gains from INI file

# the values below come from the ini
# the values below come from the INI
setp pid.0.Pgain [JOINT_0]P
setp pid.0.Igain [JOINT_0]I
setp pid.0.Dgain [JOINT_0]D
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/core_sim.hal
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# first load all the RT modules that will be needed
# kinematics
loadrt [KINS]KINEMATICS
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
# load 6 differentiators (for velocity and accel signals
loadrt ddt names=ddt_x,ddt_xv,ddt_y,ddt_yv,ddt_z,ddt_zv
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/core_sim9.hal
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# first load all the RT modules that will be needed
# kinematics
loadrt [KINS]KINEMATICS
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
# load 6 differentiators (for velocity and accel signals
loadrt ddt names=ddt_x,ddt_xv,ddt_y,ddt_yv,ddt_z,ddt_zv
Expand Down
6 changes: 3 additions & 3 deletions lib/hallib/core_stepper.hal
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# first load the core RT modules that will be needed
# kinematics
loadrt [KINS]KINEMATICS
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
# stepper module, three step generators, all three using step/dir
loadrt stepgen step_type=0,0,0
Expand Down Expand Up @@ -41,12 +41,12 @@ net Ydir <= stepgen.1.dir
net Zstep <= stepgen.2.step
net Zdir <= stepgen.2.dir

# set stepgen module scaling - get values from ini file
# set stepgen module scaling - get values from INI file
setp stepgen.0.position-scale [JOINT_0]SCALE
setp stepgen.1.position-scale [JOINT_1]SCALE
setp stepgen.2.position-scale [JOINT_2]SCALE

# set stepgen module accel limits - get values from ini file
# set stepgen module accel limits - get values from INI file
setp stepgen.0.maxaccel [JOINT_0]STEPGEN_MAXACCEL
setp stepgen.1.maxaccel [JOINT_1]STEPGEN_MAXACCEL
setp stepgen.2.maxaccel [JOINT_2]STEPGEN_MAXACCEL
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/gantrysim.hal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
loadrt [KINS]KINEMATICS
show comp

# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS

# add motion controller functions to servo thread
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/hal_procs_lib.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ proc find_file_in_hallib_path {filename {inifile .}} {
if {[file pathtype $filename] == "absolute"} {
set usehalname $filename
} else {
# relative file specifier (relative to ini file directory)
# relative file specifier (relative to INI file directory)
set usehalname [file join [file dirname $inifile] $halname]
if ![file readable $usehalname] {
# use ::env(HALLIB_DIR)
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/halcheck.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# 2) signals with no inputs (not an error)
# 3) signals with no output (not an error)
#
# Usage in ini file (must be the last HALFILE):
# Usage in INI file (must be the last HALFILE):
# [HAL]
# ...
# HALFILE = LIB:halcheck.tcl
Expand Down
16 changes: 8 additions & 8 deletions lib/hallib/hookup_moveoff.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@ source [file join $::env(HALLIB_DIR) hal_procs_lib.tcl]
# 3) addf the moveoff component functions in required sequence
# 4) reconnect the pos-cmd and pos-fb pins to use the component
#
# Support for demo type ini files where the pos-cmd and pos-fb pins are
# Support for demo type INI files where the pos-cmd and pos-fb pins are
# 'shortcircuit' connected together is included.
#
# The moveoff component may be initialized with settings from the ini file
# The moveoff component may be initialized with settings from the INI file
#
# Usage:
# 1) Specify this file in the ini file as [HAL]HALFILE
# 1) Specify this file in the INI file as [HAL]HALFILE
# Its position must follow halfiles that connect the pos-cmd and
# pos-fb pins.
# [HAL]
# ...
# HALFILE = hookup_moveoff.tcl
# ...
#
# 2) Include ini file entries for moveoff component settings:
# 2) Include INI file entries for moveoff component settings:
# [MOVEOFF]
# EPSILON =
# WAYPOINT_SAMPLE_SECS =
# WAYPOINT_THRESHOLD =
# BACKTRACK_ENABLE =
#
# If these settings are not found in the ini file, the moveoff
# If these settings are not found in the INI file, the moveoff
# component defaults will be used.
#
# 3) Include ini file entries for the per-joint settings
# 3) Include INI file entries for the per-joint settings
# [MOVEOFF_n]
# MAX_VELOCITY =
# MAX_ACCELERATION =
# MAX_LIMIT =
# MIN_LIMIT =
#
# If settings are not found in the ini file, the items
# If settings are not found in the INI file, the items
# [JOINT_n]
# MAX_VELOCITY =
# MAX_ACCELERATION =
Expand All @@ -48,7 +48,7 @@ source [file join $::env(HALLIB_DIR) hal_procs_lib.tcl]
# defaults are used.
#
# To use the (optional) demonstration gui named moveoff_gui,
# include an ini entry:
# include an INI entry:
#
# [APPLICATIONS]
# APP = moveoff_gui option1 option2 ...
Expand Down
4 changes: 2 additions & 2 deletions lib/hallib/servo_sim.hal
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# first load all the RT modules that will be needed
# kinematics
loadrt [KINS]KINEMATICS
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
# PID module, for three PID loops
loadrt pid names=pid_x,pid_y,pid_z
Expand Down Expand Up @@ -146,7 +146,7 @@ setp pid_z.maxoutput [JOINT_2]MAX_VELOCITY
# do "halcmd show param | grep pid" to get a listing
# of the tuning parameters, and enter those values here.

# the values below come from the ini
# the values below come from the INI
setp pid_x.Pgain [JOINT_0]PGAIN
setp pid_x.Igain [JOINT_0]IGAIN
setp pid_x.Dgain [JOINT_0]DGAIN
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/sim_ldelta.hal
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# kinematics
loadrt [KINS]KINEMATICS
#loadrt lineardeltakins
# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS

loadusr -W lineardelta MIN_JOINT=-420
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/tripodsim.hal
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setp tripodkins.Bx 10
setp tripodkins.Cx 5
setp tripodkins.Cy 7.071

# motion controller, get name and thread periods from ini file
# motion controller, get name and thread periods from INI file
loadrt [EMCMOT]EMCMOT servo_period_nsec=[EMCMOT]SERVO_PERIOD
# 6 differentiators (for velocity and accel sigs)
loadrt ddt names=ddt_j0,ddt_j1,ddt_j2,ddt_j0v,ddt_j1v,ddt_j2v
Expand Down
2 changes: 1 addition & 1 deletion lib/hallib/var_show.tcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# var_show.tcl

# this halfile can be used to show context and
# ini variable arrays available to tcl halfiles
# INI variable arrays available to tcl halfiles
# example: [HAL]LIB:var_show.tcl arg1 arg2

#begin-----------------------------------------------------------------
Expand Down
20 changes: 10 additions & 10 deletions lib/hallib/xhc-hb04.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source [file join $::env(HALLIB_DIR) hal_procs_lib.tcl]
source [file join $::env(HALLIB_DIR) util_lib.tcl]

# Usage:
# In ini file, include:
# In INI file, include:
# [HAL]
# HALFILE = existing halfiles
# ...
Expand All @@ -29,7 +29,7 @@ source [file join $::env(HALLIB_DIR) util_lib.tcl]
# special cases:
# start-pause = std_start_pause (for usual behavior)
# step = xhc-hb04.stepsize-up (for usual behavior)
# (see ini files for more exanples)
# (see INI files for more exanples)

# Notes:
# 1) the 'start-pause' pin can be set to "std_start_pause" to
Expand Down Expand Up @@ -103,7 +103,7 @@ proc connect_pins {} {
puts stderr "$::progname: using std_start_pause_button"
continue
}
# these are warnings in the ini file examples but aren't real pins
# these are warnings in the INI file examples but aren't real pins
if {[string tolower "$thepin"] == "caution"} {
puts stderr "$::progname: skipping button $bname marked <$thepin>"
continue
Expand Down Expand Up @@ -139,7 +139,7 @@ proc wheel_setup {jogmode} {
}
}

# defaults if not in inifile:
# defaults if not in INI file:
set ::XHC_HB04_CONFIG(coef,0) 1.0
set ::XHC_HB04_CONFIG(coef,1) 1.0
set ::XHC_HB04_CONFIG(coef,2) 1.0
Expand All @@ -160,7 +160,7 @@ proc wheel_setup {jogmode} {
incr idx
}
}
# defaults if not in inifile:
# defaults if not in INI file:
set ::XHC_HB04_CONFIG(scale,0) 1.0
set ::XHC_HB04_CONFIG(scale,1) 1.0
set ::XHC_HB04_CONFIG(scale,2) 1.0
Expand Down Expand Up @@ -271,13 +271,13 @@ proc wheel_setup {jogmode} {
}

set afraction 1.0 ;# default
# Only calculate an afraction IF we have specified mpg_accels in the ini file
# Only calculate an afraction IF we have specified mpg_accels in the INI file
if [info exists ::XHC_HB04_CONFIG(mpg_accels)] {
if [catch {
set afraction [expr $::XHC_HB04_CONFIG(accel,$idx)\
/[set ::AXIS_[set COORD](MAX_ACCELERATION)] ]
} msg] {
err_exit "<$msg>\n\nMissing ini setting: \[AXIS_$COORD\]MAX_ACCELERATION"
err_exit "<$msg>\n\nMissing INI setting: \[AXIS_$COORD\]MAX_ACCELERATION"
}
}
setp axis.$coord.jog-accel-fraction $afraction
Expand Down Expand Up @@ -307,7 +307,7 @@ proc wheel_setup {jogmode} {
set jfraction [expr $::XHC_HB04_CONFIG(accel,$idx)\
/[set ::JOINT_[set jnum](MAX_ACCELERATION)] ]
} msg] {
err_exit "<$msg>\n\nMissing ini setting: \[JOINT_$jnum\]MAX_ACCELERATION"
err_exit "<$msg>\n\nMissing INI setting: \[JOINT_$jnum\]MAX_ACCELERATION"
}
}
setp joint.$jnum.jog-accel-fraction $jfraction
Expand Down Expand Up @@ -554,9 +554,9 @@ addf pendant_util $::XHC_HB04_CONFIG(threadname)
# If twopass, do not call procs in pass0 that test pin
# connections since components not yet loaded
if { ![namespace exists ::tp] || ([::tp::passnumber] != 0) } {
connect_pins ;# per ini file items: [XHC_HB04_BUTTONS]buttonname=pin
connect_pins ;# per INI file items: [XHC_HB04_BUTTONS]buttonname=pin
wheel_setup $::XHC_HB04_CONFIG(jogmode)
# jog wheel per ini file items:
# jog wheel per INI file items:
# [XHC_HB04_CONFIG]coords,coefs,scales
}
if [info exists ::makenet_msg] {
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/combi_dro.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def __init__(self, joint_number = 0):
# linuxcnc may not be working
try:
self.inifile = self.linuxcnc.ini(INIPATH)
# check the ini file if UNITS are set to mm"
# check the INI file if UNITS are set to mm"
# first check the global settings
units = self.inifile.find("TRAJ", "LINEAR_UNITS")
if units == None:
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/drowidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def __init__(self, *a, **kw):

try:
self.inifile = self.emc.ini(INIPATH)
# check the ini file if UNITS are set to mm"
# check the INI file if UNITS are set to mm"
# first check the global settings
units=self.inifile.find("TRAJ","LINEAR_UNITS")
if units==None:
Expand Down
4 changes: 2 additions & 2 deletions lib/python/gladevcp/hal_gremlin.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
from hal_glib import GStat

def get_linuxcnc_ini_file():
"""find linuxcnc ini file with pgrep"""
"""find LinuxCNC INI file with pgrep"""
import subprocess
ps = subprocess.Popen('ps -C linuxcncsvr --no-header -o args'.split(),
stdout=subprocess.PIPE
)
p,e = ps.communicate()

if ps.returncode:
print(_('\nhal_gremlin: cannot find inifile\n'))
print(_('\nhal_gremlin: cannot find INI file\n'))
return None

ans = p.split()[p.split().index('-ini')+1]
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/offsetpage_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def __init__(self, filename = None, *a, **kw):
window = self.wTree.get_object("offsetpage_box")
window.reparent(self)

# check the ini file if UNITS are set to mm
# check the INI file if UNITS are set to mm
# first check the global settings
# if not available then the X axis units
try:
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/offsetwidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, *a, **kw):
# The update time: every 500 milliseconds
GLib.timeout_add(500, self.periodic)

# check the ini file if UNITS are set to mm
# check the INI file if UNITS are set to mm
# first check the global settings
# else then the X axis units
try:
Expand Down
Loading

0 comments on commit 2dc8a0d

Please sign in to comment.