diff --git a/CMakeLists.txt b/CMakeLists.txt index 84844e70033..3ebffdd9426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ add_subdirectory(logging) add_subdirectory(lte) add_subdirectory(math) add_subdirectory(mlearning) -add_subdirectory(modbus) add_subdirectory(netutils) add_subdirectory(nshlib) add_subdirectory(platform) diff --git a/modbus/.gitignore b/industry/modbus/.gitignore similarity index 100% rename from modbus/.gitignore rename to industry/modbus/.gitignore diff --git a/modbus/CMakeLists.txt b/industry/modbus/CMakeLists.txt similarity index 96% rename from modbus/CMakeLists.txt rename to industry/modbus/CMakeLists.txt index 781050084cc..89038a9a70b 100644 --- a/modbus/CMakeLists.txt +++ b/industry/modbus/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/modbus/CMakeLists.txt +# apps/industry/modbus/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/modbus/Make.defs b/industry/modbus/Make.defs similarity index 91% rename from modbus/Make.defs rename to industry/modbus/Make.defs index 03e07693acd..b358e9be4ce 100644 --- a/modbus/Make.defs +++ b/industry/modbus/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/Make.defs +# apps/industry/modbus/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -20,4 +20,4 @@ # ############################################################################ -include $(wildcard $(APPDIR)/modbus/*/Make.defs) +include $(wildcard $(APPDIR)/industry/modbus/*/Make.defs) diff --git a/modbus/Makefile b/industry/modbus/Makefile similarity index 96% rename from modbus/Makefile rename to industry/modbus/Makefile index 5858b4b4a43..320c97faf35 100644 --- a/modbus/Makefile +++ b/industry/modbus/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/Makefile +# apps/industry/modbus/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/modbus/freemodbus/CMakeLists.txt b/industry/modbus/freemodbus/CMakeLists.txt similarity index 94% rename from modbus/freemodbus/CMakeLists.txt rename to industry/modbus/freemodbus/CMakeLists.txt index a9980f5979b..d49e6c069df 100644 --- a/modbus/freemodbus/CMakeLists.txt +++ b/industry/modbus/freemodbus/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/modbus/freemodbus/CMakeLists.txt +# apps/industry/modbus/freemodbus/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # @@ -20,11 +20,11 @@ # # ############################################################################## -if(CONFIG_MODBUS) +if(CONFIG_INDUSTRY_MODBUS) set(CSRCS) - if(CONFIG_MODBUS_SLAVE) + if(CONFIG_INDUSTRY_MODBUS_SLAVE) list(APPEND CSRCS mb.c) endif() @@ -63,7 +63,7 @@ if(CONFIG_MODBUS) list(APPEND CSRCS nuttx/portother.c) - if(CONFIG_MODBUS_SLAVE) + if(CONFIG_INDUSTRY_MODBUS_SLAVE) list(APPEND CSRCS nuttx/portevent.c nuttx/portserial.c nuttx/porttimer.c) endif() diff --git a/modbus/freemodbus/Kconfig b/industry/modbus/freemodbus/Kconfig similarity index 95% rename from modbus/freemodbus/Kconfig rename to industry/modbus/freemodbus/Kconfig index d891d181c38..7c9e834f3c4 100644 --- a/modbus/freemodbus/Kconfig +++ b/industry/modbus/freemodbus/Kconfig @@ -4,11 +4,11 @@ # menu "FreeModBus" -config MODBUS +config INDUSTRY_MODBUS bool "Modbus support using FreeModbus" default n -if MODBUS +if INDUSTRY_MODBUS config MB_FUNC_HANDLERS_MAX int "Maximum number of Modbus functions" @@ -20,11 +20,11 @@ config MB_FUNC_HANDLERS_MAX the sum of all enabled functions in this file and custom function handlers. If set to small adding more functions will fail. -config MODBUS_SLAVE +config INDUSTRY_MODBUS_SLAVE bool "Modbus slave support via FreeModBus" default n -if MODBUS_SLAVE +if INDUSTRY_MODBUS_SLAVE config MB_ASCII_ENABLED bool "Modbus ASCII support" default y @@ -144,26 +144,26 @@ config MB_FUNC_READWRITE_HOLDING_ENABLED ---help--- If the Read/Write Multiple Registers function should be enabled. -endif # MODBUS_SLAVE +endif # INDUSTRY_MODBUS_SLAVE -config MODBUS_MASTER +config INDUSTRY_MODBUS_MASTER bool "Modbus Master support via FreeModBus" default n config MB_ASCII_MASTER bool "Modbus ASCII master" default n - depends on MODBUS_MASTER + depends on INDUSTRY_MODBUS_MASTER config MB_RTU_MASTER bool "Modbus RTU master" default n - depends on MODBUS_MASTER + depends on INDUSTRY_MODBUS_MASTER config MB_PORT_HAS_CLOSE bool "Platform close callbacks" default n - depends on MODBUS_MASTER + depends on INDUSTRY_MODBUS_MASTER ---help--- A port which wants to get an callback must select CONFIG_MB_HAS_CLOSE and provide vMBMasterPortClose() as @@ -250,9 +250,9 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED If the Read/Write Multiple Registers function should be enabled. endif # MB_ASCII_MASTER || MB_RTU_MASTER -endif # MODBUS +endif # INDUSTRY_MODBUS -config MODBUS_DISABLE_LOG +config INDUSTRY_MODBUS_DISABLE_LOG bool "Disable logging for FreeModBus" default !FILE_STREAM ---help--- diff --git a/modbus/freemodbus/Make.defs b/industry/modbus/freemodbus/Make.defs similarity index 87% rename from modbus/freemodbus/Make.defs rename to industry/modbus/freemodbus/Make.defs index 6eac9db77c0..7d867a0aaef 100644 --- a/modbus/freemodbus/Make.defs +++ b/industry/modbus/freemodbus/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/Make.defs +# apps/industry/modbus/freemodbus/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -20,6 +20,6 @@ # ############################################################################ -ifneq ($(CONFIG_MODBUS),) -CONFIGURED_APPS += $(APPDIR)/modbus/freemodbus +ifneq ($(CONFIG_INDUSTRY_MODBUS),) +CONFIGURED_APPS += $(APPDIR)/industry/modbus/freemodbus endif diff --git a/modbus/freemodbus/Makefile b/industry/modbus/freemodbus/Makefile similarity index 91% rename from modbus/freemodbus/Makefile rename to industry/modbus/freemodbus/Makefile index 6d45f7650dd..dddb6559aab 100644 --- a/modbus/freemodbus/Makefile +++ b/industry/modbus/freemodbus/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/Makefile +# apps/industry/modbus/freemodbus/Makefile # # SPDX-License-Identifier: Apache-2.0 # @@ -24,9 +24,9 @@ include $(APPDIR)/Make.defs # FreeModBus Library -ifeq ($(CONFIG_MODBUS),y) +ifeq ($(CONFIG_INDUSTRY_MODBUS),y) - ifeq ($(CONFIG_MODBUS_SLAVE),y) + ifeq ($(CONFIG_INDUSTRY_MODBUS_SLAVE),y) CSRCS += mb.c endif diff --git a/modbus/freemodbus/ascii/Make.defs b/industry/modbus/freemodbus/ascii/Make.defs similarity index 90% rename from modbus/freemodbus/ascii/Make.defs rename to industry/modbus/freemodbus/ascii/Make.defs index 2f2745828bc..c2fcf221836 100644 --- a/modbus/freemodbus/ascii/Make.defs +++ b/industry/modbus/freemodbus/ascii/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/ascii/Make.defs +# apps/industry/modbus/freemodbus/ascii/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -26,6 +26,6 @@ CSRCS += mbascii.c DEPPATH += --dep-path ascii VPATH += :ascii -CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/ascii +CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/ascii endif diff --git a/modbus/freemodbus/ascii/mbascii.c b/industry/modbus/freemodbus/ascii/mbascii.c similarity index 99% rename from modbus/freemodbus/ascii/mbascii.c rename to industry/modbus/freemodbus/ascii/mbascii.c index 3540628ad53..1ba55f99ce3 100644 --- a/modbus/freemodbus/ascii/mbascii.c +++ b/industry/modbus/freemodbus/ascii/mbascii.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/ascii/mbascii.c + * apps/industry/modbus/freemodbus/ascii/mbascii.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/ascii/mbascii.h b/industry/modbus/freemodbus/ascii/mbascii.h similarity index 98% rename from modbus/freemodbus/ascii/mbascii.h rename to industry/modbus/freemodbus/ascii/mbascii.h index 355484103ef..5351de010e3 100644 --- a/modbus/freemodbus/ascii/mbascii.h +++ b/industry/modbus/freemodbus/ascii/mbascii.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/ascii/mbascii.h + * apps/industry/modbus/ascii/mbascii.h * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/functions/Make.defs b/industry/modbus/freemodbus/functions/Make.defs similarity index 91% rename from modbus/freemodbus/functions/Make.defs rename to industry/modbus/freemodbus/functions/Make.defs index c59393a2a17..7c53d5bfc8b 100644 --- a/modbus/freemodbus/functions/Make.defs +++ b/industry/modbus/freemodbus/functions/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/functions/Make.defs +# apps/industry/modbus/freemodbus/functions/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -33,4 +33,4 @@ endif DEPPATH += --dep-path functions VPATH += :functions -CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/functions +CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/functions diff --git a/modbus/freemodbus/functions/mbfunccoils.c b/industry/modbus/freemodbus/functions/mbfunccoils.c similarity index 100% rename from modbus/freemodbus/functions/mbfunccoils.c rename to industry/modbus/freemodbus/functions/mbfunccoils.c diff --git a/modbus/freemodbus/functions/mbfunccoils_m.c b/industry/modbus/freemodbus/functions/mbfunccoils_m.c similarity index 99% rename from modbus/freemodbus/functions/mbfunccoils_m.c rename to industry/modbus/freemodbus/functions/mbfunccoils_m.c index c258d757db8..ca59e4cafd4 100644 --- a/modbus/freemodbus/functions/mbfunccoils_m.c +++ b/industry/modbus/freemodbus/functions/mbfunccoils_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/functions/mbfunccoils_m.c + * apps/industry/modbus/functions/mbfunccoils_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 Armink diff --git a/modbus/freemodbus/functions/mbfuncdiag.c b/industry/modbus/freemodbus/functions/mbfuncdiag.c similarity index 97% rename from modbus/freemodbus/functions/mbfuncdiag.c rename to industry/modbus/freemodbus/functions/mbfuncdiag.c index b34581e6e7d..c9add6fd422 100644 --- a/modbus/freemodbus/functions/mbfuncdiag.c +++ b/industry/modbus/freemodbus/functions/mbfuncdiag.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/functions/mbfuncdiag.c + * apps/industry/modbus/functions/mbfuncdiag.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/functions/mbfuncdisc.c b/industry/modbus/freemodbus/functions/mbfuncdisc.c similarity index 100% rename from modbus/freemodbus/functions/mbfuncdisc.c rename to industry/modbus/freemodbus/functions/mbfuncdisc.c diff --git a/modbus/freemodbus/functions/mbfuncdisc_m.c b/industry/modbus/freemodbus/functions/mbfuncdisc_m.c similarity index 99% rename from modbus/freemodbus/functions/mbfuncdisc_m.c rename to industry/modbus/freemodbus/functions/mbfuncdisc_m.c index 29386996d51..770ab899dc0 100644 --- a/modbus/freemodbus/functions/mbfuncdisc_m.c +++ b/industry/modbus/freemodbus/functions/mbfuncdisc_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/functions/mbfuncdisc_m.c + * apps/industry/modbus/functions/mbfuncdisc_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 Armink diff --git a/modbus/freemodbus/functions/mbfuncholding.c b/industry/modbus/freemodbus/functions/mbfuncholding.c similarity index 100% rename from modbus/freemodbus/functions/mbfuncholding.c rename to industry/modbus/freemodbus/functions/mbfuncholding.c diff --git a/modbus/freemodbus/functions/mbfuncholding_m.c b/industry/modbus/freemodbus/functions/mbfuncholding_m.c similarity index 99% rename from modbus/freemodbus/functions/mbfuncholding_m.c rename to industry/modbus/freemodbus/functions/mbfuncholding_m.c index b017be7154d..59be35b2608 100644 --- a/modbus/freemodbus/functions/mbfuncholding_m.c +++ b/industry/modbus/freemodbus/functions/mbfuncholding_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/functions/mbfuncholding_m.c + * apps/industry/modbus/functions/mbfuncholding_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 Armink diff --git a/modbus/freemodbus/functions/mbfuncinput.c b/industry/modbus/freemodbus/functions/mbfuncinput.c similarity index 100% rename from modbus/freemodbus/functions/mbfuncinput.c rename to industry/modbus/freemodbus/functions/mbfuncinput.c diff --git a/modbus/freemodbus/functions/mbfuncinput_m.c b/industry/modbus/freemodbus/functions/mbfuncinput_m.c similarity index 99% rename from modbus/freemodbus/functions/mbfuncinput_m.c rename to industry/modbus/freemodbus/functions/mbfuncinput_m.c index 4ca7e811349..2d479903762 100644 --- a/modbus/freemodbus/functions/mbfuncinput_m.c +++ b/industry/modbus/freemodbus/functions/mbfuncinput_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/functions/mbfuncinput_m.c + * apps/industry/modbus/functions/mbfuncinput_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 Armink diff --git a/modbus/freemodbus/functions/mbfuncother.c b/industry/modbus/freemodbus/functions/mbfuncother.c similarity index 100% rename from modbus/freemodbus/functions/mbfuncother.c rename to industry/modbus/freemodbus/functions/mbfuncother.c diff --git a/modbus/freemodbus/functions/mbutils.c b/industry/modbus/freemodbus/functions/mbutils.c similarity index 100% rename from modbus/freemodbus/functions/mbutils.c rename to industry/modbus/freemodbus/functions/mbutils.c diff --git a/modbus/freemodbus/mb.c b/industry/modbus/freemodbus/mb.c similarity index 99% rename from modbus/freemodbus/mb.c rename to industry/modbus/freemodbus/mb.c index 16f5567d887..3d4b9bf5a72 100644 --- a/modbus/freemodbus/mb.c +++ b/industry/modbus/freemodbus/mb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/mb.c + * apps/industry/modbus/mb.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/mb_m.c b/industry/modbus/freemodbus/mb_m.c similarity index 100% rename from modbus/freemodbus/mb_m.c rename to industry/modbus/freemodbus/mb_m.c diff --git a/modbus/freemodbus/nuttx/Make.defs b/industry/modbus/freemodbus/nuttx/Make.defs similarity index 88% rename from modbus/freemodbus/nuttx/Make.defs rename to industry/modbus/freemodbus/nuttx/Make.defs index 723284cc480..1c3413ce30b 100644 --- a/modbus/freemodbus/nuttx/Make.defs +++ b/industry/modbus/freemodbus/nuttx/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/nuttx/Make.defs +# apps/industry/modbus/freemodbus/nuttx/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -22,7 +22,7 @@ CSRCS += portother.c -ifeq ($(CONFIG_MODBUS_SLAVE),y) +ifeq ($(CONFIG_INDUSTRY_MODBUS_SLAVE),y) CSRCS += portevent.c portserial.c porttimer.c endif @@ -32,4 +32,4 @@ endif DEPPATH += --dep-path nuttx VPATH += :nuttx -CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/nuttx +CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/nuttx diff --git a/modbus/freemodbus/nuttx/port.h b/industry/modbus/freemodbus/nuttx/port.h similarity index 94% rename from modbus/freemodbus/nuttx/port.h rename to industry/modbus/freemodbus/nuttx/port.h index c79dcdd9886..149cefad2e7 100644 --- a/modbus/freemodbus/nuttx/port.h +++ b/industry/modbus/freemodbus/nuttx/port.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/port.h + * apps/industry/modbus/nuttx/port.h * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter @@ -28,8 +28,8 @@ * ****************************************************************************/ -#ifndef __APPS_MODBUS_NUTTX_PORT_H -#define __APPS_MODBUS_NUTTX_PORT_H +#ifndef __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H +#define __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ typedef enum void vMBPortEnterCritical(void); void vMBPortExitCritical(void); -#ifndef CONFIG_MODBUS_DISABLE_LOG +#ifndef CONFIG_INDUSTRY_MODBUS_DISABLE_LOG void vMBPortLog(eMBPortLogLevel eLevel, const char *szModule, const char *szFmt, ...) printf_like(3, 4); #else @@ -103,4 +103,4 @@ bool xMBPortSerialSetTimeout(uint32_t dwTimeoutMs); } #endif -#endif /* __APPS_MODBUS_NUTTX_PORT_H */ +#endif /* __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H */ diff --git a/modbus/freemodbus/nuttx/portevent.c b/industry/modbus/freemodbus/nuttx/portevent.c similarity index 98% rename from modbus/freemodbus/nuttx/portevent.c rename to industry/modbus/freemodbus/nuttx/portevent.c index bce6e9c5454..d9d31072df4 100644 --- a/modbus/freemodbus/nuttx/portevent.c +++ b/industry/modbus/freemodbus/nuttx/portevent.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portevent.c + * apps/industry/modbus/nuttx/portevent.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/portevent_m.c b/industry/modbus/freemodbus/nuttx/portevent_m.c similarity index 99% rename from modbus/freemodbus/nuttx/portevent_m.c rename to industry/modbus/freemodbus/nuttx/portevent_m.c index fb40f4dee24..90d0c0e6e2d 100644 --- a/modbus/freemodbus/nuttx/portevent_m.c +++ b/industry/modbus/freemodbus/nuttx/portevent_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portevent_m.c + * apps/industry/modbus/nuttx/portevent_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/portother.c b/industry/modbus/freemodbus/nuttx/portother.c similarity index 97% rename from modbus/freemodbus/nuttx/portother.c rename to industry/modbus/freemodbus/nuttx/portother.c index 3de2a38b5bc..b6c4731d99d 100644 --- a/modbus/freemodbus/nuttx/portother.c +++ b/industry/modbus/freemodbus/nuttx/portother.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portother.c + * apps/industry/modbus/nuttx/portother.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter @@ -73,7 +73,7 @@ void vMBPortLogFile(FILE * fNewLogFile) fLogFile = fNewLogFile; } -#ifndef CONFIG_MODBUS_DISABLE_LOG +#ifndef CONFIG_INDUSTRY_MODBUS_DISABLE_LOG void vMBPortLog(eMBPortLogLevel eLevel, const char * szModule, const char * szFmt, ...) { diff --git a/modbus/freemodbus/nuttx/portother_m.c b/industry/modbus/freemodbus/nuttx/portother_m.c similarity index 98% rename from modbus/freemodbus/nuttx/portother_m.c rename to industry/modbus/freemodbus/nuttx/portother_m.c index 1d703c1926e..9ee337f2a3f 100644 --- a/modbus/freemodbus/nuttx/portother_m.c +++ b/industry/modbus/freemodbus/nuttx/portother_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portother_m.c + * apps/industry/modbus/nuttx/portother_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/portserial.c b/industry/modbus/freemodbus/nuttx/portserial.c similarity index 99% rename from modbus/freemodbus/nuttx/portserial.c rename to industry/modbus/freemodbus/nuttx/portserial.c index 35155a732f5..4cb502aa5f0 100644 --- a/modbus/freemodbus/nuttx/portserial.c +++ b/industry/modbus/freemodbus/nuttx/portserial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portserial.c + * apps/industry/modbus/nuttx/portserial.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/portserial_m.c b/industry/modbus/freemodbus/nuttx/portserial_m.c similarity index 99% rename from modbus/freemodbus/nuttx/portserial_m.c rename to industry/modbus/freemodbus/nuttx/portserial_m.c index 98c11eb2842..d7fc255262d 100644 --- a/modbus/freemodbus/nuttx/portserial_m.c +++ b/industry/modbus/freemodbus/nuttx/portserial_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/portserial_m.c + * apps/industry/modbus/nuttx/portserial_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/porttimer.c b/industry/modbus/freemodbus/nuttx/porttimer.c similarity index 98% rename from modbus/freemodbus/nuttx/porttimer.c rename to industry/modbus/freemodbus/nuttx/porttimer.c index 1685df6eeb1..d09561f4bde 100644 --- a/modbus/freemodbus/nuttx/porttimer.c +++ b/industry/modbus/freemodbus/nuttx/porttimer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/porttimer.c + * apps/industry/modbus/nuttx/porttimer.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/nuttx/porttimer_m.c b/industry/modbus/freemodbus/nuttx/porttimer_m.c similarity index 99% rename from modbus/freemodbus/nuttx/porttimer_m.c rename to industry/modbus/freemodbus/nuttx/porttimer_m.c index 1e878aa00a6..8d9f3f3af94 100644 --- a/modbus/freemodbus/nuttx/porttimer_m.c +++ b/industry/modbus/freemodbus/nuttx/porttimer_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/nuttx/porttimer_m.c + * apps/industry/modbus/nuttx/porttimer_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/rtu/Make.defs b/industry/modbus/freemodbus/rtu/Make.defs similarity index 91% rename from modbus/freemodbus/rtu/Make.defs rename to industry/modbus/freemodbus/rtu/Make.defs index 43576f993b4..46656017dad 100644 --- a/modbus/freemodbus/rtu/Make.defs +++ b/industry/modbus/freemodbus/rtu/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/rtu/Make.defs +# apps/industry/modbus/freemodbus/rtu/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -40,6 +40,6 @@ endif DEPPATH += --dep-path rtu VPATH += :rtu -CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/rtu +CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/rtu endif diff --git a/modbus/freemodbus/rtu/mbcrc.c b/industry/modbus/freemodbus/rtu/mbcrc.c similarity index 99% rename from modbus/freemodbus/rtu/mbcrc.c rename to industry/modbus/freemodbus/rtu/mbcrc.c index dcaddec7193..df16f13e0fe 100644 --- a/modbus/freemodbus/rtu/mbcrc.c +++ b/industry/modbus/freemodbus/rtu/mbcrc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/rtu/mbcrc.c + * apps/industry/modbus/rtu/mbcrc.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/rtu/mbcrc.h b/industry/modbus/freemodbus/rtu/mbcrc.h similarity index 100% rename from modbus/freemodbus/rtu/mbcrc.h rename to industry/modbus/freemodbus/rtu/mbcrc.h diff --git a/modbus/freemodbus/rtu/mbrtu.c b/industry/modbus/freemodbus/rtu/mbrtu.c similarity index 99% rename from modbus/freemodbus/rtu/mbrtu.c rename to industry/modbus/freemodbus/rtu/mbrtu.c index 0f8262d4fc9..ead36d16481 100644 --- a/modbus/freemodbus/rtu/mbrtu.c +++ b/industry/modbus/freemodbus/rtu/mbrtu.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/rtu/mbrtu.c + * apps/industry/modbus/rtu/mbrtu.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/rtu/mbrtu.h b/industry/modbus/freemodbus/rtu/mbrtu.h similarity index 98% rename from modbus/freemodbus/rtu/mbrtu.h rename to industry/modbus/freemodbus/rtu/mbrtu.h index 418311bffd1..ff31a1844e7 100644 --- a/modbus/freemodbus/rtu/mbrtu.h +++ b/industry/modbus/freemodbus/rtu/mbrtu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/rtu/mbrtu.h + * apps/industry/modbus/rtu/mbrtu.h * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/rtu/mbrtu_m.c b/industry/modbus/freemodbus/rtu/mbrtu_m.c similarity index 99% rename from modbus/freemodbus/rtu/mbrtu_m.c rename to industry/modbus/freemodbus/rtu/mbrtu_m.c index ed8e62488b5..4a67a0508bd 100644 --- a/modbus/freemodbus/rtu/mbrtu_m.c +++ b/industry/modbus/freemodbus/rtu/mbrtu_m.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/rtu/mbrtu_m.c + * apps/industry/modbus/rtu/mbrtu_m.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 China Beijing Armink diff --git a/modbus/freemodbus/rtu/mbrtu_m.h b/industry/modbus/freemodbus/rtu/mbrtu_m.h similarity index 98% rename from modbus/freemodbus/rtu/mbrtu_m.h rename to industry/modbus/freemodbus/rtu/mbrtu_m.h index 5fb2eee43ef..b59652b59c1 100644 --- a/modbus/freemodbus/rtu/mbrtu_m.h +++ b/industry/modbus/freemodbus/rtu/mbrtu_m.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/rtu/mbrtu_m.h + * apps/industry/modbus/rtu/mbrtu_m.h * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2013 China Beijing Armink diff --git a/modbus/freemodbus/tcp/Make.defs b/industry/modbus/freemodbus/tcp/Make.defs similarity index 90% rename from modbus/freemodbus/tcp/Make.defs rename to industry/modbus/freemodbus/tcp/Make.defs index b9f82c6de84..281a9a5bea4 100644 --- a/modbus/freemodbus/tcp/Make.defs +++ b/industry/modbus/freemodbus/tcp/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/modbus/freemodbus/tcp/Make.defs +# apps/industry/modbus/freemodbus/tcp/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -26,6 +26,6 @@ CSRCS += mbtcp.c DEPPATH += --dep-path tcp VPATH += :tcp -CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/tcp +CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/tcp endif diff --git a/modbus/freemodbus/tcp/mbtcp.c b/industry/modbus/freemodbus/tcp/mbtcp.c similarity index 99% rename from modbus/freemodbus/tcp/mbtcp.c rename to industry/modbus/freemodbus/tcp/mbtcp.c index ca9c41c433c..6957effb9ca 100644 --- a/modbus/freemodbus/tcp/mbtcp.c +++ b/industry/modbus/freemodbus/tcp/mbtcp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/tcp/mbtcp.c + * apps/industry/modbus/tcp/mbtcp.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter diff --git a/modbus/freemodbus/tcp/mbtcp.h b/industry/modbus/freemodbus/tcp/mbtcp.h similarity index 98% rename from modbus/freemodbus/tcp/mbtcp.h rename to industry/modbus/freemodbus/tcp/mbtcp.h index 39fa9c8ce44..26e380cb968 100644 --- a/modbus/freemodbus/tcp/mbtcp.h +++ b/industry/modbus/freemodbus/tcp/mbtcp.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/modbus/tcp/mbtcp.h + * apps/industry/modbus/tcp/mbtcp.h * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2006 Christian Walter