Skip to content

Fix error non-void function and usage of non-standard port #2

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
M256-Automation wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix error non-void function and usage of non-standard port #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
718823f
Fix error: control reaches end of non-void function
M256-Automation Dec 14, 2022
d8b2641
Fix error: control reaches end of non-void function
M256-Automation Dec 14, 2022
ff4585d
new function ofxModbusTcpClient::setup(string _ip, int _numberOfSlave…
M256-Automation Dec 14, 2022
82d8551
new function ofxModbusTcpClient::setup(string _ip, int _numberOfSlave…
M256-Automation Dec 14, 2022
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
2 changes: 2 additions & 0 deletions src/modbusSlave.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ class slave {
return C.at(_coilAddress);
} else {
ofLogError("ofxModbusTCP Slave:"+ofToString(idNumber)+" on "+masterIP)<<"Get Slave Coil Exceeds Size";
return 0;
}
}
int getRegister (int _registerAddress) {
if (_registerAddress < R.size()) {
return R.at(_registerAddress);
} else {
ofLogError("ofxModbusTCP Slave:"+ofToString(idNumber)+" on "+masterIP)<<"Get Slave Register Exceeds Size";
return 0;
}
}

Expand Down
13 changes: 13 additions & 0 deletions src/ofxModbusTcpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,21 @@ void ofxModbusTcpClient::setup(string _ip, int _numberOfSlaves) {
ofLogVerbose("ofxModbusTCP IP:"+ip)<<"Setup with "<<numberOfSlaves<<" slaves";
setupSlaves();
}

void ofxModbusTcpClient::setup(string _ip) {
ip = _ip;
numberOfSlaves = 1;
ofLogVerbose("ofxModbusTCP IP:"+ip)<<"Setup with "<<numberOfSlaves<<" slaves";
setupSlaves();
}
void ofxModbusTcpClient::setup(string _ip, int _numberOfSlaves, int _port) {
ip = _ip;
port = _port;
numberOfSlaves = _numberOfSlaves;
if (numberOfSlaves == 0 || numberOfSlaves > 247) { numberOfSlaves = 1; }
ofLogVerbose("ofxModbusTCP IP:"+ip)<<"Setup with "<<numberOfSlaves<<" slaves";
setupSlaves();
}
void ofxModbusTcpClient::setupSlaves() {
for (int i = 0; i<=numberOfSlaves; i++) {
slaves.push_back(new slave(i+1, numOfCoils, numOfRegisters));
Expand Down Expand Up @@ -362,6 +371,8 @@ bool ofxModbusTcpClient::getCoil(int _id, int _startAddress) {
if (enabled) {
if (_id>0 && _id < slaves.size() && _startAddress < numOfCoils) {
return slaves.at(_id-1)->getCoil(_startAddress);
} else {
return false;
}
} else {
return false;
Expand All @@ -371,6 +382,8 @@ int ofxModbusTcpClient::getRegister(int _id, int _startAddress) {
if (enabled ) {
if (_id>0 && _id < slaves.size() && _startAddress < numOfRegisters) {
return slaves.at(_id-1)->getRegister(_startAddress);
} else {
return 0;
}
} else {
return 0;
Expand Down
1 change: 1 addition & 0 deletions src/ofxModbusTcpClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class ofxModbusTcpClient : public ofThread {

void setup(string _ip, int _numberOfSlaves);
void setup(string _ip);
void setup(string _ip, int _numberOfSlaves, int _port);

void connect();
void disconnect();
Expand Down