Skip to content

Commit 3cf7da4

Browse files
arminkarmink
committed
1、【增加】FreeModbus主机请求读写单个、多个寄存器方法，测试通过。处理从机响应的方法还有待完善；
2、【优化】FreeModbus主机忙信号设置相关逻辑； Signed-off-by: armink <[email protected]>
1 parent cefc33d commit 3cf7da4

File tree

6 files changed

+169
-201
lines changed

6 files changed

+169
-201
lines changed

‎APP/src/app_task.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ extern int __bss_end;
99
#endif
1010

1111
uint8_t CpuUsageMajor, CpuUsageMinor; //CPU使用率
12+
USHORT usModbusUserData[MB_PDU_SIZE_MAX];
1213

1314
//====================操作系统各线程优先级==================================
1415
#define thread_SysMonitor_Prio 11
@@ -32,8 +33,6 @@ struct rt_thread thread_ModbusMasterPoll;
3233
//******************************************************************
3334
void thread_entry_SysMonitor(void* parameter)
3435
{
35-
extern void vMBMasterWriteHoldReg(UCHAR ucSlaveAddress, USHORT usRegAddress, USHORT ucRegValue);
36-
3736
while (1)
3837
{
3938
cpu_usage_get(&CpuUsageMajor, &CpuUsageMinor);
@@ -47,7 +46,11 @@ void thread_entry_SysMonitor(void* parameter)
4746
rt_thread_delay(DELAY_SYS_RUN_LED);
4847
IWDG_Feed(); //喂狗
4948
//Test Modbus Master
50-
vMBMasterWriteHoldReg(1,3,(USHORT)(rt_tick_get()/10));
49+
usModbusUserData[0] = (USHORT)(rt_tick_get()/10);
50+
usModbusUserData[1] = (USHORT)(rt_tick_get()%10);
51+
// eMBMasterFuncWriteHoldingRegister(1,usModbusUserData,3);
52+
// eMBMasterFuncWriteMultipleHoldingRegister(1,usModbusUserData,3,2);
53+
eMBMasterReqReadHoldingRegister(1,3,2);
5154
}
5255
}
5356

‎FreeModbus/modbus/functions/mbfuncholding_m.c

+77-165
Original file line numberDiff line numberDiff line change
@@ -68,220 +68,132 @@
6868
#define MB_PDU_FUNC_READWRITE_SIZE_MIN ( 9 )
6969

7070
/* ----------------------- Static functions ---------------------------------*/
71-
eMBException prveMBError2Exception( eMBErrorCode eErrorCode );
7271

7372
/* ----------------------- Start implementation -----------------------------*/
7473
#if MB_MASTER_RTU_ENABLED > 0 || MB_MASTER_ASCII_ENABLED > 0
7574
#if MB_FUNC_WRITE_HOLDING_ENABLED > 0
7675

