Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Param: added convert_centi_parameter()

This commit is contained in:
Tim Tuxworth 2023-12-13 14:51:31 -07:00 committed by Andrew Tridgell
parent 3cf0de2224
commit 4919ae8f59
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_Param/AP_Param.cpp
View File

@ -1922,7 +1922,6 @@ bool AP_Param::find_old_parameter(const struct ConversionInfo *info, AP_Param *v
return true;
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
// convert one old vehicle parameter to new object parameter
@ -1983,11 +1982,17 @@ void AP_Param::convert_old_parameter(const struct ConversionInfo *info, float sc
#pragma GCC diagnostic pop
// convert old vehicle parameters to new object parametersv
// convert old vehicle parameters to new object parameters
void AP_Param::convert_old_parameters(const struct ConversionInfo *conversion_table, uint8_t table_size, uint8_t flags)
{
convert_old_parameters_scaled(conversion_table, table_size, 1.0f,flags);
}
// convert old vehicle parameters to new object parameters with scaling - assumes all parameters will have the same scaling factor
void AP_Param::convert_old_parameters_scaled(const struct ConversionInfo *conversion_table, uint8_t table_size, float scaler, uint8_t flags)
{
for (uint8_t i=0; i<table_size; i++) {
convert_old_parameter(&conversion_table[i], 1.0f, flags);
convert_old_parameter(&conversion_table[i], scaler, flags);
}
// we need to flush here to prevent a later set_default_by_name()
// causing a save to be done on a converted parameter
@ -2043,7 +2048,7 @@ void AP_Param::convert_class(uint16_t param_key, void *object_pointer,
convert width of a parameter, allowing update to wider scalar values
without changing the parameter indexes
*/
bool AP_Param::convert_parameter_width(ap_var_type old_ptype)
bool AP_Param::convert_parameter_width(ap_var_type old_ptype, float scale_factor)
{
if (configured_in_storage()) {
// already converted or set by the user
@ -2090,7 +2095,7 @@ bool AP_Param::convert_parameter_width(ap_var_type old_ptype)
// going via float is safe as the only time we would be converting
// from AP_Int32 is when converting to float
float old_float_value = old_ap->cast_to_float(old_ptype);
set_value(new_ptype, this, old_float_value);
set_value(new_ptype, this, old_float_value*scale_factor);
// force save as the new type
save(true);
@ -2098,7 +2103,6 @@ bool AP_Param::convert_parameter_width(ap_var_type old_ptype)
return true;
}
/*
set a parameter to a float value
*/

7
libraries/AP_Param/AP_Param.h
View File

@ -467,13 +467,18 @@ public:
// convert old vehicle parameters to new object parameters
static void convert_old_parameters(const struct ConversionInfo *conversion_table, uint8_t table_size, uint8_t flags=0);
// convert old vehicle parameters to new object parameters with scaling - assumes we use the same scaling factor for all values in the table
static void convert_old_parameters_scaled(const ConversionInfo *conversion_table, uint8_t table_size, float scaler, uint8_t flags);
/*
convert width of a parameter, allowing update to wider scalar
values without changing the parameter indexes. This will return
true if the parameter was converted from an old parameter value
*/
bool convert_parameter_width(ap_var_type old_ptype);
bool convert_parameter_width(ap_var_type old_ptype, float scale_factor=1.0);
bool convert_centi_parameter(ap_var_type old_ptype) {
return convert_parameter_width(old_ptype, 0.01f);
}
// convert a single parameter with scaling
enum {