From 2ccb9061d97171c39301497e41c804e9895164ca Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 29 Nov 2018 09:54:32 +0900 Subject: [PATCH] AP_Param: minor format fixes --- libraries/AP_Param/AP_Param.h | 40 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/libraries/AP_Param/AP_Param.h b/libraries/AP_Param/AP_Param.h index c1dfdbc7f8..946319a7a2 100644 --- a/libraries/AP_Param/AP_Param.h +++ b/libraries/AP_Param/AP_Param.h @@ -204,14 +204,14 @@ public: uint32_t group_element : 18; } ParamToken; - + // nesting structure for recursive call states struct GroupNesting { static const uint8_t numlevels = 2; uint8_t level; const struct GroupInfo *group_ret[numlevels]; }; - + // return true if AP_Param has been initialised via setup() static bool initialised(void); @@ -222,7 +222,7 @@ public: // level gets the next 6 bits, and the 3rd level gets the last 6 // bits. This limits groups to having at most 64 elements. static uint32_t group_id(const struct GroupInfo *grpinfo, uint32_t base, uint8_t i, uint8_t shift); - + /// Copy the variable's name, prefixed by any containing group name, to a /// buffer. /// @@ -239,7 +239,7 @@ public: const struct GroupInfo *ginfo, const struct GroupNesting &group_nesting, uint8_t idx, char *buffer, size_t bufferSize, bool force_scalar=false) const; - + /// Copy the variable's name, prefixed by any containing group name, to a /// buffer. /// @@ -292,7 +292,6 @@ public: /// static AP_Param * find_by_index(uint16_t idx, enum ap_var_type *ptype, ParamToken *token); - /// Find a variable by pointer /// /// @@ -301,7 +300,7 @@ public: static bool find_key_by_pointer_group(const void *ptr, uint16_t vindex, const struct GroupInfo *group_info, ptrdiff_t offset, uint16_t &key); static bool find_key_by_pointer(const void *ptr, uint16_t &key); - + /// Find a object in the top level var_info table /// /// If the variable has no name, it cannot be found by this interface. @@ -313,7 +312,7 @@ public: /// Notify GCS of current parameter value /// void notify() const; - + /// Save the current value of the variable to storage, synchronous API /// /// @param force_save If true then force save even if default @@ -325,13 +324,13 @@ public: /// flush all pending parameter saves /// used on reboot static void flush(void); - + /// Save the current value of the variable to storage, async interface /// /// @param force_save If true then force save even if default /// void save(bool force_save=false); - + /// Load the variable from EEPROM. /// /// @return True if the variable was loaded successfully. @@ -351,9 +350,9 @@ public: /// reoad the hal.util defaults file. Called after pointer parameters have been allocated /// static void reload_defaults_file(bool last_pass); - + static void load_object_from_eeprom(const void *object_pointer, const struct GroupInfo *group_info); - + // set a AP_Param variable to a specified value static void set_value(enum ap_var_type type, void *ptr, float def_value); @@ -378,7 +377,7 @@ public: // find an old parameter and return it. static bool find_old_parameter(const struct ConversionInfo *info, AP_Param *value); - + // 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); @@ -392,7 +391,7 @@ public: // move old class variables for a class that was sub-classed to one that isn't static void convert_parent_class(uint8_t param_key, void *object_pointer, const struct AP_Param::GroupInfo *group_info); - + /// Erase all variables in EEPROM. /// static void erase_all(void); @@ -456,7 +455,7 @@ public: enum ap_var_type ptype, AP_HAL::BetterStream *port); #endif // AP_PARAM_KEY_DUMP - + private: /// EEPROM header /// @@ -510,8 +509,8 @@ private: volatile char data[AP_PARAM_MAX_EMBEDDED_PARAM]; }; static const param_defaults_struct param_defaults_data; - - + + static bool check_group_info(const struct GroupInfo *group_info, uint16_t *total_size, uint8_t max_bits, uint8_t prefix_length); static bool duplicate_key(uint16_t vindex, uint16_t key); @@ -524,7 +523,7 @@ private: /// get group_info pointer based on flags static const struct GroupInfo *get_group_info(const struct Info &ginfo); - + const struct Info * find_var_info_group( const struct GroupInfo * group_info, uint16_t vindex, @@ -591,7 +590,7 @@ private: static float get_default_value(const AP_Param *object_ptr, const float *def_value_ptr); static bool parse_param_line(char *line, char **vname, float &value); - + #if HAL_OS_POSIX_IO == 1 /* load a parameter defaults file. This happens as part of load_all() @@ -606,10 +605,10 @@ private: */ static bool count_embedded_param_defaults(uint16_t &count); static void load_embedded_param_defaults(bool last_pass); - + // send a parameter to all GCS instances void send_parameter(const char *name, enum ap_var_type param_header_type, uint8_t idx) const; - + static StorageAccess _storage; static uint16_t _num_vars; static uint16_t _parameter_count; @@ -881,7 +880,6 @@ protected: }; - /// Convenience macro for defining instances of the AP_ParamT template. /// // declare a scalar type