Skip to content

Callback function implementation for Coil/Hreg writes #9

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

Callback function implementation for Coil/Hreg writes #9

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
57 changes: 31 additions & 26 deletions libraries/Modbus/Modbus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ TRegister* Modbus::searchRegister(word address) {
return(0);
}

void Modbus::addReg(word address, word value) {
void Modbus::addReg(word address, word value, word (*cb) (word, byte)) {
TRegister *newreg;

newreg = (TRegister *) malloc(sizeof(TRegister));
newreg->address = address;
newreg->value = value;
newreg->cb = cb; //pointer to callback
newreg->next = 0;

if(_regs_head == 0) {
Expand All @@ -41,14 +42,18 @@ void Modbus::addReg(word address, word value) {
}
}

bool Modbus::Reg(word address, word value) {
bool Modbus::Reg(word address, word value, byte src) {
TRegister *reg;
//search for the register address
reg = this->searchRegister(address);
//if found then assign the register value to the new value.
if (reg) {
reg->value = value;
return true;
// reg->value = value;
if (reg->cb != 0) {
reg->value = reg->cb(value, src); // rising a callback if assigned
} else reg->value = value;

return true;
} else
return false;
}
Expand All @@ -62,41 +67,41 @@ word Modbus::Reg(word address) {
return(0);
}

void Modbus::addHreg(word offset, word value) {
this->addReg(offset + 40001, value);
void Modbus::addHreg(word offset, word value, word (*cb) (word, byte)) {
this->addReg(offset + 40001, value, cb);
}

bool Modbus::Hreg(word offset, word value) {
return Reg(offset + 40001, value);
bool Modbus::Hreg(word offset, word value, byte src) {
return Reg(offset + 40001, value, src);
}

word Modbus::Hreg(word offset) {
return Reg(offset + 40001);
}

#ifndef USE_HOLDING_REGISTERS_ONLY
void Modbus::addCoil(word offset, bool value) {
this->addReg(offset + 1, value?0xFF00:0x0000);
void Modbus::addCoil(word offset, bool value, word (*cb) (word, byte)) {
this->addReg(offset + 1, value?0xFF00:0x0000, cb);
}

void Modbus::addIsts(word offset, bool value) {
this->addReg(offset + 10001, value?0xFF00:0x0000);
void Modbus::addIsts(word offset, bool value, word (*cb) (word, byte)) {
this->addReg(offset + 10001, value?0xFF00:0x0000, cb);
}

void Modbus::addIreg(word offset, word value) {
this->addReg(offset + 30001, value);
void Modbus::addIreg(word offset, word value, word (*cb) (word, byte)) {
this->addReg(offset + 30001, value, cb);
}

bool Modbus::Coil(word offset, bool value) {
return Reg(offset + 1, value?0xFF00:0x0000);
bool Modbus::Coil(word offset, bool value, byte src) {
return Reg(offset + 1, value?0xFF00:0x0000, src);
}

bool Modbus::Ists(word offset, bool value) {
return Reg(offset + 10001, value?0xFF00:0x0000);
bool Modbus::Ists(word offset, bool value, byte src) {
return Reg(offset + 10001, value?0xFF00:0x0000, src);
}

bool Modbus::Ireg(word offset, word value) {
return Reg(offset + 30001, value);
bool Modbus::Ireg(word offset, word value, byte src) {
return Reg(offset + 30001, value, src);
}

bool Modbus::Coil(word offset) {
Expand Down Expand Up @@ -162,8 +167,8 @@ void Modbus::receivePDU(byte* frame) {

case MB_FC_WRITE_COILS:
//field1 = startreg, field2 = numoutputs
this->writeMultipleCoils(frame,field1, field2, frame[5]);
break;
this->writeMultipleCoils(frame, field1, field2, frame[5]);
break;

#endif
default:
Expand Down Expand Up @@ -232,7 +237,7 @@ void Modbus::readRegisters(word startreg, word numregs) {
void Modbus::writeSingleRegister(word reg, word value) {
//No necessary verify illegal value (EX_ILLEGAL_VALUE) - because using word (0x0000 - 0x0FFFF)
//Check Address and execute (reg exists?)
if (!this->Hreg(reg, value)) {
if (!this->Hreg(reg, value, MB_FC_WRITE_REG)) { //pass MB_FC_WRITE_REG as callback source
this->exceptionResponse(MB_FC_WRITE_REG, MB_EX_ILLEGAL_ADDRESS);
return;
}
Expand Down Expand Up @@ -280,7 +285,7 @@ void Modbus::writeMultipleRegisters(byte* frame,word startreg, word numoutputs,
word i = 0;
while(numoutputs--) {
val = (word)frame[6+i*2] << 8 | (word)frame[7+i*2];
this->Hreg(startreg + i, val);
this->Hreg(startreg + i, val, MB_FC_WRITE_REGS); //pass MB_FC_WRITE_REGS as callback source
i++;
}

Expand Down Expand Up @@ -447,7 +452,7 @@ void Modbus::writeSingleCoil(word reg, word status) {
}

//Check Address and execute (reg exists?)
if (!this->Coil(reg, (bool)status)) {
if (!this->Coil(reg, (bool)status, MB_FC_WRITE_COIL)) { //pass MB_FC_WRITE_COIL as callback source
this->exceptionResponse(MB_FC_WRITE_COIL, MB_EX_ILLEGAL_ADDRESS);
return;
}
Expand Down Expand Up @@ -498,7 +503,7 @@ void Modbus::writeMultipleCoils(byte* frame,word startreg, word numoutputs, byte
word i;
while (numoutputs--) {
i = (totoutputs - numoutputs) / 8;
this->Coil(startreg, bitRead(frame[6+i], bitn));
this->Coil(startreg, bitRead(frame[6+i], bitn), MB_FC_WRITE_COILS); //pass MB_FC_WRITE_COILS as callback source
//increment the bit index
bitn++;
if (bitn == 8) bitn = 0;
Expand Down
23 changes: 12 additions & 11 deletions libraries/Modbus/Modbus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ enum {
typedef struct TRegister {
word address;
word value;
word (*cb) (word, byte); // pointer to callback function
struct TRegister* next;
} TRegister;

Expand All @@ -51,7 +52,7 @@ class Modbus {
TRegister *_regs_head;
TRegister *_regs_last;

void readRegisters(word startreg, word numregs);
void readRegisters(word startreg, word numregs);
void writeSingleRegister(word reg, word value);
void writeMultipleRegisters(byte* frame,word startreg, word numoutputs, byte bytecount);
void exceptionResponse(byte fcode, byte excode);
Expand All @@ -65,8 +66,8 @@ class Modbus {

TRegister* searchRegister(word addr);

void addReg(word address, word value = 0);
bool Reg(word address, word value);
void addReg(word address, word value = 0, word (*cb)(word, byte) = 0);
Copy link

@wvengen wvengen Sep 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<nitpick>wouldn't = NULL be slightly more expressive?</nitpick>?

bool Reg(word address, word value, byte src = 0);
word Reg(word address);

protected:
Expand All @@ -78,18 +79,18 @@ class Modbus {
public:
Modbus();

void addHreg(word offset, word value = 0);
bool Hreg(word offset, word value);
void addHreg(word offset, word value = 0, word (*cb)(word, byte) = 0);
bool Hreg(word offset, word value, byte src = 0);
word Hreg(word offset);

#ifndef USE_HOLDING_REGISTERS_ONLY
void addCoil(word offset, bool value = false);
void addIsts(word offset, bool value = false);
void addIreg(word offset, word value = 0);
void addCoil(word offset, bool value = false, word (*cb)(word, byte) = 0);
void addIsts(word offset, bool value = false, word (*cb)(word, byte) = 0);
void addIreg(word offset, word value = 0, word (*cb)(word, byte) = 0);

bool Coil(word offset, bool value);
bool Ists(word offset, bool value);
bool Ireg(word offset, word value);
bool Coil(word offset, bool value, byte src = 0);
bool Ists(word offset, bool value, byte src = 0);
bool Ireg(word offset, word value, byte src = 0);

bool Coil(word offset);
bool Ists(word offset);
Expand Down