77-
eMBException
78-
eMBMasterFuncWriteHoldingRegister( UCHAR ucSndAddr, USHORT * pusDataBuffer, USHORT usRegAddr)
76+
eMBMasterReqErrCode
77+
eMBMasterReqWriteHoldingRegister( UCHAR ucSndAddr, USHORT * pusDataBuffer, USHORT usRegAddr )
7978
{
80-
UCHAR *ucMBFrame;
81-
eMBException eExceStates = MB_EX_NONE;
82-
eMBErrorCode eErrStatus;
79+
UCHAR *ucMBFrame;
80+
eMBMasterReqErrCode eErrStatus = MB_MRE_NO_ERR;
8381

84-
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_ETIMEDOUT;
85-
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM) eErrStatus = MB_EINVAL;
82+
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_MRE_MASTER_BUSY;
83+
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM ) eErrStatus = MB_MRE_ILL_ARG;
8684
else
8785
{
8886
vMBMasterGetPDUSndBuf(&ucMBFrame);
8987
vMBMasterSetDestAddress(ucSndAddr);
90-
ucMBFrame[MB_PDU_FUNC_OFF] = ( UCHAR ) MB_FUNC_WRITE_REGISTER;
91-
ucMBFrame[MB_PDU_FUNC_READ_ADDR_OFF] = ( UCHAR ) usRegAddr >> 8;
92-
ucMBFrame[MB_PDU_FUNC_READ_ADDR_OFF + 1] = ( UCHAR ) usRegAddr;
93-
ucMBFrame[MB_PDU_FUNC_READ_REGCNT_OFF] = ( UCHAR ) pusDataBuffer[0] >> 8;
94-
ucMBFrame[MB_PDU_FUNC_READ_REGCNT_OFF + 1] = ( UCHAR ) pusDataBuffer[0] ;
95-
vMBMasterSetRTUSndSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_READ_SIZE );
88+
ucMBFrame[MB_PDU_FUNC_OFF] = MB_FUNC_WRITE_REGISTER;
89+
ucMBFrame[MB_PDU_FUNC_WRITE_ADDR_OFF] = usRegAddr >> 8;
90+
ucMBFrame[MB_PDU_FUNC_WRITE_ADDR_OFF + 1] = usRegAddr;
91+
ucMBFrame[MB_PDU_FUNC_WRITE_VALUE_OFF] = pusDataBuffer[0] >> 8;
92+
ucMBFrame[MB_PDU_FUNC_WRITE_VALUE_OFF + 1] = pusDataBuffer[0] ;
93+
vMBMasterSetPDUSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_WRITE_SIZE );
9694
( void ) xMBMasterPortEventPost( EV_MASTER_FRAME_SENT );
9795
}
98-
/* If an error occured convert it into a Modbus exception. */
99-
if( eErrStatus != MB_ENOERR )
100-
{
101-
eExceStates = prveMBError2Exception( eErrStatus );
102-
}
103-
return eExceStates;
96+
return eErrStatus;
10497
}
10598
#endif
10699

107100
#if MB_FUNC_WRITE_MULTIPLE_HOLDING_ENABLED > 0
108-
eMBException
109-
eMBMasterFuncWriteMultipleHoldingRegister( UCHAR ucSndAddr,USHORT * pusDataBuffer, USHORT usRegAddr, USHORT usNRegs)
101+
102+
eMBMasterReqErrCode
103+
eMBMasterReqWriteMultipleHoldingRegister( UCHAR ucSndAddr,USHORT * pusDataBuffer, USHORT usRegAddr, USHORT usNRegs )
110104
{
111-
UCHAR *ucMBFrame;
112-
USHORT usRegIndex = 0;
113-
eMBException eExceStatus = MB_EX_NONE;
114-
eMBErrorCode eErrStatus;
105+
UCHAR *ucMBFrame;
106+
USHORT usRegIndex = 0;
107+
eMBMasterReqErrCode eErrStatus = MB_MRE_NO_ERR;
115108

116-
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_ETIMEDOUT;
117-
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM || usNRegs > MB_PDU_FUNC_WRITE_MUL_REGCNT_MAX) eErrStatus = MB_EINVAL;
109+
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_MRE_MASTER_BUSY;
110+
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM ) eErrStatus = MB_MRE_ILL_ARG;
118111
else
119112
{
120113
vMBMasterGetPDUSndBuf(&ucMBFrame);
121114
vMBMasterSetDestAddress(ucSndAddr);
122-
ucMBFrame[MB_PDU_FUNC_OFF] = ( UCHAR ) MB_FUNC_WRITE_MULTIPLE_REGISTERS;
123-
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_ADDR_OFF] = ( UCHAR ) usRegAddr >> 8;
124-
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_ADDR_OFF + 1] = ( UCHAR ) usRegAddr;
125-
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_REGCNT_OFF] = ( UCHAR ) usNRegs >> 8;
126-
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_REGCNT_OFF + 1] = ( UCHAR ) usNRegs ;
127-
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_BYTECNT_OFF] = ( UCHAR ) usNRegs * 2;
128-
ucMBFrame += MB_PDU_FUNC_WRITE_MUL_BYTECNT_OFF + 1;
129-
while( usNRegs-- > 0)
115+
ucMBFrame[MB_PDU_FUNC_OFF] = MB_FUNC_WRITE_MULTIPLE_REGISTERS;
116+
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_ADDR_OFF] = usRegAddr >> 8;
117+
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_ADDR_OFF + 1] = usRegAddr;
118+
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_REGCNT_OFF] = usNRegs >> 8;
119+
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_REGCNT_OFF + 1] = usNRegs ;
120+
ucMBFrame[MB_PDU_FUNC_WRITE_MUL_BYTECNT_OFF] = usNRegs * 2;
121+
ucMBFrame += MB_PDU_FUNC_WRITE_MUL_VALUES_OFF;
122+
while( usNRegs > usRegIndex)
130123
{
131124
*ucMBFrame++ = pusDataBuffer[usRegIndex] >> 8;
132125
*ucMBFrame++ = pusDataBuffer[usRegIndex++] ;
133126
}
134-
vMBMasterSetRTUSndSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_WRITE_MUL_SIZE_MIN + 2*usNRegs );
127+
vMBMasterSetPDUSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_WRITE_MUL_SIZE_MIN + 2*usNRegs );
135128
( void ) xMBMasterPortEventPost( EV_MASTER_FRAME_SENT );
136129
}
137-
/* If an error occured convert it into a Modbus exception. */
138-
if( eErrStatus != MB_ENOERR )
139-
{
140-
eExceStatus = prveMBError2Exception( eErrStatus );
141-
}
142-
return eExceStatus;
130+
return eErrStatus;
143131
}
144132
#endif
145133

