diff --git a/doc/doc_html/Properties.html b/doc/doc_html/Properties.html index b0ca154d0bb3d692ca8b8140e4764919782f5c2d..95f05a3877d88c537c66c17dae16e9d4ed1748fd 100755 --- a/doc/doc_html/Properties.html +++ b/doc/doc_html/Properties.html @@ -72,12 +72,12 @@ </Tr> <Tr> - <Td><b><a href=#Dev_DefaultValues>WriteMemorizedValuesAtInit </a></b></Td> + <Td><b><a href=#Dev_DefaultValues>OutputMemorizedChannelsAtInit </a></b></Td> <Td> <Font Size=-1>Tango::DEV_BOOLEAN</Font> </Td> <Td> - <Font Size=-1>Whether to write the memorized values to the board at the device initialization. [true/false - default value is false]</Font> + <Font Size=-1>Whether to send the memorized values for the channels to the board at the device initialization (the device attribute will show the last memorized value regardless) [true/false - default value is false]</Font> </Td> </Tr> </Table> @@ -103,7 +103,7 @@ <td>true</td> </Tr> <Tr> - <Td>WriteMemorizedValuesAtInit</Td> + <Td>OutputMemorizedChannelsAtInit</Td> <td>false</td> </Tr> </Table> diff --git a/src/SingleShotAO.cpp b/src/SingleShotAO.cpp index b5ed3f35a87f544e3c35beef359f834b40cd4356..748d7f1b6b475c2e9c1694df032a864c55843fe7 100755 --- a/src/SingleShotAO.cpp +++ b/src/SingleShotAO.cpp @@ -545,7 +545,7 @@ void SingleShotAO::init_device() applyMemorizedAttr(kINITIAL, &SingleShotAOManager::set_initial); } - if (writeMemorizedValuesAtInit) { + if (outputMemorizedChannelsAtInit) { applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::write_channel); // write memorized value to board output } else { applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::set_channel); // only apply memorized value to the device @@ -594,7 +594,7 @@ void SingleShotAO::get_device_property() dev_prop.push_back(Tango::DbDatum("BoardNum")); dev_prop.push_back(Tango::DbDatum("BoardType")); dev_prop.push_back(Tango::DbDatum("EnableRamps")); - dev_prop.push_back(Tango::DbDatum("WriteMemorizedValuesAtInit")); + dev_prop.push_back(Tango::DbDatum("OutputMemorizedChannelsAtInit")); // Call database and extract values //-------------------------------------------- @@ -645,18 +645,18 @@ void SingleShotAO::get_device_property() if (dev_prop[i].is_empty() == false) dev_prop[i] >> enableRamps; INFO_STREAM << "EnableRamps parsed: " << (enableRamps ? "true" : "false") << endl; - //- <WriteMemorizedValuesAtInit> ----------------------- - // Try to initialize WriteMemorizedValuesAtInit from class property + //- <OutputMemorizedChannelsAtInit> ----------------------- + // Try to initialize OutputMemorizedChannelsAtInit from class property cl_prop = ds_class->get_class_property(dev_prop[++i].name); - if (cl_prop.is_empty() == false) cl_prop >> writeMemorizedValuesAtInit; + if (cl_prop.is_empty() == false) cl_prop >> outputMemorizedChannelsAtInit; else { - // Try to initialize WriteMemorizedValuesAtInit from default device value + // Try to initialize OutputMemorizedChannelsAtInit from default device value def_prop = ds_class->get_default_device_property(dev_prop[i].name); - if (def_prop.is_empty() == false) def_prop >> writeMemorizedValuesAtInit; + if (def_prop.is_empty() == false) def_prop >> outputMemorizedChannelsAtInit; } - // And try to extract WriteMemorizedValuesAtInit value from database - if (dev_prop[i].is_empty() == false) dev_prop[i] >> writeMemorizedValuesAtInit; - INFO_STREAM << "WriteMemorizedValuesAtInit parsed: " << (writeMemorizedValuesAtInit ? "true" : "false") << endl; + // And try to extract OutputMemorizedChannelsAtInit value from database + if (dev_prop[i].is_empty() == false) dev_prop[i] >> outputMemorizedChannelsAtInit; + INFO_STREAM << "OutputMemorizedChannelsAtInit parsed: " << (outputMemorizedChannelsAtInit ? "true" : "false") << endl; // Check critical properties being present //-------------------------------------------- diff --git a/src/SingleShotAO.h b/src/SingleShotAO.h index f77367ee78da4a89afcd626b0730cc7d8dfb8084..7cee441f51308aedf5a49c106de306a9849bcdfe 100755 --- a/src/SingleShotAO.h +++ b/src/SingleShotAO.h @@ -117,7 +117,7 @@ public : /** * Whether to write the memorized values to the board at the device initialization. [true/false - default value is false] */ - Tango::DevBoolean writeMemorizedValuesAtInit; + Tango::DevBoolean outputMemorizedChannelsAtInit; //@} /** diff --git a/src/SingleShotAOClass.cpp b/src/SingleShotAOClass.cpp index 87816ebf788b8fc7117a888b03b4f48fb086d5d0..29a1ef52bee605daef69132a7f65f03abcf7aa82 100755 --- a/src/SingleShotAOClass.cpp +++ b/src/SingleShotAOClass.cpp @@ -420,9 +420,9 @@ void SingleShotAOClass::set_default_property() else add_wiz_dev_prop(prop_name, prop_desc); - //- <WriteMemorizedValuesAt> ----------------------- - prop_name = "WriteMemorizedValuesAtInit"; - prop_desc = "Whether to write the memorized values to the board at the device initialization. [true/false - default value is false]"; + //- <OutputMemorizedChannelsAtInit> ----------------------- + prop_name = "OutputMemorizedChannelsAtInit"; + prop_desc = "Whether to send the memorized values for the channels to the board at the device initialization (the device attribute will show the last memorized value regardless) [true/false - default value is false]"; prop_def = "false"; vect_data.clear(); vect_data.push_back("false");