Skip to content

Make RS485Class a constructor arg to ModbusRTUClientClass and ModbusRTUServerClass #14

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

Make RS485Class a constructor arg to ModbusRTUClientClass and ModbusRTUServerClass #14

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
7 changes: 4 additions & 3 deletions src/ModbusRTUClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ extern "C" {

#include "ModbusRTUClient.h"

ModbusRTUClientClass::ModbusRTUClientClass()
ModbusRTUClientClass::ModbusRTUClientClass(RS485Class& rs485) :
_rs485(&rs485)
{
}

Expand All @@ -36,7 +37,7 @@ ModbusRTUClientClass::~ModbusRTUClientClass()

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

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

ModbusRTUClientClass ModbusRTUClient;
ModbusRTUClientClass ModbusRTUClient(RS485);
7 changes: 6 additions & 1 deletion src/ModbusRTUClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
#ifndef _MODBUS_RTU_CLIENT_H_INCLUDED
#define _MODBUS_RTU_CLIENT_H_INCLUDED

#include <ArduinoRS485.h>

#include "ModbusClient.h"

class ModbusRTUClientClass : public ModbusClient {
public:
ModbusRTUClientClass();
ModbusRTUClientClass(RS485Class& rs485);
virtual ~ModbusRTUClientClass();

/**
Expand All @@ -36,6 +38,9 @@ class ModbusRTUClientClass : public ModbusClient {
* Return 1 on success, 0 on failure
*/
int begin(unsigned long baudrate, uint16_t config = SERIAL_8N1);

private:
RS485Class* _rs485;
};

extern ModbusRTUClientClass ModbusRTUClient;
Expand Down
7 changes: 4 additions & 3 deletions src/ModbusRTUServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ extern "C" {

#include "ModbusRTUServer.h"

ModbusRTUServerClass::ModbusRTUServerClass()
ModbusRTUServerClass::ModbusRTUServerClass(RS485Class& rs485) :
_rs485(&rs485)
{
}

Expand All @@ -36,7 +37,7 @@ ModbusRTUServerClass::~ModbusRTUServerClass()

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

if (!ModbusServer::begin(mb, id)) {
return 0;
Expand All @@ -58,4 +59,4 @@ void ModbusRTUServerClass::poll()
}
}

ModbusRTUServerClass ModbusRTUServer;
ModbusRTUServerClass ModbusRTUServer(RS485);
7 changes: 6 additions & 1 deletion src/ModbusRTUServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
#ifndef _MODBUS_RTU_SERVER_H_INCLUDED
#define _MODBUS_RTU_SERVER_H_INCLUDED

#include <ArduinoRS485.h>

#include "ModbusServer.h"

class ModbusRTUServerClass : public ModbusServer {
public:
ModbusRTUServerClass();
ModbusRTUServerClass(RS485Class& rs485);
virtual ~ModbusRTUServerClass();

/**
Expand All @@ -42,6 +44,9 @@ class ModbusRTUServerClass : public ModbusServer {
* Poll interface for requests
*/
virtual void poll();

private:
RS485Class* _rs485;
};

extern ModbusRTUServerClass ModbusRTUServer;
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 @@ -47,6 +47,7 @@ struct win32_ser {

typedef struct _modbus_rtu {
#if defined(ARDUINO)
RS485Class* rs485;
unsigned long baud;
uint16_t config;
#else
Expand Down
41 changes: 19 additions & 22 deletions src/libmodbus/modbus-rtu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#include <assert.h>

#ifdef ARDUINO
#include <ArduinoRS485.h>

#ifndef DEBUG
#define printf(...) {}
#define fprintf(...) {}
Expand Down Expand Up @@ -323,15 +321,15 @@ 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)
(void)ctx;
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;

ssize_t size;

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

return size;
#else
Expand Down Expand Up @@ -394,9 +392,9 @@ 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)
(void)ctx;
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;

return RS485.readBytes(rsp, rsp_length);
return ctx_rtu->rs485->readBytes(rsp, rsp_length);
#else
return read(ctx->s, rsp, rsp_length);
#endif
Expand Down Expand Up @@ -654,8 +652,8 @@ static int _modbus_rtu_connect(modbus_t *ctx)
return -1;
}
#elif defined(ARDUINO)
RS485.begin(ctx_rtu->baud, ctx_rtu->config);
RS485.receive();
ctx_rtu->rs485->begin(ctx_rtu->baud, ctx_rtu->config);
ctx_rtu->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 @@ -1208,10 +1206,8 @@ static void _modbus_rtu_close(modbus_t *ctx)
(int)GetLastError());
}
#elif defined(ARDUINO)
(void)ctx_rtu;

RS485.noReceive();
RS485.end();
ctx_rtu->rs485->noReceive();
ctx_rtu->rs485->end();
#else
if (ctx->s != -1) {
tcsetattr(ctx->s, TCSANOW, &ctx_rtu->old_tios);
Expand All @@ -1228,10 +1224,10 @@ 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)
(void)ctx;
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;

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

return 0;
Expand All @@ -1256,14 +1252,14 @@ static int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
return -1;
}
#elif defined(ARDUINO)
(void)ctx;
modbus_rtu_t *ctx_rtu = (modbus_rtu_t*)ctx->backend_data;
(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 = ctx_rtu->rs485->available();

if (s_rc >= length_to_read) {
break;
Expand Down Expand Up @@ -1330,7 +1326,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(RS485Class *rs485, unsigned long baud, uint16_t config)
#else
modbus_t* modbus_new_rtu(const char *device,
int baud, char parity, int data_bit,
Expand Down Expand Up @@ -1362,6 +1358,7 @@ modbus_t* modbus_new_rtu(const char *device,
ctx->backend_data = (modbus_rtu_t *)malloc(sizeof(modbus_rtu_t));
ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
#ifdef ARDUINO
ctx_rtu->rs485 = rs485;
ctx_rtu->baud = baud;
ctx_rtu->config = config;
#else
Expand Down
4 changes: 3 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 @@ -18,7 +18,9 @@ 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);
class RS485Class;

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