146134
#if MB_FUNC_READ_HOLDING_ENABLED > 0
147135

148-
eMBException
149-
eMBMasterFuncReadHoldingRegister( UCHAR * pucFrame, USHORT * usLen )
136+
eMBMasterReqErrCode
137+
eMBMasterReqReadHoldingRegister( UCHAR ucSndAddr, USHORT usRegAddr, USHORT usNRegs )
150138
{
151-
USHORT usRegAddress;
152-
USHORT usRegCount;
153-
UCHAR *pucFrameCur;
154-
155-
eMBException eStatus = MB_EX_NONE;
156-
eMBErrorCode eRegStatus;
157-
158-
if( *usLen == ( MB_PDU_FUNC_READ_SIZE + MB_PDU_SIZE_MIN ) )
159-
{
160-
usRegAddress = ( USHORT )( pucFrame[MB_PDU_FUNC_READ_ADDR_OFF] << 8 );
161-
usRegAddress |= ( USHORT )( pucFrame[MB_PDU_FUNC_READ_ADDR_OFF + 1] );
162-
usRegAddress++;
163-
164-
usRegCount = ( USHORT )( pucFrame[MB_PDU_FUNC_READ_REGCNT_OFF] << 8 );
165-
usRegCount = ( USHORT )( pucFrame[MB_PDU_FUNC_READ_REGCNT_OFF + 1] );
139+
UCHAR *ucMBFrame;
140+
eMBMasterReqErrCode eErrStatus = MB_MRE_NO_ERR;
166141

167-
/* Check if the number of registers to read is valid. If not
168-
* return Modbus illegal data value exception.
169-
*/
170-
if( ( usRegCount >= 1 ) && ( usRegCount <= MB_PDU_FUNC_READ_REGCNT_MAX ) )
171-
{
172-
/* Set the current PDU data pointer to the beginning. */
173-
pucFrameCur = &pucFrame[MB_PDU_FUNC_OFF];
174-
*usLen = MB_PDU_FUNC_OFF;
175-
176-
/* First byte contains the function code. */
177-
*pucFrameCur++ = MB_FUNC_READ_HOLDING_REGISTER;
178-
*usLen += 1;
179-
180-
/* Second byte in the response contain the number of bytes. */
181-
*pucFrameCur++ = ( UCHAR ) ( usRegCount * 2 );
182-
*usLen += 1;
183-
184-
/* Make callback to fill the buffer. */
185-
eRegStatus = eMBRegHoldingCB( pucFrameCur, usRegAddress, usRegCount, MB_REG_READ );
186-
/* If an error occured convert it into a Modbus exception. */
187-
if( eRegStatus != MB_ENOERR )
188-
{
189-
eStatus = prveMBError2Exception( eRegStatus );
190-
}
191-
else
192-
{
193-
*usLen += usRegCount * 2;
194-
}
195-
}
196-
else
197-
{
198-
eStatus = MB_EX_ILLEGAL_DATA_VALUE;
199-
}
200-
}
142+
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_MRE_MASTER_BUSY;
143+
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM ) eErrStatus = MB_MRE_ILL_ARG;
201144
else
202145
{
203-
/* Can't be a valid request because the length is incorrect. */
204-
eStatus = MB_EX_ILLEGAL_DATA_VALUE;
146+
vMBMasterGetPDUSndBuf(&ucMBFrame);
147+
vMBMasterSetDestAddress(ucSndAddr);
148+
ucMBFrame[MB_PDU_FUNC_OFF] = MB_FUNC_READ_HOLDING_REGISTER;
149+
ucMBFrame[MB_PDU_FUNC_READ_ADDR_OFF] = usRegAddr >> 8;
150+
ucMBFrame[MB_PDU_FUNC_READ_ADDR_OFF + 1] = usRegAddr;
151+
ucMBFrame[MB_PDU_FUNC_READ_REGCNT_OFF] = usNRegs >> 8;
152+
ucMBFrame[MB_PDU_FUNC_READ_REGCNT_OFF + 1] = usNRegs;
153+
vMBMasterSetPDUSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_READ_SIZE );
154+
( void ) xMBMasterPortEventPost( EV_MASTER_FRAME_SENT );
205155
}
206-
return eStatus;
156+
return eErrStatus;
207157
}
208158

