Skip to content
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

ModbusMaster fixes #2059

Merged
merged 6 commits into from
Apr 18, 2020
Merged

ModbusMaster fixes #2059

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26f3041
Replace the for loop used to send the message with single _serial->wr…
kmihaylov Apr 14, 2020
fd2f70e
Remove unused variable. Fix wrong debug message variable.
kmihaylov Apr 14, 2020
61b7798
Comment out pre- and post- delays
kmihaylov Apr 14, 2020
e203e46
Increase ADU debug information. Clarify ADU debug messages (RX, TX)
kmihaylov Apr 14, 2020
b00d460
Remove unused (and commented) delays
kmihaylov Apr 14, 2020
8ba7526
Use casted 0 instead of costexpr
kmihaylov Apr 14, 2020
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
23 changes: 21 additions & 2 deletions Sming/Libraries/ModbusMaster/ModbusMaster.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
diff --git a/src/ModbusMaster.cpp b/src/ModbusMaster.cpp
index cdcc534..f6f93d4 100644
index cdcc534..ecb03a5 100644
--- a/src/ModbusMaster.cpp
+++ b/src/ModbusMaster.cpp
@@ -860,7 +860,7 @@ uint8_t ModbusMaster::ModbusMasterTransaction(uint8_t u8MBFunction)
@@ -756,15 +756,13 @@ uint8_t ModbusMaster::ModbusMasterTransaction(uint8_t u8MBFunction)
// flush receive buffer before transmitting request
while (_serial->read() != -1);

- // transmit request
if (_preTransmission)
{
_preTransmission();
}
- for (i = 0; i < u16ModbusADUSize; i++)
- {
- _serial->write(u8ModbusADU[i]);
- }
+ constexpr uint8_t NUL{0};
+ _serial->write(u8ModbusADU, u16ModbusADUSize);
+ _serial->write(NUL);

u16ModbusADUSize = 0;
_serial->flush(); // flush transmit buffer
@@ -860,7 +858,7 @@ uint8_t ModbusMaster::ModbusMasterTransaction(uint8_t u8MBFunction)
break;
}
}
Expand Down
10 changes: 5 additions & 5 deletions Sming/Libraries/ModbusMaster/samples/generic/app/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ void mbLoop()

uint8_t nrOfRegistersToRead = 1;
uint8_t mbResult = mbMaster.readHoldingRegisters(SLAVE_REG_ADDR, nrOfRegistersToRead); //see also readInputRegisters
uint16_t result = 0;

if(mbResult == mbMaster.ku8MBSuccess) {
/*
Expand All @@ -38,7 +37,7 @@ void mbLoop()
*/
debugf("Data from slave: %d", mbMaster.getResponseBuffer(0));
} else {
debugf("Res err: %d", result);
debugf("Res err: %d", mbResult);
}

mbMaster.clearResponseBuffer();
Expand All @@ -47,12 +46,12 @@ void mbLoop()
void preTransmission()
{
digitalWrite(RS485_RE_PIN, HIGH);
delayMilliseconds(2);
//delayMilliseconds(1);
}

void postTransmission()
{
delayMicroseconds(500);
//delayMicroseconds(500);
digitalWrite(RS485_RE_PIN, LOW);
}

Expand Down Expand Up @@ -89,13 +88,14 @@ void mbLogReceive(const uint8_t* adu, size_t aduSize, uint8_t status)
break;
}
debugf("ADU Size: %d, status: %d ", aduSize, status);
debug_hex(INFO, "RX ADU", adu, aduSize);
}
debugf("\r\n");
}

void mbLogTransmit(const uint8_t* adu, size_t aduSize)
{
debug_hex(INFO, "ADU", adu, aduSize);
debug_hex(INFO, "TX ADU", adu, aduSize);
}

void init()
Expand Down