Skip to content

De-hardcoded RS485Class object to be used by modbus. #11

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

Closed
wants to merge 1 commit into from
Closed

De-hardcoded RS485Class object to be used by modbus. #11

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
9 changes: 7 additions & 2 deletions src/ModbusRTUClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ ModbusRTUClientClass::~ModbusRTUClientClass()
{
}

int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config, RS485Class& rs485)
{
modbus_t* mb = modbus_new_rtu(baudrate, config);
modbus_t* mb = modbus_new_rtu(baudrate, config, &rs485);

if (!ModbusClient::begin(mb, 0x00)) {
return 0;
Expand All @@ -47,4 +47,9 @@ int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
return 1;
}

int ModbusRTUClientClass::begin(unsigned long baudrate, RS485Class& rs485)
{
return begin(baudrate, SERIAL_8N1, rs485);
}

ModbusRTUClientClass ModbusRTUClient;
5 changes: 4 additions & 1 deletion src/ModbusRTUClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "ModbusClient.h"

#include <ArduinoRS485.h>

class ModbusRTUClientClass : public ModbusClient {
public:
ModbusRTUClientClass();
Expand All @@ -35,7 +37,8 @@ class ModbusRTUClientClass : public ModbusClient {
*
* Return 1 on success, 0 on failure
*/
int begin(unsigned long baudrate, uint16_t config = SERIAL_8N1);
int begin(unsigned long baudrate, uint16_t config = SERIAL_8N1, RS485Class& rs485 = RS485);
int begin(unsigned long baudrate, RS485Class& rs485);
};

extern ModbusRTUClientClass ModbusRTUClient;
Expand Down
9 changes: 7 additions & 2 deletions src/ModbusRTUServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ ModbusRTUServerClass::~ModbusRTUServerClass()
{
}

int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config)
int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config, RS485Class& rs485)
{
modbus_t* mb = modbus_new_rtu(baudrate, config);
modbus_t* mb = modbus_new_rtu(baudrate, config, &rs485);

if (!ModbusServer::begin(mb, id)) {
return 0;
Expand All @@ -47,6 +47,11 @@ int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config)
return 1;
}

int ModbusRTUServerClass::begin(int id, unsigned long baudrate, RS485Class& rs485)
{
return begin(id, baudrate, SERIAL_8N1, RS485);
}

