Skip to content

Commit 2016c0b

Browse files
acassissimbit18
authored andcommitted
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 2ee0820 commit 2016c0b

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ add_subdirectory(logging)
6060
add_subdirectory(lte)
6161
add_subdirectory(math)
6262
add_subdirectory(mlearning)
63-
add_subdirectory(modbus)
6463
add_subdirectory(netutils)
6564
add_subdirectory(nshlib)
6665
add_subdirectory(platform)

industry/modbus/Make.defs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
#
2121
############################################################################
2222

23-
include $(wildcard $(APPDIR)/modbus/*/Make.defs)
23+
include $(wildcard $(APPDIR)/industry/modbus/*/Make.defs)

industry/modbus/freemodbus/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ config INDUSTRY_MODBUS_MASTER
153153
config MB_ASCII_MASTER
154154
bool "Modbus ASCII master"
155155
default n
156-
depends on MODBUS_MASTER
156+
depends on INDUSTRY_MODBUS_MASTER
157157

158158
config MB_RTU_MASTER
159159
bool "Modbus RTU master"
160160
default n
161-
depends on MODBUS_MASTER
161+
depends on INDUSTRY_MODBUS_MASTER
162162

163163
config MB_PORT_HAS_CLOSE
164164
bool "Platform close callbacks"
165165
default n
166-
depends on MODBUS_MASTER
166+
depends on INDUSTRY_MODBUS_MASTER
167167
---help---
168168
A port which wants to get an callback must select
169169
CONFIG_MB_HAS_CLOSE and provide vMBMasterPortClose() as
@@ -250,7 +250,7 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED
250250
If the Read/Write Multiple Registers function should be enabled.
251251

252252
endif # MB_ASCII_MASTER || MB_RTU_MASTER
253-
endif # MODBUS
253+
endif # INDUSTRY_MODBUS
254254

255255
config INDUSTRY_MODBUS_DISABLE_LOG
256256
bool "Disable logging for FreeModBus"

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/industry/modbus/ascii/mbascii.c
2+
* apps/industry/modbus/freemodbus/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)