sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modbus_master: fix modbus master example

Browse Source
This commit is contained in:
Jorge Guzman 2024-02-15 19:06:56 -03:00 committed by Xiang Xiao
parent f9f63dc8e1
commit 49204e1389
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/modbusmaster/mbmaster_main.c
View File

@ -280,7 +280,7 @@ int main(int argc, FAR char *argv[])
if (ret != OK) if (ret != OK)
{ {
fprintf(stderr, "mbmaster_main: ", fprintf(stderr, "mbmaster_main: "
"ERROR: mbmaster_initialize failed: %d\n", ret); "ERROR: mbmaster_initialize failed: %d\n", ret);
goto errout; goto errout;
} }
@ -292,11 +292,15 @@ int main(int argc, FAR char *argv[])
if (ret != OK) if (ret != OK)
{ {
fprintf(stderr, "mbmaster_main: ", fprintf(stderr, "mbmaster_main: "
"ERROR: mbmaster_pollthread create failed: %d\n", ret); "ERROR: mbmaster_pollthread create failed: %d\n", ret);
goto errout_with_initialize; goto errout_with_initialize;
} }
/* Work around to give time to pthread_create run the modbus poller */
usleep(100000);
printf("Sending %d requests to slave %d\n", printf("Sending %d requests to slave %d\n",
MBMASTER_REQUESTS_COUNT, SLAVE_ID); MBMASTER_REQUESTS_COUNT, SLAVE_ID);

6
include/modbus/mbport.h
View File

@ -126,7 +126,7 @@ bool xMBPortEventGet(eMBEventType *eEvent);
bool xMBMasterPortEventInit(void); bool xMBMasterPortEventInit(void);
bool xMBMasterPortEventPost(eMBMasterEventType eEvent); bool xMBMasterPortEventPost(eMBMasterEventType eEvent);
bool xMBMasterPortEventGet(eMBMasterEventType * eEvent); bool xMBMasterPortEventGet(eMBMasterEventType *eEvent);
void vMBMasterOsResInit(void); void vMBMasterOsResInit(void);
bool xMBMasterRunResTake(int32_t time); bool xMBMasterRunResTake(int32_t time);
void vMBMasterRunResRelease(void); void vMBMasterRunResRelease(void);
@ -138,7 +138,7 @@ bool xMBPortSerialInit(uint8_t ucPort, speed_t ulBaudRate,
void vMBPortClose(void); void vMBPortClose(void);
void xMBPortSerialClose(void); void xMBPortSerialClose(void);
void vMBPortSerialEnable(bool xRxEnable, bool xTxEnable); void vMBPortSerialEnable(bool xRxEnable, bool xTxEnable);
bool xMBPortSerialGetByte(int8_t * pucByte); bool xMBPortSerialGetByte(int8_t *pucByte);
bool xMBPortSerialPutByte(int8_t ucByte); bool xMBPortSerialPutByte(int8_t ucByte);
bool xMBMasterPortSerialInit(uint8_t ucPort, speed_t ulBaudRate, bool xMBMasterPortSerialInit(uint8_t ucPort, speed_t ulBaudRate,
@ -146,7 +146,7 @@ bool xMBMasterPortSerialInit(uint8_t ucPort, speed_t ulBaudRate,
void vMBMasterPortClose(void); void vMBMasterPortClose(void);
void xMBMasterPortSerialClose(void); void xMBMasterPortSerialClose(void);
void vMBMasterPortSerialEnable(bool xRxEnable, bool xTxEnable); void vMBMasterPortSerialEnable(bool xRxEnable, bool xTxEnable);
bool xMBMasterPortSerialGetByte(int8_t * pucByte); bool xMBMasterPortSerialGetByte(int8_t *pucByte);
bool xMBMasterPortSerialPutByte(int8_t ucByte); bool xMBMasterPortSerialPutByte(int8_t ucByte);
/* Timers functions */ /* Timers functions */

7
modbus/mb_m.c
View File

@ -429,6 +429,13 @@ eMBErrorCode eMBMasterPoll(void)
vMBMasterRunResRelease(); vMBMasterRunResRelease();
break; break;
case EV_MASTER_PROCESS_SUCCESS:
case EV_MASTER_ERROR_RESPOND_TIMEOUT:
case EV_MASTER_ERROR_RECEIVE_DATA:
case EV_MASTER_ERROR_EXECUTE_FUNCTION:
default:
break;
} }
} }

8
modbus/nuttx/portevent_m.c
View File

@ -94,7 +94,7 @@ bool xMBMasterPortEventPost(eMBMasterEventType eEvent)
return true; return true;
} }
bool xMBMasterPortEventGet(eMBMasterEventType * eEvent) bool xMBMasterPortEventGet(eMBMasterEventType *eEvent)
{ {
bool xEventHappened = false; bool xEventHappened = false;
@ -227,7 +227,7 @@ void vMBMasterRunResRelease(void)
*/ */
void vMBMasterErrorCBRespondTimeout(uint8_t ucDestAddress, void vMBMasterErrorCBRespondTimeout(uint8_t ucDestAddress,
const uint8_t * pucPDUData, const uint8_t *pucPDUData,
uint16_t usPDULength) uint16_t usPDULength)
{ {
xMBMasterPortEventPost(EV_MASTER_ERROR_RESPOND_TIMEOUT); xMBMasterPortEventPost(EV_MASTER_ERROR_RESPOND_TIMEOUT);
@ -243,7 +243,7 @@ void vMBMasterErrorCBRespondTimeout(uint8_t ucDestAddress,
*/ */
void vMBMasterErrorCBReceiveData(uint8_t ucDestAddress, void vMBMasterErrorCBReceiveData(uint8_t ucDestAddress,
const uint8_t * pudPDUData, const uint8_t *pudPDUData,
uint16_t usPDULength) uint16_t usPDULength)
{ {
xMBMasterPortEventPost(EV_MASTER_ERROR_RECEIVE_DATA); xMBMasterPortEventPost(EV_MASTER_ERROR_RECEIVE_DATA);
@ -259,7 +259,7 @@ void vMBMasterErrorCBReceiveData(uint8_t ucDestAddress,
*/ */
void vMBMasterErrorCBExecuteFunction(uint8_t ucDestAddress, void vMBMasterErrorCBExecuteFunction(uint8_t ucDestAddress,
const uint8_t * pucPDUData, const uint8_t *pucPDUData,
uint16_t usPDULength) uint16_t usPDULength)
{ {
xMBMasterPortEventPost(EV_MASTER_ERROR_EXECUTE_FUNCTION); xMBMasterPortEventPost(EV_MASTER_ERROR_EXECUTE_FUNCTION);

6
modbus/rtu/mbrtu_m.c
View File

@ -278,7 +278,7 @@ bool xMBMasterRTUReceiveFSM(void)
/* Always read the character. */ /* Always read the character. */
xMBMasterPortSerialGetByte((uint8_t *) & ucByte); xMBMasterPortSerialGetByte((int8_t *) & ucByte);
switch (eRcvState) switch (eRcvState)
{ {
@ -397,6 +397,10 @@ bool xMBMasterRTUTransmitFSM(void)
} }
} }
break; break;
case STATE_M_TX_XFWR:
default:
break;
} }
return xNeedPoll; return xNeedPoll;