Skip to content

Create Own Timeout #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Create Own Timeout #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/ModbusMaster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ModbusMaster::ModbusMaster(void)
_idle = 0;
_preTransmission = 0;
_postTransmission = 0;
_u16ResponseTimeout = ku16MBDefaultResponseTimeout;
}

/**
Expand Down Expand Up @@ -140,9 +141,6 @@ void ModbusMaster::send(uint8_t data)






uint8_t ModbusMaster::available(void)
{
return _u8ResponseBufferLength - _u8ResponseBufferIndex;
Expand Down Expand Up @@ -294,6 +292,22 @@ void ModbusMaster::clearTransmitBuffer()
}
}

/**
Get the response timeout. Value is in msec.
*/
uint16_t ModbusMaster::getResponseTimeout()
{
return _u16ResponseTimeout;
}

/**
Sets the response timeout. Value should be given in msec.
The default is 2000 msec.
*/
void ModbusMaster::setResponseTimeout(uint16_t timeout)
{
_u16ResponseTimeout = timeout;
}

/**
Modbus function 0x01 Read Coils.
Expand Down Expand Up @@ -797,7 +811,7 @@ uint8_t ModbusMaster::ModbusMasterTransaction(uint8_t u8MBFunction)
break;
}
}
if ((millis() - u32StartTime) > ku16MBResponseTimeout)
if ((millis() - u32StartTime) > _u16ResponseTimeout)
{
u8MBStatus = ku8MBResponseTimedOut;
}
Expand Down
6 changes: 5 additions & 1 deletion src/ModbusMaster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ class ModbusMaster
void clearResponseBuffer();
uint8_t setTransmitBuffer(uint8_t, uint16_t);
void clearTransmitBuffer();

uint16_t getResponseTimeout();
void setResponseTimeout(uint16_t);

void beginTransmission(uint16_t);
uint8_t requestFrom(uint16_t, uint16_t);
Expand Down Expand Up @@ -233,6 +236,7 @@ class ModbusMaster
uint16_t* rxBuffer; // from Wire.h -- need to clean this up Rx
uint8_t _u8ResponseBufferIndex;
uint8_t _u8ResponseBufferLength;
uint16_t _u16ResponseTimeout;

// Modbus function codes for bit access
static const uint8_t ku8MBReadCoils = 0x01; ///< Modbus function 0x01 Read Coils
Expand All @@ -249,7 +253,7 @@ class ModbusMaster
static const uint8_t ku8MBReadWriteMultipleRegisters = 0x17; ///< Modbus function 0x17 Read Write Multiple Registers

// Modbus timeout [milliseconds]
static const uint16_t ku16MBResponseTimeout = 2000; ///< Modbus timeout [milliseconds]
static const uint16_t ku16MBDefaultResponseTimeout = 2000; ///< Modbus timeout [milliseconds]

// master function that conducts Modbus transactions
uint8_t ModbusMasterTransaction(uint8_t u8MBFunction);
Expand Down