Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • cs/ds/ionpump
1 result
Show changes
Commits on Source (1)
......@@ -204,7 +204,7 @@ void Ionpump::always_executed_hook()
* bit 7 = cable interlock (1 = active)
*/
char mask[12];
char mask[14];
std::stringstream s;
sprintf(mask,"StatMask%d",channel);
......@@ -269,7 +269,7 @@ void Ionpump::read_Pressure(Tango::Attribute &attr)
/*----- PROTECTED REGION ID(Ionpump::read_Pressure) ENABLED START -----*/
double pressure;
char mask[12];
char mask[14];
sprintf(mask,"Pressure%d",channel);
string press_attr(mask);
......@@ -317,7 +317,7 @@ void Ionpump::read_Voltage(Tango::Attribute &attr)
/*----- PROTECTED REGION ID(Ionpump::read_Voltage) ENABLED START -----*/
double voltage;
char mask[12];
char mask[13];
sprintf(mask,"Voltage%d",channel);
string volt_attr(mask);
......@@ -354,7 +354,7 @@ void Ionpump::read_Current(Tango::Attribute &attr)
/*----- PROTECTED REGION ID(Ionpump::read_Current) ENABLED START -----*/
double current;
char mask[12];
char mask[13];
sprintf(mask,"Current%d",channel);
string curr_attr(mask);
......
......@@ -182,7 +182,7 @@ public:
// Additional Method prototypes
protected :
Tango::DeviceProxy *devps; // dual device server
short channel;
unsigned short channel;
string psname;
/*
......