Skip to content
Snippets Groups Projects
Commit 64fc34e7 authored by Alexandre MALFREYT's avatar Alexandre MALFREYT Committed by Florent LANGLOIS
Browse files

feat: rename WriteMemorizedValuesAtInit to OutputMemorizedChannelsAtInit and update documentation

parent acaf27f5
Branches
Tags
2 merge requests!4develop -> main,!3EnableRamps and OutputMemorizedChannelsAtInit properties
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
</Tr> </Tr>
<Tr> <Tr>
<Td><b><a href=#Dev_DefaultValues>WriteMemorizedValuesAtInit </a></b></Td> <Td><b><a href=#Dev_DefaultValues>OutputMemorizedChannelsAtInit </a></b></Td>
<Td> <Td>
<Font Size=-1>Tango::DEV_BOOLEAN</Font> <Font Size=-1>Tango::DEV_BOOLEAN</Font>
</Td> </Td>
<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> </Td>
</Tr> </Tr>
</Table> </Table>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<td>true</td> <td>true</td>
</Tr> </Tr>
<Tr> <Tr>
<Td>WriteMemorizedValuesAtInit</Td> <Td>OutputMemorizedChannelsAtInit</Td>
<td>false</td> <td>false</td>
</Tr> </Tr>
</Table> </Table>
......
...@@ -545,7 +545,7 @@ void SingleShotAO::init_device() ...@@ -545,7 +545,7 @@ void SingleShotAO::init_device()
applyMemorizedAttr(kINITIAL, &SingleShotAOManager::set_initial); applyMemorizedAttr(kINITIAL, &SingleShotAOManager::set_initial);
} }
if (writeMemorizedValuesAtInit) { if (outputMemorizedChannelsAtInit) {
applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::write_channel); // write memorized value to board output applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::write_channel); // write memorized value to board output
} else { } else {
applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::set_channel); // only apply memorized value to the device applyMemorizedAttr(kCHANNEL, &SingleShotAOManager::set_channel); // only apply memorized value to the device
...@@ -594,7 +594,7 @@ void SingleShotAO::get_device_property() ...@@ -594,7 +594,7 @@ void SingleShotAO::get_device_property()
dev_prop.push_back(Tango::DbDatum("BoardNum")); dev_prop.push_back(Tango::DbDatum("BoardNum"));
dev_prop.push_back(Tango::DbDatum("BoardType")); dev_prop.push_back(Tango::DbDatum("BoardType"));
dev_prop.push_back(Tango::DbDatum("EnableRamps")); 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 // Call database and extract values
//-------------------------------------------- //--------------------------------------------
...@@ -645,18 +645,18 @@ void SingleShotAO::get_device_property() ...@@ -645,18 +645,18 @@ void SingleShotAO::get_device_property()
if (dev_prop[i].is_empty() == false) dev_prop[i] >> enableRamps; if (dev_prop[i].is_empty() == false) dev_prop[i] >> enableRamps;
INFO_STREAM << "EnableRamps parsed: " << (enableRamps ? "true" : "false") << endl; INFO_STREAM << "EnableRamps parsed: " << (enableRamps ? "true" : "false") << endl;
//- <WriteMemorizedValuesAtInit> ----------------------- //- <OutputMemorizedChannelsAtInit> -----------------------
// Try to initialize WriteMemorizedValuesAtInit from class property // Try to initialize OutputMemorizedChannelsAtInit from class property
cl_prop = ds_class->get_class_property(dev_prop[++i].name); 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 { 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); 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 // And try to extract OutputMemorizedChannelsAtInit value from database
if (dev_prop[i].is_empty() == false) dev_prop[i] >> writeMemorizedValuesAtInit; if (dev_prop[i].is_empty() == false) dev_prop[i] >> outputMemorizedChannelsAtInit;
INFO_STREAM << "WriteMemorizedValuesAtInit parsed: " << (writeMemorizedValuesAtInit ? "true" : "false") << endl; INFO_STREAM << "OutputMemorizedChannelsAtInit parsed: " << (outputMemorizedChannelsAtInit ? "true" : "false") << endl;
// Check critical properties being present // Check critical properties being present
//-------------------------------------------- //--------------------------------------------
......
...@@ -117,7 +117,7 @@ public : ...@@ -117,7 +117,7 @@ public :
/** /**
* Whether to write the memorized values to the board at the device initialization. [true/false - default value is false] * 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;
//@} //@}
/** /**
......
...@@ -420,9 +420,9 @@ void SingleShotAOClass::set_default_property() ...@@ -420,9 +420,9 @@ void SingleShotAOClass::set_default_property()
else else
add_wiz_dev_prop(prop_name, prop_desc); add_wiz_dev_prop(prop_name, prop_desc);
//- <WriteMemorizedValuesAt> ----------------------- //- <OutputMemorizedChannelsAtInit> -----------------------
prop_name = "WriteMemorizedValuesAtInit"; prop_name = "OutputMemorizedChannelsAtInit";
prop_desc = "Whether to write the memorized values to the board at the device initialization. [true/false - default value is false]"; 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"; prop_def = "false";
vect_data.clear(); vect_data.clear();
vect_data.push_back("false"); vect_data.push_back("false");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment