Skip to content

Commit d1a9d7d

Browse files
authored
Merge pull request #4530 from grandixximo/mesa-modbus-removal
mesa_modbus: remove deprecated framework, superseded by hm2_modbus
2 parents cb437a2 + 959f53c commit d1a9d7d

21 files changed

Lines changed: 12 additions & 1588 deletions

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ share/menus/CNC.menu
2020
share/desktop-directories/linuxcnc-cnc.directory
2121
share/desktop-directories/linuxcnc-ref.directory
2222
share/desktop-directories/linuxcnc-doc.directory
23-
share/linuxcnc/mesa_modbus.c.tmpl
2423
src/modules.order
2524
/configs/*/emc.nml
2625
!/configs/common/emc.nml

debian/linuxcnc-uspace-dev.install

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
usr/bin/halcompile
2-
usr/bin/modcompile
32
usr/include/linuxcnc
43
usr/lib/liblinuxcnc.a
54
usr/lib/*.so
65
usr/share/linuxcnc/Makefile.modinc
7-
usr/share/linuxcnc/mesa_modbus.c.tmpl

debian/linuxcnc.manpages.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ usr/share/man/man1/milltask.1
5959
usr/share/man/man1/millturn.1
6060
usr/share/man/man1/millturngui.1
6161
usr/share/man/man1/mitsub_vfd.1
62-
usr/share/man/man1/modcompile.1
6362
usr/share/man/man1/monitor-xhc-hb04.1
6463
usr/share/man/man1/motion-logger.1
6564
usr/share/man/man1/moveoff_gui.1

docs/po4a.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
[type: AsciiDoc_def] src/drivers/hostmot2.adoc $lang:build/adoc/$lang/drivers/hostmot2.adoc
6565
[type: AsciiDoc_def] src/drivers/hal_gpio.adoc $lang:build/adoc/$lang/drivers/hal_gpio.adoc
6666
[type: AsciiDoc_def] src/drivers/mb2hal.adoc $lang:build/adoc/$lang/drivers/mb2hal.adoc
67-
[type: AsciiDoc_def] src/drivers/mesa_modbus.adoc $lang:build/adoc/$lang/drivers/mesa_modbus.adoc
6867
[type: AsciiDoc_def] src/drivers/mitsub-vfd.adoc $lang:build/adoc/$lang/drivers/mitsub-vfd.adoc
6968
[type: AsciiDoc_def] src/drivers/pico-ppmc.adoc $lang:build/adoc/$lang/drivers/pico-ppmc.adoc
7069
[type: AsciiDoc_def] src/drivers/pmx485.adoc $lang:build/adoc/$lang/drivers/pmx485.adoc
@@ -200,7 +199,6 @@
200199
[type: AsciiDoc_def] src/man/man1/milltask.1.adoc $lang:build/adoc/$lang/man/man1/milltask.1.adoc
201200
[type: AsciiDoc_def] src/man/man1/millturn.1.adoc $lang:build/adoc/$lang/man/man1/millturn.1.adoc
202201
[type: AsciiDoc_def] src/man/man1/mitsub_vfd.1.adoc $lang:build/adoc/$lang/man/man1/mitsub_vfd.1.adoc
203-
[type: AsciiDoc_def] src/man/man1/modcompile.1.adoc $lang:build/adoc/$lang/man/man1/modcompile.1.adoc
204202
[type: AsciiDoc_def] src/man/man1/monitor-xhc-hb04.1.adoc $lang:build/adoc/$lang/man/man1/monitor-xhc-hb04.1.adoc
205203
[type: AsciiDoc_def] src/man/man1/motion-logger.1.adoc $lang:build/adoc/$lang/man/man1/motion-logger.1.adoc
206204
[type: AsciiDoc_def] src/man/man1/moveoff_gui.1.adoc $lang:build/adoc/$lang/man/man1/moveoff_gui.1.adoc

docs/src/Master_Documentation.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ include::drivers/hostmot2.adoc[]
136136

137137
include::drivers/mb2hal.adoc[]
138138

139-
include::drivers/mesa_modbus.adoc[]
140-
141139
include::drivers/mitsub-vfd.adoc[]
142140

143141

docs/src/Submakefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ DOC_SRCS_EN := \
168168
drivers/hal_pi_gpio.adoc \
169169
drivers/hostmot2.adoc \
170170
drivers/mb2hal.adoc \
171-
drivers/mesa_modbus.adoc \
172171
drivers/pico-ppmc.adoc \
173172
drivers/pmx485.adoc \
174173
drivers/shuttle.adoc \
@@ -354,8 +353,8 @@ postatus::
354353
# (rather than scanning $(L)/ with $(wildcard) or assuming every English
355354
# source has a translation) gives two properties at once: the list does
356355
# not depend on po4a having already produced the files (no "build twice"
357-
# fragility), and it does not include English-only sources like
358-
# drivers/mesa_modbus.adoc that are absent from the translation pipeline.
356+
# fragility), and it does not include English-only sources that are
357+
# absent from the translation pipeline.
359358
TRANSLATED_DOC_SRCS := $(shell sed -nE 's|^\[type: AsciiDoc_def\] src/([^ ]+).*|\1|p' \
360359
$(DOC_DIR)/po4a.cfg)
361360
$(foreach L,$(LANGUAGES),\

0 commit comments

Comments
 (0)