void ModbusRTUServerClass::poll()
{
uint8_t request[MODBUS_RTU_MAX_ADU_LENGTH];
Expand Down
5 changes: 4 additions & 1 deletion src/ModbusRTUServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "ModbusServer.h"

#include <ArduinoRS485.h>

class ModbusRTUServerClass : public ModbusServer {
public:
ModbusRTUServerClass();
Expand All @@ -36,7 +38,8 @@ class ModbusRTUServerClass : public ModbusServer {
*
* Return 1 on success, 0 on failure
*/
int begin(int id, unsigned long baudrate, uint16_t config = SERIAL_8N1);
int begin(int id, unsigned long baudrate, uint16_t config = SERIAL_8N1, RS485Class& rs485 = RS485);
int begin(int id, unsigned long baudrate, RS485Class& rs485);

/**
* Poll interface for requests
Expand Down
3 changes: 2 additions & 1 deletion src/libmodbus/modbus-rtu-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#if defined(_WIN32)
#include <windows.h>
#elif defined(ARDUINO)
// nothing extra needed
#include <ArduinoRS485.h>
#else
#include <termios.h>
#endif
Expand Down Expand Up @@ -49,6 +49,7 @@ typedef struct _modbus_rtu {
#if defined(ARDUINO)
unsigned long baud;
uint16_t config;
RS485Class* rs485;
#else
/* Device: "/dev/ttyS0", "/dev/ttyUSB0" or "/dev/tty.USA19*" on Mac OS X. */
char *device;
Expand Down
40 changes: 25 additions & 15 deletions src/libmodbus/modbus-rtu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <assert.h>

#ifdef ARDUINO
#include <ArduinoRS485.h>

#ifndef DEBUG
#define printf(...) {}
Expand Down Expand Up @@ -323,15 +322,17 @@ static ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_lengt
DWORD n_bytes = 0;
return (WriteFile(ctx_rtu->w_ser.fd, req, req_length, &n_bytes, NULL)) ? (ssize_t)n_bytes : -1;
#elif defined(ARDUINO)
modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
(void)ctx;

ssize_t size;

RS485.noReceive();
RS485.beginTransmission();
size = RS485.write(req, req_length);
RS485.endTransmission();
RS485.receive();
rs485->noReceive();
rs485->beginTransmission();
size = rs485->write(req, req_length);
rs485->endTransmission();
rs485->receive();

return size;
#else
Expand Down Expand Up @@ -394,9 +395,11 @@ static ssize_t _modbus_rtu_recv(modbus_t *ctx, uint8_t *rsp, int rsp_length)
#if defined(_WIN32)
return win32_ser_read(&((modbus_rtu_t *)ctx->backend_data)->w_ser, rsp, rsp_length);
#elif defined(ARDUINO)
modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
(void)ctx;

return RS485.readBytes(rsp, rsp_length);
return rs485->readBytes(rsp, rsp_length);
#else
return read(ctx->s, rsp, rsp_length);
#endif
Expand Down Expand Up @@ -479,6 +482,7 @@ static int _modbus_rtu_connect(modbus_t *ctx)
#endif
#ifdef ARDUINO
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
#else
modbus_rtu_t *ctx_rtu = ctx->backend_data;

Expand Down Expand Up @@ -654,8 +658,8 @@ static int _modbus_rtu_connect(modbus_t *ctx)
return -1;
}
#elif defined(ARDUINO)
RS485.begin(ctx_rtu->baud, ctx_rtu->config);
RS485.receive();
rs485->begin(ctx_rtu->baud, ctx_rtu->config);
rs485->receive();
#else
/* The O_NOCTTY flag tells UNIX that this program doesn't want
to be the "controlling terminal" for that port. If you
Expand Down Expand Up @@ -1192,6 +1196,7 @@ static void _modbus_rtu_close(modbus_t *ctx)
/* Restore line settings and close file descriptor in RTU mode */
#ifdef ARDUINO
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
#else
modbus_rtu_t *ctx_rtu = ctx->backend_data;
#endif
Expand All @@ -1210,8 +1215,8 @@ static void _modbus_rtu_close(modbus_t *ctx)
#elif defined(ARDUINO)
(void)ctx_rtu;

RS485.noReceive();
RS485.end();
rs485->noReceive();
rs485->end();
#else
if (ctx->s != -1) {
tcsetattr(ctx->s, TCSANOW, &ctx_rtu->old_tios);
Expand All @@ -1228,10 +1233,12 @@ static int _modbus_rtu_flush(modbus_t *ctx)
ctx_rtu->w_ser.n_bytes = 0;
return (PurgeComm(ctx_rtu->w_ser.fd, PURGE_RXCLEAR) == FALSE);
#elif defined(ARDUINO)
modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
(void)ctx;

while (RS485.available()) {
RS485.read();
while (rs485->available()) {
rs485->read();
}

return 0;
Expand All @@ -1256,14 +1263,16 @@ static int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
return -1;
}
#elif defined(ARDUINO)
modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
RS485Class *rs485 = ctx_rtu->rs485;
(void)ctx;
(void)rset;

unsigned long wait_time_millis = (tv == NULL) ? 0 : (tv->tv_sec * 1000) + (tv->tv_usec / 1000);
unsigned long start = millis();

do {
s_rc = RS485.available();
s_rc = rs485->available();

if (s_rc >= length_to_read) {
break;
Expand Down Expand Up @@ -1330,7 +1339,7 @@ const modbus_backend_t _modbus_rtu_backend = {
};

#ifdef ARDUINO
modbus_t* modbus_new_rtu(unsigned long baud, uint16_t config)
modbus_t* modbus_new_rtu(unsigned long baud, uint16_t config, RS485Class* rs485)
#else
modbus_t* modbus_new_rtu(const char *device,
int baud, char parity, int data_bit,
Expand Down Expand Up @@ -1364,6 +1373,7 @@ modbus_t* modbus_new_rtu(const char *device,
#ifdef ARDUINO
ctx_rtu->baud = baud;
ctx_rtu->config = config;
ctx_rtu->rs485 = rs485;
#else
ctx_rtu->device = NULL;

Expand Down
7 changes: 6 additions & 1 deletion src/libmodbus/modbus-rtu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
#ifndef MODBUS_RTU_H
#define MODBUS_RTU_H

#ifdef ARDUINO
class RS485Class;
#endif

#include "modbus.h"


MODBUS_BEGIN_DECLS

/* Modbus_Application_Protocol_V1_1b.pdf Chapter 4 Section 1 Page 5
Expand All @@ -18,7 +23,7 @@ MODBUS_BEGIN_DECLS
#define MODBUS_RTU_MAX_ADU_LENGTH 256

#ifdef ARDUINO
MODBUS_API modbus_t* modbus_new_rtu(unsigned long baud, uint16_t config);
MODBUS_API modbus_t* modbus_new_rtu(unsigned long baud, uint16_t config, RS485Class* rs485);
#else
MODBUS_API modbus_t* modbus_new_rtu(const char *device, int baud, char parity,
int data_bit, int stop_bit);
Expand Down