From 44f2a652f34f8d5b00185ecd28f97676bb830e71 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Fri, 1 Jun 2018 18:21:50 -0700 Subject: [PATCH] Plane: Remove software type param --- ArduPlane/Parameters.cpp | 8 -------- ArduPlane/Parameters.h | 10 +--------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/ArduPlane/Parameters.cpp b/ArduPlane/Parameters.cpp index b27ac34693..cda089e558 100644 --- a/ArduPlane/Parameters.cpp +++ b/ArduPlane/Parameters.cpp @@ -18,14 +18,6 @@ const AP_Param::Info Plane::var_info[] = { // @User: Advanced GSCALAR(format_version, "FORMAT_VERSION", 0), - // @Param: SYSID_SW_TYPE - // @DisplayName: Software Type - // @Description: This is used by the ground station to recognise the software type (eg ArduPlane vs ArduCopter) - // @Values: 0:ArduPlane,4:AntennaTracker,10:Copter,20:Rover,40:ArduSub - // @User: Advanced - // @ReadOnly: True - GSCALAR(software_type, "SYSID_SW_TYPE", Parameters::k_software_type), - // @Param: SYSID_THISMAV // @DisplayName: MAVLink system ID of this vehicle // @Description: Allows setting an individual MAVLink system id for this vehicle to distinguish it from others on the same network diff --git a/ArduPlane/Parameters.h b/ArduPlane/Parameters.h index 52f67ffc66..4115fc411e 100644 --- a/ArduPlane/Parameters.h +++ b/ArduPlane/Parameters.h @@ -35,18 +35,11 @@ public: ////////////////////////////////////////////////////////////////// - // The parameter software_type is set up solely for ground station use - // and identifies the software type (eg ArduPilotMega versus ArduCopterMega) - // GCS will interpret values 0-9 as ArduPilotMega. Developers may use - // values within that range to identify different branches. - // - static const uint16_t k_software_type = 0; // 0 for APM trunk - enum { // Layout version number, always key zero. // k_param_format_version = 0, - k_param_software_type, + k_param_software_type, // unused; k_param_num_resets, k_param_NavEKF2, k_param_g2, @@ -354,7 +347,6 @@ public: }; AP_Int16 format_version; - AP_Int8 software_type; // Telemetry control //