Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove references to removed 'iocontrolv2' #3167

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Remove references to removed 'iocontrolv2' #3167

wants to merge 16 commits into from

Conversation

Sigma1912
Copy link
Contributor

'iocontrol-v2' has been removed with this commit
9d79c2a

@Sigma1912 Sigma1912 changed the title Remove sim config for 'iocontrolv2' Remove references to removed 'iocontrolv2' Oct 26, 2024
@Sigma1912
Copy link
Contributor Author

Sigma1912 commented Oct 26, 2024 •
edited
Loading

There are some other references to iocontrol-v2. I'm somewhat unclear about some of them (eg parameters 5600, 5601 or the comment in the various 'stdglue.py' files):

./docs/src/remap/remap.adoc:1583:* The following three steps are applicable only if the `iocontrol-v2` component is used:
./docs/src/remap/remap.adoc:1600:* If parameter 5600 (fault indicator) is greater than zero, this indicates a Toolchanger fault, which is handled as follows (`iocontrol-v2`-only):
./docs/src/remap/remap.adoc:1774:Note that the use of M61 currently requires the use of `iocontrol-v2`.
./docs/src/remap/remap.adoc:2228:. M61 (remapped or not) is broken in `iocontrol` and requires `iocontrol-v2` to actually work.
./docs/src/gcode/overview.adoc:342:* '5600' - Toolchanger fault indicator. Used with the iocontrol-v2 component.
./docs/src/gcode/overview.adoc:344:* '5601' - Toolchanger fault code. Used with the iocontrol-v2 component.
./src/emc/rs274ngc/interp_parameter_def.hh:201:// 5600 - Toolchanger fault indicator. Used with the iocontrol-v2 component. 1: toolchanger faulted, 0: normal. Volatile.
./src/emc/rs274ngc/interp_parameter_def.hh:203:// 5601 - Toolchanger fault code. Used with the iocontrol-v2 component. Reflects the value of the toolchanger-reason HAL pin if a fault occurred. Volatile.
./configs/sim/gmoccapy/python/stdglue.py:59:        # this is relevant only when using iocontrol-v2.
./configs/sim/woodpecker/python/stdglue.py:170:        # this is relevant only when using iocontrol-v2.
./configs/sim/woodpecker/python/stdglue.py:199:        # this is relevant only when using iocontrol-v2.
./configs/sim/axis/remap/extend-builtins/README:16:Note that using M61 requires iocontrol-v2 as set tool number support in iocontrol is broken.
./nc_files/remap_lib/python-stdglue/stdglue.py:170:        # this is relevant only when using iocontrol-v2.
./nc_files/remap_lib/python-stdglue/stdglue.py:199:        # this is relevant only when using iocontrol-v2.

@hansu
Copy link
Member

hansu commented Oct 26, 2024

'iocontrol-v2' has been removed with this commit
9d79c2a

And with this PR: #2497

Not only iocontrol v2 also iocontrol.

Then I wonder if the EMCIO parameter can be removed from all the sample configs?

[EMCIO]
EMCIO = 		io

Furthermore there are also the man pages of io and iov2 remaining. Can be removed as well?

@rene-dev
Copy link
Member

yes, can all be removed.

@rene-dev
Copy link
Member

ah, sorry no. the man pages should remain, as the pins are still there.

@Sigma1912
Copy link
Contributor Author 

ah, sorry no. the man pages should remain, as the pins are still there.

I presume you mean the manpage for 'io' should remain and the one for 'iov2' can be removed?

@Sigma1912
Copy link
Contributor Author

So it looks like I'm done (I assume that the files in the '/docs/po' folder are updated automatically)

@Sigma1912 Sigma1912 force-pushed the iocontrolv2_remove-references branch 4 times, most recently from 76ca1fd to d6fde9e Compare October 26, 2024 18:04
smoe and others added 7 commits October 26, 2024 20:09
@smoe @Sigma1912
docs: More changes while translating (smoe:docs_man_adoc_20240918) (L…
a84f706 
…inuxCNC#3153)

* docs: changes while translating

A bit more while translating

* docs: Syntax fix, as found by Petter

* More changes while translating.

* docs: More translation-associated observations.

* docs: More changes triggered while translating.
@phillc54 @Sigma1912
pncconf: add qtplasmac external hal pins
2ee9fc3 
use raw strings in pncconf and stepconf where backslash is required
@Sigma1912
fix: QTVCP: help text for G43 is misleading LinuxCNC#3161
0d4de45
@smoe @Sigma1912
docs: Changes while translating.
7dffd67
@smoe @Sigma1912
docs: reformatting in hy_vfd.1.adoc
5c4e402
@smoe @hansu @Sigma1912
Update docs/src/gui/qtdragon.adoc
e161734 
Co-authored-by: Hans Unzner <hansunzner@gmail.com>
@Sigma1912
Remove sim config for 'iocontrolv2'
6794c65 
'iocontrol-v2' has been removed with this commit
LinuxCNC@9d79c2a
@Sigma1912 Sigma1912 force-pushed the iocontrolv2_remove-references branch from d6fde9e to e71147f Compare October 26, 2024 18:09
@Sigma1912
Remove iov2 and iov2.1 docs
d040306 
Remove iov2 documentation page

Remove iov2 doc page from submakefile

Remove obsolete iov2.1 manpage

Remove obsolete iov2.1 from manpages.in

Remove iov2 and iov2.1 man page references from po4a.cfg
@Sigma1912 Sigma1912 force-pushed the iocontrolv2_remove-references branch from e71147f to 53a8799 Compare October 26, 2024 18:12
@Sigma1912
Remove obsolete line 'EMCIO = io'
12d6226 
Remove obsolete line 'EMCIO = io' from ini files

Remove obsolete 'EMCIO = io' from .inc files
@Sigma1912
Stop 'pncconf' and 'stepconf' writing obsolete 'EMCIO = io' into ini …
ed3541b 
…files
@Sigma1912
Remove obsolete ngc file showcasing iov2 behavior
e76a628
@Sigma1912
Remove references to 'iov2' and 'iocontrol-v2' from docs
1c40612 
Remove more references to obsolete 'iov2' from documentation

Remove references to obsolete 'iocontrol-v2' from remaining documentation
@Sigma1912
Remove code blocks for obsolete iocontrol-v2 from stdglue.py
0399879 
Remove more code blocks for iocontrol-v2 from stdglue.py
@Sigma1912
Remove parameters '5600' and '5601' used for obsolete iocontrol-v2
94aadaa
@Sigma1912
Remove more obsolete lines referring to iocontrol-v2
bbe538a 
Also removes empty lines I introduced with an earlier commit

Remove remants (empty lines and 'v2') in .ini files

Remove remnant 'v2' from the [EMCIO] section

Remove yet more empty lines after [EMCIO]
@Sigma1912
Remove reference to [EMCIO] selecting io-component
c7706b7
@Sigma1912 Sigma1912 force-pushed the iocontrolv2_remove-references branch from 53a8799 to c7706b7 Compare October 26, 2024 18:14
@rene-dev
Copy link
Member

I presume you mean the manpage for 'io' should remain and the one for 'iov2' can be removed?

yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Sigma1912 @hansu @rene-dev @smoe @phillc54