209159
#endif
210160

211161
#if MB_FUNC_READWRITE_HOLDING_ENABLED > 0
212162

213-
eMBException
214-
eMBMasterFuncReadWriteMultipleHoldingRegister( UCHAR * pucFrame, USHORT * usLen )
163+
eMBMasterReqErrCode
164+
eMBMasterReqReadWriteMultipleHoldingRegister( UCHAR ucSndAddr,USHORT * pusDataBuffer, USHORT usReadRegAddr, USHORT usNReadRegs ,
165+
USHORT usWriteRegAddr, USHORT usNWriteRegs)
215166
{
216-
USHORT usRegReadAddress;
217-
USHORT usRegReadCount;
218-
USHORT usRegWriteAddress;
219-
USHORT usRegWriteCount;
220-
UCHAR ucRegWriteByteCount;
221-
UCHAR *pucFrameCur;
222-
223-
eMBException eStatus = MB_EX_NONE;
224-
eMBErrorCode eRegStatus;
167+
UCHAR *ucMBFrame;
168+
USHORT usRegIndex = 0;
169+
eMBMasterReqErrCode eErrStatus = MB_MRE_NO_ERR;
225170

226-
if( *usLen >= ( MB_PDU_FUNC_READWRITE_SIZE_MIN + MB_PDU_SIZE_MIN ) )
171+
if ( xMBMasterGetIsBusy() ) eErrStatus = MB_MRE_MASTER_BUSY;
172+
else if ( ucSndAddr > MB_MASTER_TOTAL_SLAVE_NUM ) eErrStatus = MB_MRE_ILL_ARG;
173+
else
227174
{
228-
usRegReadAddress = ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_READ_ADDR_OFF] << 8U );
229-
usRegReadAddress |= ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_READ_ADDR_OFF + 1] );
230-
usRegReadAddress++;
231-
232-
usRegReadCount = ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_READ_REGCNT_OFF] << 8U );
233-
usRegReadCount |= ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_READ_REGCNT_OFF + 1] );
234-
235-
usRegWriteAddress = ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_WRITE_ADDR_OFF] << 8U );
236-
usRegWriteAddress |= ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_WRITE_ADDR_OFF + 1] );
237-
usRegWriteAddress++;
238-
239-
usRegWriteCount = ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_WRITE_REGCNT_OFF] << 8U );
240-
usRegWriteCount |= ( USHORT )( pucFrame[MB_PDU_FUNC_READWRITE_WRITE_REGCNT_OFF + 1] );
241-
242-
ucRegWriteByteCount = pucFrame[MB_PDU_FUNC_READWRITE_BYTECNT_OFF];
243-
244-
if( ( usRegReadCount >= 1 ) && ( usRegReadCount <= 0x7D ) &&
245-
( usRegWriteCount >= 1 ) && ( usRegWriteCount <= 0x79 ) &&
246-
( ( 2 * usRegWriteCount ) == ucRegWriteByteCount ) )
247-
{
248-
/* Make callback to update the register values. */
249-
eRegStatus = eMBRegHoldingCB( &pucFrame[MB_PDU_FUNC_READWRITE_WRITE_VALUES_OFF],
250-
usRegWriteAddress, usRegWriteCount, MB_REG_WRITE );
251-
252-
if( eRegStatus == MB_ENOERR )
253-
{
254-
/* Set the current PDU data pointer to the beginning. */
255-
pucFrameCur = &pucFrame[MB_PDU_FUNC_OFF];
256-
*usLen = MB_PDU_FUNC_OFF;
257-
258-
/* First byte contains the function code. */
259-
*pucFrameCur++ = MB_FUNC_READWRITE_MULTIPLE_REGISTERS;
260-
*usLen += 1;
261-
262-
/* Second byte in the response contain the number of bytes. */
263-
*pucFrameCur++ = ( UCHAR ) ( usRegReadCount * 2 );
264-
*usLen += 1;
265-
266-
/* Make the read callback. */
267-
eRegStatus =
268-
eMBRegHoldingCB( pucFrameCur, usRegReadAddress, usRegReadCount, MB_REG_READ );
269-
if( eRegStatus == MB_ENOERR )
270-
{
271-
*usLen += 2 * usRegReadCount;
272-
}
273-
}
274-
if( eRegStatus != MB_ENOERR )
275-
{
276-
eStatus = prveMBError2Exception( eRegStatus );
277-
}
278-
}
279-
else
280-
{
281-
eStatus = MB_EX_ILLEGAL_DATA_VALUE;
282-
}
175+
vMBMasterGetPDUSndBuf(&ucMBFrame);
176+
vMBMasterSetDestAddress(ucSndAddr);
177+
ucMBFrame[MB_PDU_FUNC_OFF] = MB_FUNC_READWRITE_MULTIPLE_REGISTERS;
178+
ucMBFrame[MB_PDU_FUNC_READWRITE_READ_ADDR_OFF] = usReadRegAddr >> 8;
179+
ucMBFrame[MB_PDU_FUNC_READWRITE_READ_ADDR_OFF + 1] = usReadRegAddr;
180+
ucMBFrame[MB_PDU_FUNC_READWRITE_READ_REGCNT_OFF] = usNReadRegs >> 8;
181+
ucMBFrame[MB_PDU_FUNC_READWRITE_READ_REGCNT_OFF + 1] = usNReadRegs ;
182+
ucMBFrame[MB_PDU_FUNC_READWRITE_WRITE_ADDR_OFF] = usWriteRegAddr >> 8;
183+
ucMBFrame[MB_PDU_FUNC_READWRITE_WRITE_ADDR_OFF + 1] = usWriteRegAddr;
184+
ucMBFrame[MB_PDU_FUNC_READWRITE_WRITE_REGCNT_OFF] = usNWriteRegs >> 8;
185+
ucMBFrame[MB_PDU_FUNC_READWRITE_WRITE_REGCNT_OFF + 1] = usNWriteRegs ;
186+
ucMBFrame[MB_PDU_FUNC_READWRITE_BYTECNT_OFF] = usNWriteRegs * 2;
187+
ucMBFrame += MB_PDU_FUNC_READWRITE_WRITE_VALUES_OFF;
188+
while( usNWriteRegs > usRegIndex)
189+
{
190+
*ucMBFrame++ = pusDataBuffer[usRegIndex] >> 8;
191+
*ucMBFrame++ = pusDataBuffer[usRegIndex++] ;
192+
}
193+
vMBMasterSetPDUSndLength( MB_PDU_SIZE_MIN + MB_PDU_FUNC_READWRITE_SIZE_MIN + 2*usNWriteRegs );
194+
( void ) xMBMasterPortEventPost( EV_MASTER_FRAME_SENT );
283195
}
284-
return eStatus;
196+
return eErrStatus;
285197
}
286198

