Skip to content
Snippets Groups Projects
Commit fa2c3a5c authored by kochalas's avatar kochalas Committed by al.schwinn
Browse files

[SIL-317] Refactor getInputAddress and getOutputAddress and change

address variables from unsigned to signed
parent 34bda116
No related branches found
No related tags found
No related merge requests found
......@@ -127,50 +127,18 @@ namespace Silecs
Device(PLC* thePLC, const ElementXML& deviceNode, boost::ptr_vector<ElementXML>& blockNodes);
virtual ~Device();
inline unsigned long& getInputAddress(AccessArea area)
inline long& getInputAddress(AccessArea area)
{
switch (area)
{
case Digital:
{
return di_address_;
break;
}
case Analog:
{
return ai_address_;
break;
}
case Memory:
{
return address_;
break;
}
}
return address_;
if (area == Digital) return di_address_;
else if (area == Analog) return ai_address_;
return address_;
}
inline unsigned long& getOutputAddress(AccessArea area)
inline long& getOutputAddress(AccessArea area)
{
switch (area)
{
case Digital:
{
return do_address_;
break;
}
case Analog:
{
return ao_address_;
break;
}
case Memory:
{
return address_;
break;
}
}
return address_;
if (area == Digital) return do_address_;
else if (area == Analog) return ao_address_;
return address_;
}
Register* instantiateRegister(const boost::shared_ptr<ElementXML>& registerNode);
......@@ -207,11 +175,11 @@ namespace Silecs
/// Device attributes
std::string label_;
unsigned long address_;
unsigned long ai_address_;
unsigned long ao_address_;
unsigned long di_address_;
unsigned long do_address_;
long address_;
long ai_address_;
long ao_address_;
long di_address_;
long do_address_;
/// Register collection of that device
registerVectorType registerCol_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment