Skip to content

Commit 2ee0820

Browse files
acassissimbit18
acassis
authored and
simbit18
committed
apps/modbus: Move modbus to inside industry/
Modbus is a protocol mostly used on industries and since it is a protocol it is not a category to be at root of apps/ Signed-off-by: Alan C. Assis <acassis@gmail.com>
1 parent 8e9f5a8 commit 2ee0820

45 files changed

Lines changed: 60 additions & 60 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modbus/.gitignore renamed to industry/modbus/.gitignore

File renamed without changes.

modbus/CMakeLists.txt renamed to industry/modbus/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/modbus/CMakeLists.txt
2+
# apps/industry/modbus/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

modbus/Make.defs renamed to industry/modbus/Make.defs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/modbus/Make.defs
2+
# apps/industry/modbus/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

modbus/Makefile renamed to industry/modbus/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/modbus/Makefile
2+
# apps/industry/modbus/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#

modbus/freemodbus/CMakeLists.txt renamed to industry/modbus/freemodbus/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ##############################################################################
2-
# apps/modbus/freemodbus/CMakeLists.txt
2+
# apps/industry/modbus/freemodbus/CMakeLists.txt
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -20,11 +20,11 @@
2020
#
2121
# ##############################################################################
2222

23-
if(CONFIG_MODBUS)
23+
if(CONFIG_INDUSTRY_MODBUS)
2424

2525
set(CSRCS)
2626

27-
if(CONFIG_MODBUS_SLAVE)
27+
if(CONFIG_INDUSTRY_MODBUS_SLAVE)
2828
list(APPEND CSRCS mb.c)
2929
endif()
3030

@@ -63,7 +63,7 @@ if(CONFIG_MODBUS)
6363

6464
list(APPEND CSRCS nuttx/portother.c)
6565

66-
if(CONFIG_MODBUS_SLAVE)
66+
if(CONFIG_INDUSTRY_MODBUS_SLAVE)
6767
list(APPEND CSRCS nuttx/portevent.c nuttx/portserial.c nuttx/porttimer.c)
6868
endif()
6969

modbus/freemodbus/Kconfig renamed to industry/modbus/freemodbus/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55

66
menu "FreeModBus"
7-
config MODBUS
7+
config INDUSTRY_MODBUS
88
bool "Modbus support using FreeModbus"
99
default n
1010

11-
if MODBUS
11+
if INDUSTRY_MODBUS
1212

1313
config MB_FUNC_HANDLERS_MAX
1414
int "Maximum number of Modbus functions"
@@ -20,11 +20,11 @@ config MB_FUNC_HANDLERS_MAX
2020
the sum of all enabled functions in this file and custom function
2121
handlers. If set to small adding more functions will fail.
2222

23-
config MODBUS_SLAVE
23+
config INDUSTRY_MODBUS_SLAVE
2424
bool "Modbus slave support via FreeModBus"
2525
default n
2626

27-
if MODBUS_SLAVE
27+
if INDUSTRY_MODBUS_SLAVE
2828
config MB_ASCII_ENABLED
2929
bool "Modbus ASCII support"
3030
default y
@@ -144,9 +144,9 @@ config MB_FUNC_READWRITE_HOLDING_ENABLED
144144
---help---
145145
If the Read/Write Multiple Registers function should be enabled.
146146

147-
endif # MODBUS_SLAVE
147+
endif # INDUSTRY_MODBUS_SLAVE
148148

149-
config MODBUS_MASTER
149+
config INDUSTRY_MODBUS_MASTER
150150
bool "Modbus Master support via FreeModBus"
151151
default n
152152

@@ -252,7 +252,7 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED
252252
endif # MB_ASCII_MASTER || MB_RTU_MASTER
253253
endif # MODBUS
254254

255-
config MODBUS_DISABLE_LOG
255+
config INDUSTRY_MODBUS_DISABLE_LOG
256256
bool "Disable logging for FreeModBus"
257257
default !FILE_STREAM
258258
---help---

modbus/freemodbus/Make.defs renamed to industry/modbus/freemodbus/Make.defs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/modbus/freemodbus/Make.defs
2+
# apps/industry/modbus/freemodbus/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -20,6 +20,6 @@
2020
#
2121
############################################################################
2222

23-
ifneq ($(CONFIG_MODBUS),)
24-
CONFIGURED_APPS += $(APPDIR)/modbus/freemodbus
23+
ifneq ($(CONFIG_INDUSTRY_MODBUS),)
24+
CONFIGURED_APPS += $(APPDIR)/industry/modbus/freemodbus
2525
endif

modbus/freemodbus/Makefile renamed to industry/modbus/freemodbus/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/modbus/freemodbus/Makefile
2+
# apps/industry/modbus/freemodbus/Makefile
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -24,9 +24,9 @@ include $(APPDIR)/Make.defs
2424

2525
# FreeModBus Library
2626

27-
ifeq ($(CONFIG_MODBUS),y)
27+
ifeq ($(CONFIG_INDUSTRY_MODBUS),y)
2828

29-
ifeq ($(CONFIG_MODBUS_SLAVE),y)
29+
ifeq ($(CONFIG_INDUSTRY_MODBUS_SLAVE),y)
3030
CSRCS += mb.c
3131
endif
3232

modbus/freemodbus/ascii/Make.defs renamed to industry/modbus/freemodbus/ascii/Make.defs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
############################################################################
2-
# apps/modbus/freemodbus/ascii/Make.defs
2+
# apps/industry/modbus/freemodbus/ascii/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -26,6 +26,6 @@ CSRCS += mbascii.c
2626

2727
DEPPATH += --dep-path ascii
2828
VPATH += :ascii
29-
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/ascii
29+
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/ascii
3030

3131
endif

modbus/freemodbus/ascii/mbascii.c renamed to industry/modbus/freemodbus/ascii/mbascii.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
* apps/modbus/ascii/mbascii.c
2+
* apps/industry/modbus/ascii/mbascii.c
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
* SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>

0 commit comments

Comments
 (0)