From fcfd6c4d7ca3cc8d2751652a79a08d64eb8ec5a3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 21 Jul 2012 14:56:21 +0000 Subject: FreeModBus is now integrated with the Nuttx configuration system git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4961 42af7a65-404d-4744-a932-0658087f49c3 --- apps/include/modbus/mb.h | 8 +-- apps/include/modbus/mbconfig.h | 132 ----------------------------------------- apps/include/modbus/mbfunc.h | 20 +++---- 3 files changed, 14 insertions(+), 146 deletions(-) delete mode 100644 apps/include/modbus/mbconfig.h (limited to 'apps/include') diff --git a/apps/include/modbus/mb.h b/apps/include/modbus/mb.h index 8d6be7b42..b534c178a 100644 --- a/apps/include/modbus/mb.h +++ b/apps/include/modbus/mb.h @@ -224,7 +224,7 @@ eMBErrorCode eMBPoll( void ); * \brief Configure the slave id of the device. * * This function should be called when the Modbus function Report Slave ID - * is enabled ( By defining MB_FUNC_OTHER_REP_SLAVEID_ENABLED in mbconfig.h ). + * is enabled (By defining CONFIG_MB_FUNC_OTHER_REP_SLAVEID_ENABLED in .config ). * * \param ucSlaveID Values is returned in the Slave ID byte of the * Report Slave ID response. @@ -234,8 +234,8 @@ eMBErrorCode eMBPoll( void ); * bytes of the Report Slave ID response. * \param usAdditionalLen Length of the buffer pucAdditonal. * - * \return If the static buffer defined by MB_FUNC_OTHER_REP_SLAVEID_BUF in - * mbconfig.h is to small it returns eMBErrorCode::MB_ENORES. Otherwise + * \return If the static buffer defined by CONFIG_MB_FUNC_OTHER_REP_SLAVEID_BUF + * is too small it returns eMBErrorCode::MB_ENORES. Otherwise * it returns eMBErrorCode::MB_ENOERR. */ eMBErrorCode eMBSetSlaveID( UCHAR ucSlaveID, BOOL xIsRunning, @@ -259,7 +259,7 @@ eMBErrorCode eMBSetSlaveID( UCHAR ucSlaveID, BOOL xIsRunning, * * \return eMBErrorCode::MB_ENOERR if the handler has been installed. If no * more resources are available it returns eMBErrorCode::MB_ENORES. In this - * case the values in mbconfig.h should be adjusted. If the argument was not + * case the values in config.h should be adjusted. If the argument was not * valid it returns eMBErrorCode::MB_EINVAL. */ eMBErrorCode eMBRegisterCB( UCHAR ucFunctionCode, diff --git a/apps/include/modbus/mbconfig.h b/apps/include/modbus/mbconfig.h deleted file mode 100644 index 21252ae58..000000000 --- a/apps/include/modbus/mbconfig.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. - * Copyright (c) 2006 Christian Walter - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * File: $Id: mbconfig.h,v 1.15 2010/06/06 13:54:40 wolti Exp $ - */ - -#ifndef _MB_CONFIG_H -#define _MB_CONFIG_H - -#ifdef __cplusplus -PR_BEGIN_EXTERN_C -#endif -/* ----------------------- Defines ------------------------------------------*/ -/*! \defgroup modbus_cfg Modbus Configuration - * - * Most modules in the protocol stack are completly optional and can be - * excluded. This is specially important if target resources are very small - * and program memory space should be saved.
- * - * All of these settings are available in the file mbconfig.h - */ -/*! \addtogroup modbus_cfg - * @{ - */ -/*! \brief If Modbus ASCII support is enabled. */ -#define MB_ASCII_ENABLED ( 1 ) - -/*! \brief If Modbus RTU support is enabled. */ -#define MB_RTU_ENABLED ( 1 ) - -/*! \brief If Modbus TCP support is enabled. */ -#define MB_TCP_ENABLED ( 0 ) - -/*! \brief The character timeout value for Modbus ASCII. - * - * The character timeout value is not fixed for Modbus ASCII and is therefore - * a configuration option. It should be set to the maximum expected delay - * time of the network. - */ -#define MB_ASCII_TIMEOUT_SEC ( 1 ) - -/*! \brief Timeout to wait in ASCII prior to enabling transmitter. - * - * If defined the function calls vMBPortSerialDelay with the argument - * MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS to allow for a delay before - * the serial transmitter is enabled. This is required because some - * targets are so fast that there is no time between receiving and - * transmitting the frame. If the master is to slow with enabling its - * receiver then he will not receive the response correctly. - */ -#ifndef MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS -#define MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS ( 0 ) -#endif - -/*! \brief Maximum number of Modbus functions codes the protocol stack - * should support. - * - * The maximum number of supported Modbus functions must be greater than - * the sum of all enabled functions in this file and custom function - * handlers. If set to small adding more functions will fail. - */ -#define MB_FUNC_HANDLERS_MAX ( 16 ) - -/*! \brief Number of bytes which should be allocated for the Report Slave ID - * command. - * - * This number limits the maximum size of the additional segment in the - * report slave id function. See eMBSetSlaveID( ) for more information on - * how to set this value. It is only used if MB_FUNC_OTHER_REP_SLAVEID_ENABLED - * is set to 1. - */ -#define MB_FUNC_OTHER_REP_SLAVEID_BUF ( 32 ) - -/*! \brief If the Report Slave ID function should be enabled. */ -#define MB_FUNC_OTHER_REP_SLAVEID_ENABLED ( 1 ) - -/*! \brief If the Read Input Registers function should be enabled. */ -#define MB_FUNC_READ_INPUT_ENABLED ( 1 ) - -/*! \brief If the Read Holding Registers function should be enabled. */ -#define MB_FUNC_READ_HOLDING_ENABLED ( 1 ) - -/*! \brief If the Write Single Register function should be enabled. */ -#define MB_FUNC_WRITE_HOLDING_ENABLED ( 1 ) - -/*! \brief If the Write Multiple registers function should be enabled. */ -#define MB_FUNC_WRITE_MULTIPLE_HOLDING_ENABLED ( 1 ) - -/*! \brief If the Read Coils function should be enabled. */ -#define MB_FUNC_READ_COILS_ENABLED ( 1 ) - -/*! \brief If the Write Coils function should be enabled. */ -#define MB_FUNC_WRITE_COIL_ENABLED ( 1 ) - -/*! \brief If the Write Multiple Coils function should be enabled. */ -#define MB_FUNC_WRITE_MULTIPLE_COILS_ENABLED ( 1 ) - -/*! \brief If the Read Discrete Inputs function should be enabled. */ -#define MB_FUNC_READ_DISCRETE_INPUTS_ENABLED ( 1 ) - -/*! \brief If the Read/Write Multiple Registers function should be enabled. */ -#define MB_FUNC_READWRITE_HOLDING_ENABLED ( 1 ) - -/*! @} */ -#ifdef __cplusplus - PR_END_EXTERN_C -#endif -#endif diff --git a/apps/include/modbus/mbfunc.h b/apps/include/modbus/mbfunc.h index aea14f759..d948ec72b 100644 --- a/apps/include/modbus/mbfunc.h +++ b/apps/include/modbus/mbfunc.h @@ -34,43 +34,43 @@ #ifdef __cplusplus PR_BEGIN_EXTERN_C #endif -#if MB_FUNC_OTHER_REP_SLAVEID_BUF > 0 +#ifdef CONFIG_MB_FUNC_OTHER_REP_SLAVEID_BUF eMBException eMBFuncReportSlaveID( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_READ_INPUT_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_READ_INPUT_ENABLED eMBException eMBFuncReadInputRegister( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_READ_HOLDING_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_READ_HOLDING_ENABLED eMBException eMBFuncReadHoldingRegister( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_WRITE_HOLDING_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_WRITE_HOLDING_ENABLED eMBException eMBFuncWriteHoldingRegister( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_WRITE_MULTIPLE_HOLDING_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_WRITE_MULTIPLE_HOLDING_ENABLED eMBException eMBFuncWriteMultipleHoldingRegister( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_READ_COILS_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_READ_COILS_ENABLED eMBException eMBFuncReadCoils( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_WRITE_COIL_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_WRITE_COIL_ENABLED eMBException eMBFuncWriteCoil( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_WRITE_MULTIPLE_COILS_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_WRITE_MULTIPLE_COILS_ENABLED eMBException eMBFuncWriteMultipleCoils( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_READ_DISCRETE_INPUTS_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_READ_DISCRETE_INPUTS_ENABLED eMBException eMBFuncReadDiscreteInputs( UCHAR * pucFrame, USHORT * usLen ); #endif -#if MB_FUNC_READWRITE_HOLDING_ENABLED > 0 +#ifdef CONFIG_MB_FUNC_READWRITE_HOLDING_ENABLED eMBException eMBFuncReadWriteMultipleHoldingRegister( UCHAR * pucFrame, USHORT * usLen ); #endif -- cgit v1.2.3