diff --git a/src/IPCMini.cpp b/src/IPCMini.cpp index 51109a7b8dbfa028978bff71fbab107cc9da81bd..c5ce7b6bed4f5adbbbd6bc53d380f719433eef68 100644 --- a/src/IPCMini.cpp +++ b/src/IPCMini.cpp @@ -249,6 +249,12 @@ void IPCMini::init_device() attr_Model_read[0] = new char[MAX_DEVSTRING_LENGTH]; attr_SerialNumber_read[0] = new char[MAX_DEVSTRING_LENGTH]; + // Waiting the device + int retries = 0; + while(get_state2() == 9 && retries++ < 5) { + sleep(1); + } + /* Che if the mBar is pressure unit used */ int pressure_unit; read_window(600, pressure_unit); @@ -565,8 +571,11 @@ void IPCMini::read_HVX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_HVX(Tango::Attribute &attr) entering... " << endl; Tango::DevState *att_value = get_HVX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_HVX) ENABLED START -----*/ + int win; + win = 10 + channel; + bool value; - read_window_from_cache(11, value); + read_window_from_cache(win, value); if (value) *att_value = Tango::ON; else @@ -588,8 +597,11 @@ void IPCMini::read_DeviceNumberX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_DeviceNumberX(Tango::Attribute &attr) entering... " << endl; Tango::DevLong *att_value = get_DeviceNumberX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_DeviceNumberX) ENABLED START -----*/ + int win; + win = 600 + (channel * 10); + int value; - read_window_from_cache(610, value); + read_window_from_cache(win, value); *att_value = value; attr.set_value(att_value); @@ -613,9 +625,12 @@ void IPCMini::write_DeviceNumberX(Tango::WAttribute &attr) /*----- PROTECTED REGION ID(IPCMini::write_DeviceNumberX) ENABLED START -----*/ check_init(); + int win; + win = 600 + (channel * 10); + int value = w_val; - write_window(610, value); - read_window_into_cache(610); + write_window(win, value); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::write_DeviceNumberX } @@ -633,8 +648,11 @@ void IPCMini::read_PowerMaxX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_PowerMaxX(Tango::Attribute &attr) entering... " << endl; Tango::DevLong *att_value = get_PowerMaxX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_PowerMaxX) ENABLED START -----*/ + int win; + win = 602 + (channel * 10); + int value; - read_window_from_cache(612, value); + read_window_from_cache(win, value); *att_value = value; attr.set_value(att_value); @@ -658,9 +676,12 @@ void IPCMini::write_PowerMaxX(Tango::WAttribute &attr) /*----- PROTECTED REGION ID(IPCMini::write_PowerMaxX) ENABLED START -----*/ check_init(); + int win; + win = 602 + (channel * 10); + int value = w_val; - write_window(612, value); - read_window_into_cache(612); + write_window(win, value); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::write_PowerMaxX } @@ -678,9 +699,11 @@ void IPCMini::read_VTargetX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_VTargetX(Tango::Attribute &attr) entering... " << endl; Tango::DevLong *att_value = get_VTargetX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_VTargetX) ENABLED START -----*/ + int win; + win = 603 + (channel * 10); int value; - read_window_from_cache(613, value); + read_window_from_cache(win, value); *att_value = value; attr.set_value(att_value); @@ -705,25 +728,21 @@ void IPCMini::write_VTargetX(Tango::WAttribute &attr) check_init(); int value = w_val; - if (value > 0 && value < 3000) + if (value < 3000 || value > 7000 || value % 1000) Tango::Except::throw_exception( "", - "Out of range [3000-7000]", + "Invalid value [3000,4000,5000,6000,7000]", "Agilent4uhv::write_VTargetX()"); - string fs; - read_window_from_cache(603, fs); - fs[0] = '0'; - write_window(603, fs); - - if (value != 0) { - write_window(613, value); - read_window_into_cache(613); - - fs[0] = '1'; - write_window(603, fs); - } + string step; + read_window_from_cache(603, step); + step[step.size()-channel] = '0'; + write_window(603, step); read_window_into_cache(603); + int win; + win = 603 + (channel * 10); + write_window(win, value); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::write_VTargetX } @@ -741,8 +760,11 @@ void IPCMini::read_IProtectX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_IProtectX(Tango::Attribute &attr) entering... " << endl; Tango::DevLong *att_value = get_IProtectX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_IProtectX) ENABLED START -----*/ + int win; + win = 604 + (channel * 10); + int value; - read_window_from_cache(614, value); + read_window_from_cache(win, value); *att_value = value; *att_value /= 1000; attr.set_value(att_value); @@ -767,9 +789,12 @@ void IPCMini::write_IProtectX(Tango::WAttribute &attr) /*----- PROTECTED REGION ID(IPCMini::write_IProtectX) ENABLED START -----*/ check_init(); + int win; + win = 604 + (channel * 10); + int value = w_val * 1000; - write_window(614, value); - read_window_into_cache(614); + write_window(win, value); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::write_IProtectX } @@ -787,7 +812,10 @@ void IPCMini::read_SetPointX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_SetPointX(Tango::Attribute &attr) entering... " << endl; Tango::DevDouble *att_value = get_SetPointX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_SetPointX) ENABLED START -----*/ - read_window_from_cache(615, *att_value); + int win; + win = 605 + (channel * 10); + + read_window_from_cache(win, *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_SetPointX @@ -808,8 +836,11 @@ void IPCMini::write_SetPointX(Tango::WAttribute &attr) Tango::DevDouble w_val; attr.get_write_value(w_val); /*----- PROTECTED REGION ID(IPCMini::write_SetPointX) ENABLED START -----*/ - write_window(615, w_val); - read_window_into_cache(615); + int win; + win = 605 + (channel * 10); + + write_window(win, w_val); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::write_SetPointX } @@ -850,8 +881,11 @@ void IPCMini::read_VoltageX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_VoltageX(Tango::Attribute &attr) entering... " << endl; Tango::DevDouble *att_value = get_VoltageX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_VoltageX) ENABLED START -----*/ + int win; + win = 800 + (channel * 10); + int value; - read_window_from_cache(810, value); + read_window_from_cache(win, value); convert(value, *att_value); attr.set_value(att_value); @@ -871,7 +905,9 @@ void IPCMini::read_CurrentX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_CurrentX(Tango::Attribute &attr) entering... " << endl; Tango::DevDouble *att_value = get_CurrentX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_CurrentX) ENABLED START -----*/ - read_window_from_cache(811, *att_value); + int win; + win = 801 + (channel * 10); + read_window_from_cache(win, *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_CurrentX @@ -890,7 +926,9 @@ void IPCMini::read_PressureX(Tango::Attribute &attr) DEBUG_STREAM << "IPCMini::read_PressureX(Tango::Attribute &attr) entering... " << endl; Tango::DevDouble *att_value = get_PressureX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_PressureX) ENABLED START -----*/ - read_window_from_cache(812, *att_value); + int win; + win = 802 + (channel * 10); + read_window_from_cache(win, *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_PressureX @@ -914,7 +952,7 @@ void IPCMini::read_StateX(Tango::Attribute &attr) read_window_from_cache(206, errorcodes); bool state; - read_window_from_cache(11, state); + read_window_from_cache(10 + channel, state); if (errorcodes) { *att_value = Tango::FAULT; @@ -947,7 +985,7 @@ void IPCMini::read_StatusX(Tango::Attribute &attr) string status; bool state; - read_window_from_cache(11, state); + read_window_from_cache(10 + channel, state); if (state) status = "The device is in ON state"; else @@ -987,7 +1025,7 @@ void IPCMini::read_AutoStartX(Tango::Attribute &attr) Tango::DevBoolean *att_value = get_AutoStartX_data_ptr(attr.get_name()); /*----- PROTECTED REGION ID(IPCMini::read_AutoStartX) ENABLED START -----*/ // Set the attribute value - read_window_from_cache(601, *att_value); + read_window_from_cache(600 + channel, *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_AutoStartX @@ -1010,7 +1048,7 @@ void IPCMini::write_AutoStartX(Tango::WAttribute &attr) /*----- PROTECTED REGION ID(IPCMini::write_AutoStartX) ENABLED START -----*/ check_init(); - write_window(601, w_val); + write_window(600 + channel, w_val); read_window_into_cache(601); /*----- PROTECTED REGION END -----*/ // IPCMini::write_AutoStartX @@ -1032,7 +1070,7 @@ void IPCMini::read_ProtectX(Tango::Attribute &attr) // Set the attribute value string protect; read_window_from_cache(602, protect); - convert(protect[protect.size()-1], *att_value); + convert(protect[protect.size()-channel], *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_ProtectX @@ -1056,12 +1094,12 @@ void IPCMini::write_ProtectX(Tango::WAttribute &attr) check_init(); string protect; - read_window_from_cache(602,protect); + read_window_from_cache(602, protect); if (w_val) - protect[protect.size()-1] = '1'; + protect[protect.size()-channel] = '1'; else - protect[protect.size()-1] = '0'; + protect[protect.size()-channel] = '0'; write_window(602, protect); read_window_into_cache(602); @@ -1069,56 +1107,61 @@ void IPCMini::write_ProtectX(Tango::WAttribute &attr) } //-------------------------------------------------------- /** - * Read attribute FixedStepX related method + * Read attribute FixedX related method * Description: * * Data type: Tango::DevBoolean * Attr type: Scalar */ //-------------------------------------------------------- -void IPCMini::read_FixedStepX(Tango::Attribute &attr) +void IPCMini::read_FixedX(Tango::Attribute &attr) { - DEBUG_STREAM << "IPCMini::read_FixedStepX(Tango::Attribute &attr) entering... " << endl; - Tango::DevBoolean *att_value = get_FixedStepX_data_ptr(attr.get_name()); - /*----- PROTECTED REGION ID(IPCMini::read_FixedStepX) ENABLED START -----*/ + DEBUG_STREAM << "IPCMini::read_FixedX(Tango::Attribute &attr) entering... " << endl; + Tango::DevBoolean *att_value = get_FixedX_data_ptr(attr.get_name()); + /*----- PROTECTED REGION ID(IPCMini::read_FixedX) ENABLED START -----*/ // Set the attribute value - string fs; - read_window_from_cache(603, fs); + string step; + read_window_from_cache(603, step); + + if (step[step.size()-channel] == '0') + *att_value = true; + else /* == 1 */ + *att_value = false; - convert(fs[fs.size()-1], *att_value); attr.set_value(att_value); - /*----- PROTECTED REGION END -----*/ // IPCMini::read_FixedStepX + /*----- PROTECTED REGION END -----*/ // IPCMini::read_FixedX } //-------------------------------------------------------- /** - * Write attribute FixedStepX related method + * Write attribute FixedX related method * Description: * * Data type: Tango::DevBoolean * Attr type: Scalar */ //-------------------------------------------------------- -void IPCMini::write_FixedStepX(Tango::WAttribute &attr) +void IPCMini::write_FixedX(Tango::WAttribute &attr) { - DEBUG_STREAM << "IPCMini::write_FixedStepX(Tango::WAttribute &attr) entering... " << endl; + DEBUG_STREAM << "IPCMini::write_FixedX(Tango::WAttribute &attr) entering... " << endl; // Retrieve write value Tango::DevBoolean w_val; attr.get_write_value(w_val); - /*----- PROTECTED REGION ID(IPCMini::write_FixedStepX) ENABLED START -----*/ + /*----- PROTECTED REGION ID(IPCMini::write_FixedX) ENABLED START -----*/ check_init(); - string fs; - read_window_from_cache(603, fs); + string step; + read_window_from_cache(603, step); if (w_val) - fs[fs.size()-1] = '1'; + step[step.size()-channel] = '0'; else - fs[fs.size()-1] = '0'; + step[step.size()-channel] = '1'; - write_window(603, fs); + write_window(603, step); read_window_into_cache(603); - /*----- PROTECTED REGION END -----*/ // IPCMini::write_FixedStepX + + /*----- PROTECTED REGION END -----*/ // IPCMini::write_FixedX } //-------------------------------------------------------- /** @@ -1137,7 +1180,7 @@ void IPCMini::read_StatusSetPointX(Tango::Attribute &attr) string ss; read_window_from_cache(804, ss); - convert(ss[ss.size()-1], *att_value); + convert(ss[ss.size()-channel], *att_value); attr.set_value(att_value); /*----- PROTECTED REGION END -----*/ // IPCMini::read_StatusSetPointX @@ -1160,29 +1203,29 @@ void IPCMini::read_StatMaskX(Tango::Attribute &attr) *att_value = 0; bool state; - read_window_from_cache(11, state); + read_window_from_cache(10 + channel, state); if (state) - *att_value |= 0x1; + *att_value |= 1; int mode; read_window_from_cache(8, mode); if (mode != 3 /* LOCAL */) - *att_value |= 0x1 << 1; + *att_value |= 1 << 1; int errorcodes; read_window_from_cache(206, errorcodes); if (errorcodes != 0) - *att_value |= 0x1 << 2; + *att_value |= 1 << 2; - string fs; - read_window_from_cache(603, fs); - if (fs[fs.size()-1] == '0') - *att_value |= 0x1 << 3; + string step; + read_window_from_cache(603, step); + if (step[step.size()-channel] == '1') + *att_value |= 1 << 3; string sp; read_window_from_cache(602, sp); - if (sp[sp.size()-1] == '1') - *att_value |= 0x1 << 4; + if (sp[sp.size()-channel] == '1') + *att_value |= 1 << 4; // FIXME bits 5,6 and 7 aren't implemented @@ -1215,7 +1258,7 @@ void IPCMini::add_dynamic_attributes() // add_StatusX_dynamic_attribute("MyStatusXAttribute"); // add_AutoStartX_dynamic_attribute("MyAutoStartXAttribute"); // add_ProtectX_dynamic_attribute("MyProtectXAttribute"); - // add_FixedStepX_dynamic_attribute("MyFixedStepXAttribute"); + // add_FixedX_dynamic_attribute("MyFixedXAttribute"); // add_StatusSetPointX_dynamic_attribute("MyStatusSetPointXAttribute"); // add_StatMaskX_dynamic_attribute("MyStatMaskXAttribute"); @@ -1241,7 +1284,7 @@ void IPCMini::add_dynamic_attributes() add_AutoStartX_dynamic_attribute("AutoStart1"); add_ProtectX_dynamic_attribute("Protect1"); - add_FixedStepX_dynamic_attribute("Fixed1"); + add_FixedX_dynamic_attribute("Fixed1"); add_StatusSetPointX_dynamic_attribute("StatusSetPoint1"); add_StatMaskX_dynamic_attribute("StatMask1"); @@ -1262,9 +1305,12 @@ void IPCMini::off_hvx(Tango::Command &command) // Add your own code check_init(); + + int win; + win = 10 + channel; - write_window(11, false); - read_window_into_cache(11); + write_window(win, false); + read_window_into_cache(win); /*----- PROTECTED REGION END -----*/ // IPCMini::off_hvx @@ -1284,10 +1330,12 @@ void IPCMini::on_hvx(Tango::Command &command) // Add your own code check_init(); - write_window(11, true); - read_window_into_cache(11); + int win; + win = 10 + channel; + + write_window(win, true); + read_window_into_cache(win); - /*----- PROTECTED REGION END -----*/ // IPCMini::on_hvx } //-------------------------------------------------------- @@ -1601,12 +1649,11 @@ void* IPCMiniWorker::run_undetached(void * /*ptr*/) it = device->polled_windows.begin(); } } catch(Tango::DevFailed &e) { + ERROR_STREAM << string(e.errors[0].desc) << endl; /* Restart from begin */ it = device->polled_windows.begin(); /* Set UNKNOWN state */ - static const int m[] = {STX, ADDR, '2', '0', '5', READ_WINDOW, - '1', '1', '1', '1', '1', '1', ETX, 0x38, 0x34}; - vector<unsigned char> message(m, m + sizeof(m) / sizeof(m[0])); + vector<unsigned char> message(6, '1'); device->cache.set(205, message); assert(false); } diff --git a/src/IPCMini.h b/src/IPCMini.h index 5a4b64a1674ac3e4e44cc3e1ce4871e853231741..4fe3b1220490eb81b319087424e5667b929fe700 100644 --- a/src/IPCMini.h +++ b/src/IPCMini.h @@ -83,6 +83,7 @@ class IPCMini : public Serial2Client_ns::Serial2Client /*----- PROTECTED REGION ID(IPCMini::Data Members) ENABLED START -----*/ // Add your own data members + const int channel = 1; string init_error; public: @@ -406,19 +407,19 @@ public: map<string,Tango::DevBoolean> ProtectX_data; /** - * Attribute FixedStepX related methods + * Attribute FixedX related methods * Description: * * Data type: Tango::DevBoolean * Attr type: Scalar */ - virtual void read_FixedStepX(Tango::Attribute &attr); - virtual void write_FixedStepX(Tango::WAttribute &attr); - virtual bool is_FixedStepX_allowed(Tango::AttReqType type); - void add_FixedStepX_dynamic_attribute(string attname); - void remove_FixedStepX_dynamic_attribute(string attname); - Tango::DevBoolean *get_FixedStepX_data_ptr(string &name); - map<string,Tango::DevBoolean> FixedStepX_data; + virtual void read_FixedX(Tango::Attribute &attr); + virtual void write_FixedX(Tango::WAttribute &attr); + virtual bool is_FixedX_allowed(Tango::AttReqType type); + void add_FixedX_dynamic_attribute(string attname); + void remove_FixedX_dynamic_attribute(string attname); + Tango::DevBoolean *get_FixedX_data_ptr(string &name); + map<string,Tango::DevBoolean> FixedX_data; /** * Attribute StatusSetPointX related methods diff --git a/src/IPCMini.xmi b/src/IPCMini.xmi index d56b4baa891d0807b9e87297afa56fe41df837cc..55c9d807a44707f4e15b64b3245a34a1d2a14bc7 100644 --- a/src/IPCMini.xmi +++ b/src/IPCMini.xmi @@ -125,7 +125,7 @@ <archiveEvent fire="false" libCheckCriteria="false"/> <dataReadyEvent fire="false" libCheckCriteria="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - <properties description="" label="" unit="V" standardUnit="" displayUnit="" format="" maxValue="7000" minValue="0" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/> + <properties description="" label="" unit="V" standardUnit="" displayUnit="" format="" maxValue="7000" minValue="3000" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/> <readExcludedStates>UNKNOWN</readExcludedStates> <readExcludedStates>INIT</readExcludedStates> <writeExcludedStates>UNKNOWN</writeExcludedStates> @@ -239,7 +239,7 @@ <writeExcludedStates>UNKNOWN</writeExcludedStates> <writeExcludedStates>INIT</writeExcludedStates> </dynamicAttributes> - <dynamicAttributes name="FixedStepX" attType="Scalar" rwType="READ_WRITE" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="false" isDynamic="true"> + <dynamicAttributes name="FixedX" attType="Scalar" rwType="READ_WRITE" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="false" isDynamic="true"> <dataType xsi:type="pogoDsl:BooleanType"/> <changeEvent fire="false" libCheckCriteria="false"/> <archiveEvent fire="false" libCheckCriteria="false"/> diff --git a/src/IPCMiniClass.cpp b/src/IPCMiniClass.cpp index 1bd9aa387039de3d31b75c38b0af7700319799d6..d6139d39678187a550742081ae4552bd62b7b9b3 100644 --- a/src/IPCMiniClass.cpp +++ b/src/IPCMiniClass.cpp @@ -263,7 +263,7 @@ void IPCMiniClass::set_default_property() // Set Default device Properties prop_name = "PollingSleep"; - prop_desc = "Sleep between hardware requests made by internal thread (max value is 1000000)"; + prop_desc = "Sleep between hardware requests made by internal thread"; prop_def = "0"; vect_data.clear(); vect_data.push_back("0"); diff --git a/src/IPCMiniClass.h b/src/IPCMiniClass.h index bac87d14624417724c90b8a740f0dfcc3e6a94d3..17f69d5e522b9f251e9f0338d2059b6cff8b8e22 100644 --- a/src/IPCMiniClass.h +++ b/src/IPCMiniClass.h @@ -299,19 +299,19 @@ public: {return (static_cast<IPCMini *>(dev))->is_ProtectX_allowed(ty);} }; -// Attribute FixedStepX class definition -class FixedStepXAttrib: public Tango::Attr +// Attribute FixedX class definition +class FixedXAttrib: public Tango::Attr { public: - FixedStepXAttrib(const string &att_name):Attr(att_name.c_str(), + FixedXAttrib(const string &att_name):Attr(att_name.c_str(), Tango::DEV_BOOLEAN, Tango::READ_WRITE) {}; - ~FixedStepXAttrib() {}; + ~FixedXAttrib() {}; virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att) - {(static_cast<IPCMini *>(dev))->read_FixedStepX(att);} + {(static_cast<IPCMini *>(dev))->read_FixedX(att);} virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att) - {(static_cast<IPCMini *>(dev))->write_FixedStepX(att);} + {(static_cast<IPCMini *>(dev))->write_FixedX(att);} virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty) - {return (static_cast<IPCMini *>(dev))->is_FixedStepX_allowed(ty);} + {return (static_cast<IPCMini *>(dev))->is_FixedX_allowed(ty);} }; // Attribute StatusSetPointX class definition diff --git a/src/IPCMiniDynAttrUtils.cpp b/src/IPCMiniDynAttrUtils.cpp index 940ebc3d687bb85e77af3cc72bc5d20736b24482..8012afa9803931d517d29803785f8ac80667d16e 100644 --- a/src/IPCMiniDynAttrUtils.cpp +++ b/src/IPCMiniDynAttrUtils.cpp @@ -57,7 +57,7 @@ // StatusX | Tango::DevString Scalar // AutoStartX | Tango::DevBoolean Scalar // ProtectX | Tango::DevBoolean Scalar -// FixedStepX | Tango::DevBoolean Scalar +// FixedX | Tango::DevBoolean Scalar // StatusSetPointX | Tango::DevBoolean Scalar // StatMaskX | Tango::DevLong Scalar //================================================================ @@ -270,7 +270,7 @@ void IPCMini::add_VTargetX_dynamic_attribute(string attname) // display_unit not set for VTargetX // format not set for VTargetX vtargetx_prop.set_max_value("7000"); - vtargetx_prop.set_min_value("0"); + vtargetx_prop.set_min_value("3000"); // max_alarm not set for VTargetX // min_alarm not set for VTargetX // max_warning not set for VTargetX @@ -882,59 +882,59 @@ void IPCMini::remove_ProtectX_dynamic_attribute(string attname) } //-------------------------------------------------------- /** - * Add a FixedStepX dynamic attribute. + * Add a FixedX dynamic attribute. * * parameter attname: attribute name to be cretated and added. */ //-------------------------------------------------------- -void IPCMini::add_FixedStepX_dynamic_attribute(string attname) +void IPCMini::add_FixedX_dynamic_attribute(string attname) { - // Attribute : FixedStepX - FixedStepXAttrib *fixedstepx = new FixedStepXAttrib(attname); - Tango::UserDefaultAttrProp fixedstepx_prop; - // description not set for FixedStepX - // label not set for FixedStepX - // unit not set for FixedStepX - // standard_unit not set for FixedStepX - // display_unit not set for FixedStepX - // format not set for FixedStepX - // max_value not set for FixedStepX - // min_value not set for FixedStepX - // max_alarm not set for FixedStepX - // min_alarm not set for FixedStepX - // max_warning not set for FixedStepX - // min_warning not set for FixedStepX - // delta_t not set for FixedStepX - // delta_val not set for FixedStepX + // Attribute : FixedX + FixedXAttrib *fixedx = new FixedXAttrib(attname); + Tango::UserDefaultAttrProp fixedx_prop; + // description not set for FixedX + // label not set for FixedX + // unit not set for FixedX + // standard_unit not set for FixedX + // display_unit not set for FixedX + // format not set for FixedX + // max_value not set for FixedX + // min_value not set for FixedX + // max_alarm not set for FixedX + // min_alarm not set for FixedX + // max_warning not set for FixedX + // min_warning not set for FixedX + // delta_t not set for FixedX + // delta_val not set for FixedX - /*----- PROTECTED REGION ID(IPCMini::att_FixedStepX_dynamic_attribute) ENABLED START -----*/ + /*----- PROTECTED REGION ID(IPCMini::att_FixedX_dynamic_attribute) ENABLED START -----*/ - /*----- PROTECTED REGION END -----*/ // IPCMini::att_FixedStepX_dynamic_attribute - fixedstepx->set_default_properties(fixedstepx_prop); + /*----- PROTECTED REGION END -----*/ // IPCMini::att_FixedX_dynamic_attribute + fixedx->set_default_properties(fixedx_prop); // Not Polled - fixedstepx->set_disp_level(Tango::OPERATOR); + fixedx->set_disp_level(Tango::OPERATOR); // Not Memorized - FixedStepX_data.insert(make_pair(attname, false)); - add_attribute(fixedstepx); + FixedX_data.insert(make_pair(attname, false)); + add_attribute(fixedx); } //-------------------------------------------------------- /** - * remove a FixedStepX dynamic attribute. + * remove a FixedX dynamic attribute. * * parameter attname: attribute name to be removed. */ //-------------------------------------------------------- -void IPCMini::remove_FixedStepX_dynamic_attribute(string attname) +void IPCMini::remove_FixedX_dynamic_attribute(string attname) { remove_attribute(attname, true); map<string,Tango::DevBoolean>::iterator ite; - if ((ite=FixedStepX_data.find(attname))!=FixedStepX_data.end()) + if ((ite=FixedX_data.find(attname))!=FixedX_data.end()) { - /*----- PROTECTED REGION ID(IPCMini::remove_FixedStepX_dynamic_attribute) ENABLED START -----*/ + /*----- PROTECTED REGION ID(IPCMini::remove_FixedX_dynamic_attribute) ENABLED START -----*/ - /*----- PROTECTED REGION END -----*/ // IPCMini::remove_FixedStepX_dynamic_attribute - FixedStepX_data.erase(ite); + /*----- PROTECTED REGION END -----*/ // IPCMini::remove_FixedX_dynamic_attribute + FixedX_data.erase(ite); } } //-------------------------------------------------------- @@ -1352,22 +1352,22 @@ Tango::DevBoolean *IPCMini::get_ProtectX_data_ptr(string &name) } //-------------------------------------------------------- /** - * Return a pointer on FixedStepX data. + * Return a pointer on FixedX data. * * parameter attname: the specified attribute name. */ //-------------------------------------------------------- -Tango::DevBoolean *IPCMini::get_FixedStepX_data_ptr(string &name) +Tango::DevBoolean *IPCMini::get_FixedX_data_ptr(string &name) { map<string,Tango::DevBoolean>::iterator ite; - if ((ite=FixedStepX_data.find(name))==FixedStepX_data.end()) + if ((ite=FixedX_data.find(name))==FixedX_data.end()) { TangoSys_OMemStream tms; tms << "Dynamic attribute " << name << " has not been created"; Tango::Except::throw_exception( (const char *)"ATTRIBUTE_NOT_FOUND", tms.str().c_str(), - (const char *)"IPCMini::get_FixedStepX_data_ptr()"); + (const char *)"IPCMini::get_FixedX_data_ptr()"); } return &(ite->second); } diff --git a/src/IPCMiniStateMachine.cpp b/src/IPCMiniStateMachine.cpp index 2440c08eeefc8e17ab9d5fe290527e8191712a50..4b9a2287860eed99892fa8efc6aa038a7a854cdb 100644 --- a/src/IPCMiniStateMachine.cpp +++ b/src/IPCMiniStateMachine.cpp @@ -602,11 +602,11 @@ bool IPCMini::is_ProtectX_allowed(TANGO_UNUSED(Tango::AttReqType type)) //-------------------------------------------------------- /** - * Method : IPCMini::is_FixedStepX_allowed() - * Description : Execution allowed for FixedStepX attribute + * Method : IPCMini::is_FixedX_allowed() + * Description : Execution allowed for FixedX attribute */ //-------------------------------------------------------- -bool IPCMini::is_FixedStepX_allowed(TANGO_UNUSED(Tango::AttReqType type)) +bool IPCMini::is_FixedX_allowed(TANGO_UNUSED(Tango::AttReqType type)) { // Check access type. if ( type!=Tango::READ_REQ ) @@ -615,9 +615,9 @@ bool IPCMini::is_FixedStepX_allowed(TANGO_UNUSED(Tango::AttReqType type)) if (get_state()==Tango::UNKNOWN || get_state()==Tango::INIT) { - /*----- PROTECTED REGION ID(IPCMini::FixedStepXStateAllowed_WRITE) ENABLED START -----*/ + /*----- PROTECTED REGION ID(IPCMini::FixedXStateAllowed_WRITE) ENABLED START -----*/ - /*----- PROTECTED REGION END -----*/ // IPCMini::FixedStepXStateAllowed_WRITE + /*----- PROTECTED REGION END -----*/ // IPCMini::FixedXStateAllowed_WRITE return false; } return true; @@ -631,9 +631,9 @@ bool IPCMini::is_FixedStepX_allowed(TANGO_UNUSED(Tango::AttReqType type)) if (get_state()==Tango::UNKNOWN || get_state()==Tango::INIT) { - /*----- PROTECTED REGION ID(IPCMini::FixedStepXStateAllowed_READ) ENABLED START -----*/ + /*----- PROTECTED REGION ID(IPCMini::FixedXStateAllowed_READ) ENABLED START -----*/ - /*----- PROTECTED REGION END -----*/ // IPCMini::FixedStepXStateAllowed_READ + /*----- PROTECTED REGION END -----*/ // IPCMini::FixedXStateAllowed_READ return false; } return true;