libs/FreeModbus_Slave-Master-RTT-STM32
libs
/
FreeModbus_Slave-Master-RTT-STM32
mirror of https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32.git
4
0
Fork 0
Code Issues Releases Wiki Activity

1、【修改】FreeModbus主机及从机回调函数中的起始地址，解决起始地址在使用过程中多一位的问题； 

Signed-off-by: armink <armink.ztl@gmail.com>
This commit is contained in:
armink 2013-12-07 14:18:00 +08:00
parent b9c50c0113
commit dfab58957d
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FreeModbus/port/user_mb_app.c
View File

@ -54,7 +54,7 @@ eMBErrorCode
eMBRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs ) eMBRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex; USHORT iRegIndex;
USHORT * pusRegInputBuf; USHORT * pusRegInputBuf;
UCHAR REG_INPUT_START; UCHAR REG_INPUT_START;
UCHAR REG_INPUT_NREGS; UCHAR REG_INPUT_NREGS;
@ -65,10 +65,11 @@ eMBRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs )
REG_INPUT_NREGS = S_REG_INPUT_NREGS; REG_INPUT_NREGS = S_REG_INPUT_NREGS;
usRegInStart = usSRegInStart; usRegInStart = usSRegInStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= REG_INPUT_START ) if( ( usAddress >= REG_INPUT_START )
&& ( usAddress + usNRegs <= REG_INPUT_START + REG_INPUT_NREGS ) ) && ( usAddress + usNRegs <= REG_INPUT_START + REG_INPUT_NREGS ) )
{ {
iRegIndex = ( int )( usAddress - usRegInStart ); iRegIndex = usAddress - usRegInStart;
while( usNRegs > 0 ) while( usNRegs > 0 )
{ {
*pucRegBuffer++ = (unsigned char) (pusRegInputBuf[iRegIndex] >> 8); *pucRegBuffer++ = (unsigned char) (pusRegInputBuf[iRegIndex] >> 8);
@ -100,7 +101,7 @@ eMBErrorCode
eMBRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode ) eMBRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex; USHORT iRegIndex;
USHORT * pusRegHoldingBuf; USHORT * pusRegHoldingBuf;
UCHAR REG_HOLDING_START; UCHAR REG_HOLDING_START;
UCHAR REG_HOLDING_NREGS; UCHAR REG_HOLDING_NREGS;
@ -111,10 +112,11 @@ eMBRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegi
REG_HOLDING_NREGS = S_REG_HOLDING_NREGS; REG_HOLDING_NREGS = S_REG_HOLDING_NREGS;
usRegHoldStart = usSRegHoldStart; usRegHoldStart = usSRegHoldStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= REG_HOLDING_START ) && if( ( usAddress >= REG_HOLDING_START ) &&
( usAddress + usNRegs <= REG_HOLDING_START + REG_HOLDING_NREGS ) ) ( usAddress + usNRegs <= REG_HOLDING_START + REG_HOLDING_NREGS ) )
{ {
iRegIndex = ( int )( usAddress - usRegHoldStart ); iRegIndex = usAddress - usRegHoldStart;
switch ( eMode ) switch ( eMode )
{ {
/* Pass current register values to the protocol stack. */ /* Pass current register values to the protocol stack. */
@ -163,7 +165,7 @@ eMBErrorCode
eMBRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode ) eMBRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex , iRegBitIndex , iNReg; USHORT iRegIndex , iRegBitIndex , iNReg;
UCHAR * pucCoilBuf; UCHAR * pucCoilBuf;
UCHAR COIL_START; UCHAR COIL_START;
UCHAR COIL_NCOILS; UCHAR COIL_NCOILS;
@ -175,10 +177,10 @@ eMBRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegis
COIL_NCOILS = S_COIL_NCOILS; COIL_NCOILS = S_COIL_NCOILS;
usCoilStart = usSCoilStart; usCoilStart = usSCoilStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= COIL_START ) && if( ( usAddress >= COIL_START ) &&
( usAddress + usNCoils <= COIL_START + COIL_NCOILS ) ) ( usAddress + usNCoils <= COIL_START + COIL_NCOILS ) )
{ {
usAddress-=usCoilStart; //计算绝对地址
iRegIndex = ( int )( usAddress - usCoilStart ) / 8 ; //每个寄存器存8个 iRegIndex = ( int )( usAddress - usCoilStart ) / 8 ; //每个寄存器存8个
iRegBitIndex = ( int )( usAddress - usCoilStart ) % 8 ; //相对于寄存器内部的位地址 iRegBitIndex = ( int )( usAddress - usCoilStart ) % 8 ; //相对于寄存器内部的位地址
switch ( eMode ) switch ( eMode )
@ -233,7 +235,7 @@ eMBErrorCode
eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete ) eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex , iRegBitIndex , iNReg; USHORT iRegIndex , iRegBitIndex , iNReg;
UCHAR * pucDiscreteInputBuf; UCHAR * pucDiscreteInputBuf;
UCHAR DISCRETE_INPUT_START; UCHAR DISCRETE_INPUT_START;
UCHAR DISCRETE_INPUT_NDISCRETES; UCHAR DISCRETE_INPUT_NDISCRETES;
@ -245,10 +247,10 @@ eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete )
DISCRETE_INPUT_NDISCRETES = S_DISCRETE_INPUT_NDISCRETES; DISCRETE_INPUT_NDISCRETES = S_DISCRETE_INPUT_NDISCRETES;
usDiscreteInputStart = usSDiscInStart; usDiscreteInputStart = usSDiscInStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= DISCRETE_INPUT_START ) if( ( usAddress >= DISCRETE_INPUT_START )
&& ( usAddress + usNDiscrete <= DISCRETE_INPUT_START + DISCRETE_INPUT_NDISCRETES ) ) && ( usAddress + usNDiscrete <= DISCRETE_INPUT_START + DISCRETE_INPUT_NDISCRETES ) )
{ {
usAddress-=usDiscreteInputStart; //计算绝对地址
iRegIndex = ( int )( usAddress - usDiscreteInputStart ) / 8 ; //每个寄存器存8个 iRegIndex = ( int )( usAddress - usDiscreteInputStart ) / 8 ; //每个寄存器存8个
iRegBitIndex = ( int )( usAddress - usDiscreteInputStart ) % 8 ; //相对于寄存器内部的位地址 iRegBitIndex = ( int )( usAddress - usDiscreteInputStart ) % 8 ; //相对于寄存器内部的位地址

16
FreeModbus/port/user_mb_app.h
View File

@ -8,13 +8,13 @@
#include "mbutils.h" #include "mbutils.h"
/* -----------------------Slave Defines -------------------------------------*/ /* -----------------------Slave Defines -------------------------------------*/
#define S_DISCRETE_INPUT_START 1 #define S_DISCRETE_INPUT_START 0
#define S_DISCRETE_INPUT_NDISCRETES 16 #define S_DISCRETE_INPUT_NDISCRETES 16
#define S_COIL_START 1 #define S_COIL_START 0
#define S_COIL_NCOILS 64 #define S_COIL_NCOILS 64
#define S_REG_INPUT_START 1 #define S_REG_INPUT_START 0
#define S_REG_INPUT_NREGS 100 #define S_REG_INPUT_NREGS 100
#define S_REG_HOLDING_START 1 #define S_REG_HOLDING_START 0
#define S_REG_HOLDING_NREGS 100 #define S_REG_HOLDING_NREGS 100
//从机模式：在保持寄存器中，各个地址对应的功能定义 //从机模式：在保持寄存器中，各个地址对应的功能定义
#define S_HD_RESERVE 0 //保留 #define S_HD_RESERVE 0 //保留
@ -31,13 +31,13 @@
#define S_DI_RESERVE 1 //保留 #define S_DI_RESERVE 1 //保留
/* -----------------------Master Defines -------------------------------------*/ /* -----------------------Master Defines -------------------------------------*/
#define M_DISCRETE_INPUT_START 1 #define M_DISCRETE_INPUT_START 0
#define M_DISCRETE_INPUT_NDISCRETES 16 #define M_DISCRETE_INPUT_NDISCRETES 16
#define M_COIL_START 1 #define M_COIL_START 0
#define M_COIL_NCOILS 64 #define M_COIL_NCOILS 64
#define M_REG_INPUT_START 1 #define M_REG_INPUT_START 0
#define M_REG_INPUT_NREGS 100 #define M_REG_INPUT_NREGS 100
#define M_REG_HOLDING_START 1 #define M_REG_HOLDING_START 0
#define M_REG_HOLDING_NREGS 100 #define M_REG_HOLDING_NREGS 100
//主机模式：在保持寄存器中，各个地址对应的功能定义 //主机模式：在保持寄存器中，各个地址对应的功能定义
#define M_HD_RESERVE 0 //保留 #define M_HD_RESERVE 0 //保留

18
FreeModbus/port/user_mb_app_m.c
View File

@ -56,7 +56,7 @@ eMBErrorCode
eMBMasterRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs ) eMBMasterRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex; USHORT iRegIndex;
USHORT * pusRegInputBuf; USHORT * pusRegInputBuf;
UCHAR REG_INPUT_START; UCHAR REG_INPUT_START;
UCHAR REG_INPUT_NREGS; UCHAR REG_INPUT_NREGS;
@ -67,10 +67,11 @@ eMBMasterRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs )
REG_INPUT_NREGS = M_REG_INPUT_NREGS; REG_INPUT_NREGS = M_REG_INPUT_NREGS;
usRegInStart = usMRegInStart; usRegInStart = usMRegInStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= REG_INPUT_START ) if( ( usAddress >= REG_INPUT_START )
&& ( usAddress + usNRegs <= REG_INPUT_START + REG_INPUT_NREGS ) ) && ( usAddress + usNRegs <= REG_INPUT_START + REG_INPUT_NREGS ) )
{ {
iRegIndex = ( int )( usAddress - usRegInStart ); iRegIndex = usAddress - usRegInStart;
while( usNRegs > 0 ) while( usNRegs > 0 )
{ {
pusRegInputBuf[iRegIndex] = *pucRegBuffer++ << 8; pusRegInputBuf[iRegIndex] = *pucRegBuffer++ << 8;
@ -102,7 +103,7 @@ eMBErrorCode
eMBMasterRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode ) eMBMasterRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex; USHORT iRegIndex;
USHORT * pusRegHoldingBuf; USHORT * pusRegHoldingBuf;
UCHAR REG_HOLDING_START; UCHAR REG_HOLDING_START;
UCHAR REG_HOLDING_NREGS; UCHAR REG_HOLDING_NREGS;
@ -115,10 +116,11 @@ eMBMasterRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, e
//If mode is read,the master will wirte the received date to bufffer. //If mode is read,the master will wirte the received date to bufffer.
eMode = MB_REG_WRITE; eMode = MB_REG_WRITE;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= REG_HOLDING_START ) && if( ( usAddress >= REG_HOLDING_START ) &&
( usAddress + usNRegs <= REG_HOLDING_START + REG_HOLDING_NREGS ) ) ( usAddress + usNRegs <= REG_HOLDING_START + REG_HOLDING_NREGS ) )
{ {
iRegIndex = ( int )( usAddress - usRegHoldStart ); iRegIndex = usAddress - usRegHoldStart;
switch ( eMode ) switch ( eMode )
{ {
/* Pass current register values to the protocol stack. */ /* Pass current register values to the protocol stack. */
@ -167,7 +169,7 @@ eMBErrorCode
eMBMasterRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode ) eMBMasterRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex , iRegBitIndex , iNReg; USHORT iRegIndex , iRegBitIndex , iNReg;
UCHAR * pucCoilBuf; UCHAR * pucCoilBuf;
UCHAR COIL_START; UCHAR COIL_START;
UCHAR COIL_NCOILS; UCHAR COIL_NCOILS;
@ -181,10 +183,10 @@ eMBMasterRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eM
//If mode is read,the master will wirte the received date to bufffer. //If mode is read,the master will wirte the received date to bufffer.
eMode = MB_REG_WRITE; eMode = MB_REG_WRITE;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= COIL_START ) && if( ( usAddress >= COIL_START ) &&
( usAddress + usNCoils <= COIL_START + COIL_NCOILS ) ) ( usAddress + usNCoils <= COIL_START + COIL_NCOILS ) )
{ {
usAddress-=usCoilStart; //计算绝对地址
iRegIndex = ( int )( usAddress - usCoilStart ) / 8 ; //每个寄存器存8个 iRegIndex = ( int )( usAddress - usCoilStart ) / 8 ; //每个寄存器存8个
iRegBitIndex = ( int )( usAddress - usCoilStart ) % 8 ; //相对于寄存器内部的位地址 iRegBitIndex = ( int )( usAddress - usCoilStart ) % 8 ; //相对于寄存器内部的位地址
switch ( eMode ) switch ( eMode )
@ -239,7 +241,7 @@ eMBErrorCode
eMBMasterRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete ) eMBMasterRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete )
{ {
eMBErrorCode eStatus = MB_ENOERR; eMBErrorCode eStatus = MB_ENOERR;
int iRegIndex , iRegBitIndex , iNReg; USHORT iRegIndex , iRegBitIndex , iNReg;
UCHAR * pucDiscreteInputBuf; UCHAR * pucDiscreteInputBuf;
UCHAR DISCRETE_INPUT_START; UCHAR DISCRETE_INPUT_START;
UCHAR DISCRETE_INPUT_NDISCRETES; UCHAR DISCRETE_INPUT_NDISCRETES;
@ -251,10 +253,10 @@ eMBMasterRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscre
DISCRETE_INPUT_NDISCRETES = M_DISCRETE_INPUT_NDISCRETES; DISCRETE_INPUT_NDISCRETES = M_DISCRETE_INPUT_NDISCRETES;
usDiscreteInputStart = usMDiscInStart; usDiscreteInputStart = usMDiscInStart;
usAddress--;//FreeModbus功能函数中已经加1，为保证与缓冲区首地址一致，故减1
if( ( usAddress >= DISCRETE_INPUT_START ) if( ( usAddress >= DISCRETE_INPUT_START )
&& ( usAddress + usNDiscrete <= DISCRETE_INPUT_START + DISCRETE_INPUT_NDISCRETES ) ) && ( usAddress + usNDiscrete <= DISCRETE_INPUT_START + DISCRETE_INPUT_NDISCRETES ) )
{ {
usAddress-=usDiscreteInputStart; //计算绝对地址
iRegIndex = ( int )( usAddress - usDiscreteInputStart ) / 8 ; //每个寄存器存8个 iRegIndex = ( int )( usAddress - usDiscreteInputStart ) / 8 ; //每个寄存器存8个
iRegBitIndex = ( int )( usAddress - usDiscreteInputStart ) % 8 ; //相对于寄存器内部的位地址 iRegBitIndex = ( int )( usAddress - usDiscreteInputStart ) % 8 ; //相对于寄存器内部的位地址