From 1fc24b506e4c3532138ff039dd238e3aadc44648 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 19 Feb 2012 16:58:08 +1100 Subject: [PATCH] AP_Param: update users of AP_Param for ParamToken --- ArduCopter/GCS.h | 2 +- ArduCopter/GCS_Mavlink.pde | 2 +- ArduPlane/GCS.h | 2 +- ArduPlane/GCS_Mavlink.pde | 2 +- Tools/VARTest/VARTest.pde | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArduCopter/GCS.h b/ArduCopter/GCS.h index d378fcd8db..7047beaf09 100644 --- a/ArduCopter/GCS.h +++ b/ArduCopter/GCS.h @@ -127,7 +127,7 @@ private: /// AP_Param *_queued_parameter; ///< next parameter to be sent in queue enum ap_var_type _queued_parameter_type; ///< type of the next parameter - uint16_t _queued_parameter_token; ///AP_Param token for next() call + AP_Param::ParamToken _queued_parameter_token;///AP_Param token for next() call uint16_t _queued_parameter_index; ///< next queued parameter's index uint16_t _queued_parameter_count; ///< saved count of parameters for queued send diff --git a/ArduCopter/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde index 50ddf2febb..995ebaa9e4 100644 --- a/ArduCopter/GCS_Mavlink.pde +++ b/ArduCopter/GCS_Mavlink.pde @@ -1617,7 +1617,7 @@ GCS_MAVLINK::_count_parameters() // if we haven't cached the parameter count yet... if (0 == _parameter_count) { AP_Param *vp; - uint16_t token; + AP_Param::ParamToken token; vp = AP_Param::first(&token, NULL); do { diff --git a/ArduPlane/GCS.h b/ArduPlane/GCS.h index d378fcd8db..7047beaf09 100644 --- a/ArduPlane/GCS.h +++ b/ArduPlane/GCS.h @@ -127,7 +127,7 @@ private: /// AP_Param *_queued_parameter; ///< next parameter to be sent in queue enum ap_var_type _queued_parameter_type; ///< type of the next parameter - uint16_t _queued_parameter_token; ///AP_Param token for next() call + AP_Param::ParamToken _queued_parameter_token;///AP_Param token for next() call uint16_t _queued_parameter_index; ///< next queued parameter's index uint16_t _queued_parameter_count; ///< saved count of parameters for queued send diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde index e5ecb7cd9c..a301b9fa2c 100644 --- a/ArduPlane/GCS_Mavlink.pde +++ b/ArduPlane/GCS_Mavlink.pde @@ -1970,7 +1970,7 @@ GCS_MAVLINK::_count_parameters() // if we haven't cached the parameter count yet... if (0 == _parameter_count) { AP_Param *vp; - uint16_t token; + AP_Param::ParamToken token; vp = AP_Param::first(&token, NULL); do { diff --git a/Tools/VARTest/VARTest.pde b/Tools/VARTest/VARTest.pde index dd98f0be55..1778b73a81 100644 --- a/Tools/VARTest/VARTest.pde +++ b/Tools/VARTest/VARTest.pde @@ -106,7 +106,7 @@ void setup() { compass.save_offsets(); // full testing of all variables - uint16_t token; + AP_Param::ParamToken token; for (AP_Param *ap = AP_Param::first(&token, &type); ap; ap=AP_Param::next(&token, &type)) {