287199
#endif

‎FreeModbus/modbus/include/mb_m.h

+44-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,31 @@ PR_BEGIN_EXTERN_C
6969
#define MB_MASTER_TCP_PORT_USE_DEFAULT 0
7070

7171
/* ----------------------- Type definitions ---------------------------------*/
72-
72+
/*! \ingroup modbus
73+
* \brief Errorcodes used by all function in the Master request.
74+
*/
75+
typedef enum
76+
{
77+
MB_MRE_NO_ERR, /*!< no error. */
78+
MB_MRE_NO_REG, /*!< illegal register address. */
79+
MB_MRE_ILL_ARG, /*!< illegal argument. */
80+
MB_MRE_PORT_ERR, /*!< porting layer error. */
81+
MB_MRE_NO_RES, /*!< insufficient resources. */
82+
MB_MRE_IO, /*!< I/O error. */
83+
MB_MRE_ILL_STATE, /*!< protocol stack in illegal state. */
84+
MB_MRE_TIMEDOUT, /*!< timeout error occurred. */
85+
MB_MRE_MASTER_BUSY, /*!< master is busy now. */
86+
MB_MRE_SLAVE_EXCE /*!< slave has exception. */
87+
} eMBMasterReqErrCode;
88+
/*! \ingroup modbus
89+
* \brief TimerMode is Master 3 kind of Timer modes.
90+
*/
91+
typedef enum
92+
{
93+
MB_TMODE_T35, /*!< Master receive frame T3.5 timeout. */
94+
MB_TMODE_RESPOND_TIMEOUT, /*!< Master wait respond for slave. */
95+
MB_TMODE_CONVERT_DELAY /*!< Master sent broadcast ,then delay sometime.*/
96+
}eMBMasterTimerMode;
7397

