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

Jump to bottom

[NOT FOR MERGE] Feature/coe parametrization #12

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

[NOT FOR MERGE] Feature/coe parametrization #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e881a13
add soem_master_types.hpp
MagnaboscoL Oct 14, 2016
72ef26e
updated files containing features
MagnaboscoL Oct 14, 2016
e3a1f7a
minor space canges in soem_driver.h
MagnaboscoL Oct 14, 2016
95b61fd
tab alignment fix in soem_master_component
MagnaboscoL Oct 14, 2016
c4b7c2f
white spaces fixing
MagnaboscoL Oct 14, 2016
59de91a
Feature/coe parametrization (#1)
MagnaboscoL Oct 14, 2016
749a4d8
fixing marked issues for pr
MagnaboscoL Oct 18, 2016
2170278
fix for pr
MagnaboscoL Oct 18, 2016
0194536
Merge branch 'master' into feature/coe_parametrization
MagnaboscoL Oct 18, 2016
ee637f7
Feature/coe parametrization (#2)
MagnaboscoL Oct 18, 2016
40615fa
improved enum ec_state management
MagnaboscoL Oct 20, 2016
9970b65
Merge branch 'master' of github.com:MagnaboscoL/rtt_soem
MagnaboscoL Oct 20, 2016
f7ccbfe
minor bug fix
MagnaboscoL Oct 20, 2016
65bbbd5
fix style and SDO functions management
MagnaboscoL Oct 21, 2016
88f0907
style fixed
MagnaboscoL Oct 21, 2016
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
20 changes: 20 additions & 0 deletions soem_master/soem_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,22 @@ class SoemDriver
return (ec_state)(m_datap->state);
};

virtual int getInputByteLength(){
return (int)(m_datap->Ibytes);
};

virtual int getOutputByteLength(){
return (int)(m_datap->Obytes);
};

virtual int getInputBitLength(){
return (int)(m_datap->Ibits);
};

virtual int getOutputBitLength(){
return (int)(m_datap->Obits);
};

protected:
SoemDriver(ec_slavet* mem_loc) :
m_datap(mem_loc), m_name("Slave_" + to_string(m_datap->configadr,
Expand All @@ -114,6 +130,10 @@ class SoemDriver
m_service->addOperation("checkState",&SoemDriver::checkState,this).doc("check the slaves state").arg("state","state value to check");
m_service->addOperation("getState",&SoemDriver::getState,this).doc("request slave state");
m_service->addOperation("configure",&SoemDriver::configure,this).doc("Configure slave");
m_service->addOperation("getInputByteLength",&SoemDriver::getInputByteLength,this).doc("retrieve the length of the input cyclic data in bytes");
m_service->addOperation("getOutputByteLength",&SoemDriver::getOutputByteLength,this).doc("retrieve the length of the output cyclic data in bytes");
m_service->addOperation("getInputBitLength",&SoemDriver::getInputBitLength,this).doc("retrieve the length of the input cyclic data in bits");
m_service->addOperation("getOutputBitLength",&SoemDriver::getOutputBitLength,this).doc("retrieve the length of the output cyclic data in bits");
}
;
ec_slavet* m_datap;
Expand Down
Loading