7498
/* ----------------------- Function prototypes ------------------------------*/
7599
/*! \ingroup modbus
@@ -165,19 +189,33 @@ eMBErrorCode eMBMasterDisable( void );
165189
*/
166190
eMBErrorCode eMBMasterPoll( void );
167191

168-
/* Get Modbus Master busy flag,It will return TRUE when Master is busy. */
169-
BOOL xMBMasterGetIsBusy( void );
170192

193+
/*! \ingroup modbus
194+
*\brief These Modbus functions are called for user when Modbus run in Master Mode.
195+
*/
196+
eMBMasterReqErrCode
197+
eMBMasterReqWriteHoldingRegister( UCHAR ucSndAddr, USHORT * pusDataBuffer, USHORT usRegAddr );
198+
eMBMasterReqErrCode
199+
eMBMasterReqWriteMultipleHoldingRegister( UCHAR ucSndAddr,USHORT * pusDataBuffer, USHORT usRegAddr, USHORT usNRegs );
200+
eMBMasterReqErrCode
201+
eMBMasterReqReadHoldingRegister( UCHAR ucSndAddr, USHORT usRegAddr, USHORT usNRegs );
202+
eMBMasterReqErrCode
203+
eMBMasterReqReadWriteMultipleHoldingRegister( UCHAR ucSndAddr,USHORT * pusDataBuffer, USHORT usReadRegAddr, USHORT usNReadRegs ,
204+
USHORT usWriteRegAddr, USHORT usNWriteRegs);
205+
206+
/*£¡ \ingroup modbus
207+
*\brief These functions are interface for Modbus Master
208+
*/
209+
BOOL xMBMasterGetIsBusy( void );
171210
void vMBMasterGetPDUSndBuf( UCHAR ** pucFrame );
172211
UCHAR ucMBMasterGetDestAddress( void );
173212
void vMBMasterSetDestAddress( UCHAR Address );
174213
void vMBMasterSetIsBusy( BOOL IsBusy );
175214
BOOL xMBMasterGetCBRunInMasterMode( void );
176215
void vMBMasterSetCBRunInMasterMode( BOOL IsMasterMode );
177-
/* Get Modbus Master send PDU's buffer length.*/
178216
UCHAR ucMBMasterGetPDUSndLength( void );
179-
/* Set Modbus Master send PDU's buffer length.*/
180-
void vMBMasterSetRTUSndSndLength( UCHAR SendPDULength );
217+
void vMBMasterSetPDUSndLength( UCHAR SendPDULength );
218+
void vMBMasterSetCurTimerMode( eMBMasterTimerMode eMBTimerMode );
181219

182220
/* ----------------------- Callback -----------------------------------------*/
183221

0 commit comments

Comments
 (0)